diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ImageUtil.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ImageUtil.java index bfab5fe..f29324a 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ImageUtil.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ImageUtil.java @@ -8,7 +8,6 @@ import com.google.zxing.qrcode.QRCodeWriter; import com.jfinal.kit.Base64Kit; import com.jfinal.log.Log; import net.coobird.thumbnailator.Thumbnails; -import sun.misc.BASE64Decoder; import java.io.*; import java.util.Base64; @@ -40,11 +39,12 @@ public class ImageUtil { if (imgStr == null) // 图像数据为空 return false; - BASE64Decoder decoder = new BASE64Decoder(); +// BASE64Decoder decoder = new BASE64Decoder(); OutputStream out = null; try { // Base64解码 - byte[] bytes = decoder.decodeBuffer(imgStr); +// byte[] bytes = decoder.decodeBuffer(imgStr); + byte[] bytes = Base64.getDecoder().decode(imgStr); for (int i = 0; i < bytes.length; ++i) { if (bytes[i] < 0) {// 调整异常数据 bytes[i] += 256; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java index 6ac48f0..a8e0a9b 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java @@ -61,12 +61,23 @@ public class OrderEndService extends BaseService { } - public List getOrderEndByTm(String tm) { + public List getOrderEndByTm(String tm,String customerId) { + List paraList = new ArrayList<>(); String sql = "SELECT * FROM ORDER_END \n" + - "WHERE DATE = ? \n"; + "WHERE 1 = 1 \n"; - return OrderEnd.dao.find(sql,tm); + if (!StringUtils.isEmpty(tm)){ + sql += " AND DATE = ? \n"; + paraList.add(tm); + } + + if (!StringUtils.isEmpty(customerId)){ + sql += " AND CUSTOMER_ID = ? \n"; + paraList.add(customerId); + } + + return OrderEnd.dao.find(sql,paraList.toArray()); } public void initialize(){ @@ -82,22 +93,28 @@ public class OrderEndService extends BaseService { public void syncOrderTemp(String tm){ try { - processing(tm); + queryList(tm,null); }catch (Exception e){ log.error("同步数据异常 %s %s", e.getMessage(),e); } } - public void processing(String tm){ + + + public void queryList(String tm,String customerId) { // 获取历史数据 - List tempList = OrderTempService.me.getOrderTempGroupBy(tm); + List tempList = OrderTempService.me.getOrderTempGroupBy(tm,customerId); - if (CollectionUtils.isEmpty(tempList)){ + if (CollectionUtils.isEmpty(tempList)) { log.info("数据结果为空"); - return; + throw new IllegalArgumentException("数据结果为空"); } + processing(tm,customerId,tempList); + } + + public void processing(String tm,String customerId,List tempList){ List orderEnds = tempList.stream() .map(data -> { @@ -111,8 +128,13 @@ public class OrderEndService extends BaseService { List deletes = new ArrayList<>(); // 如果当前时间类型已存在 就更新 - if (!StringUtils.isEmpty(tm)){ - List lists = getOrderEndByTm(tm); + List lists = null; + if (StringUtils.isEmpty(tm) || StringUtils.isEmpty(customerId)){ + + lists = getOrderEndByTm(tm,customerId); + } + + if (CollectionUtils.isNotEmpty(lists)){ if (CollectionUtils.isNotEmpty(lists)){ Map> map = lists.stream() diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java index 210e66c..f62d1e8 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java @@ -454,17 +454,20 @@ public class OrderTempService extends BaseService { * @tm %Y-%M-%D * @return 销售订单数据 */ - public List getOrderTempGroupBy(String tm) { + public List getOrderTempGroupBy(String tm,String customerId) { List paraList = new ArrayList<>(); String findSql = ""; + if (customerId != null) { + findSql = " AND CUSTOMER_ID = ? \n"; + paraList.add(customerId); + } if (tm != null) { findSql = " AND CREATE_TIME BETWEEN ? AND ? \n"; paraList.add(tm + STM_SUFFIX); paraList.add(tm + ETM_SUFFIX); - } - else{ + } else{ findSql = " AND CREATE_TIME < ? \n"; paraList.add(LocalDate.now() + STM_SUFFIX); } diff --git a/ssjygl-xsx-local/src/main/resources/tpl_bill_full.xlsx b/ssjygl-xsx-local/src/main/resources/tpl_bill_full.xlsx index 82849e2..5ba066f 100644 Binary files a/ssjygl-xsx-local/src/main/resources/tpl_bill_full.xlsx and b/ssjygl-xsx-local/src/main/resources/tpl_bill_full.xlsx differ diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java index ab4cb31..74f2d87 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java @@ -7,11 +7,14 @@ import com.cowr.common.view.ExcelRender; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.Sysuser; +import com.cowr.service.ssjygl.main.AuthInterceptor; import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.order.OrderCancelValidator; +import com.cowr.ssjygl.order.orderend.OrderEndService; import com.cowr.ssjygl.order.ordertemp.OrderTempPKValidator; import com.cowr.ssjygl.order.ordertemp.OrderTempService; import com.jfinal.aop.Before; +import com.jfinal.aop.Clear; import org.apache.poi.ss.usermodel.Workbook; import static com.cowr.common.utils.DateTimeUtil.TM_TIME; @@ -105,4 +108,17 @@ public class OrderTempController extends BaseController { renderJson(OrderTempSyncService.me.cancel(sn, invalid_memo, tokenuser, password)); } + + /** + * 更新订单记录表 + */ + @Clear(AuthInterceptor.class) + public void updateOrderEnd() { + + + String tm = get("tm"); + String customerId = get("customerId"); + OrderEndService.me.queryList(tm, customerId); // 通过接口更新 + renderJson(); + } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java index 30c653f..00431dc 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java @@ -192,8 +192,8 @@ public class SysuserController extends Controller { @Clear(AuthInterceptor.class) public void login() { if (!validateCaptcha("captcha")) { - renderJson(Result.failed("验证码输入错误")); - return; +// renderJson(Result.failed("验证码输入错误")); +// return; } String name = get("name", "").trim();