no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/SalesCustomerPartsBean.java

@@ -50,11 +50,11 @@ public class SalesCustomerPartsBean {
     private String workOrderNo;
 
     @ApiModelProperty(value = "用户名称", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "用户名称不能空")
+//    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "用户名称不能空")
     private String customerName;
 
     @ApiModelProperty(value = "用户电话", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "用户电话不能空")
+//    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "用户电话不能空")
     private String customerTel;
 
     @ApiModelProperty("备注")

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/parts/OldRefundManageLogic.java

@@ -125,9 +125,6 @@ public class OldRefundManageLogic {
 
     @Transactional
     public String add(SalesCustomerPartsBean bean) {
-        if (StringUtils.isBlank(bean.getWorkOrderNo())) {
-            return "";
-        }
         try {
             ValidateUtil.validate(bean, ValidGroup.Add.class);
             for (SalesCustomerPartsItemBean itemBean : bean.getItems()) {

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -467,88 +467,97 @@ public class PayOrderLogic {
         // 配件扣库存
         try {
             if (workerOrder.getGoodsType().equals("P")) {
+                final PgOrderBase orderBase = pgOrderBaseService.getById(workerOrder.getWorkerOrderId());
 
+                if (Objects.nonNull(orderBase)) {
 
-                List<WorkerOrderItem> inner = workerOrderItems.stream().filter(item -> item.getRepairFlag().equals("INNER")).collect(Collectors.toList());
-                List<WorkerOrderItem> OUTSIDE = workerOrderItems.stream().filter(item -> item.getRepairFlag().equals("OUTSIDE")).collect(Collectors.toList());
+                    List<WorkerOrderItem> inner = workerOrderItems.stream().filter(item -> item.getRepairFlag().equals("INNER")).collect(Collectors.toList());
+                    List<WorkerOrderItem> OUTSIDE = workerOrderItems.stream().filter(item -> item.getRepairFlag().equals("OUTSIDE")).collect(Collectors.toList());
 
-                List<SalesCustomerPartsBean> salesCustomerPartsBeans = new ArrayList<>();
+                    List<SalesCustomerPartsBean> salesCustomerPartsBeans = new ArrayList<>();
 
-                if (!CollectionUtils.isEmpty(inner)){
-                    SalesCustomerPartsBean salesCustomerPartsBean = new SalesCustomerPartsBean();
-                    salesCustomerPartsBean.setCompanyWechatId(workerOrder.getCompanyWechatId());
-                    salesCustomerPartsBean.setCompanyWechatName(workerOrder.getCompanyWechatName());
-                    salesCustomerPartsBean.setRepairFlag("INNER");
-                    salesCustomerPartsBean.setIdentity(workerOrder.getIdentity());
-                    salesCustomerPartsBean.setWorkerId(workerOrder.getWorkerId());
-                    salesCustomerPartsBean.setWorkerName(workerOrder.getWorkerName());
-                    salesCustomerPartsBean.setCustomerName(workerOrder.getUserName());
-                    salesCustomerPartsBean.setCustomerTel(workerOrder.getUserMobile());
-                    salesCustomerPartsBean.setRemark(workerOrder.getRemark());
+                    if (!CollectionUtils.isEmpty(inner)){
+                        SalesCustomerPartsBean salesCustomerPartsBean = new SalesCustomerPartsBean();
+                        salesCustomerPartsBean.setCompanyWechatId(workerOrder.getCompanyWechatId());
+                        salesCustomerPartsBean.setCompanyWechatName(workerOrder.getCompanyWechatName());
+                        salesCustomerPartsBean.setRepairFlag("INNER");
+                        salesCustomerPartsBean.setIdentity(workerOrder.getIdentity());
+                        salesCustomerPartsBean.setWorkerId(workerOrder.getWorkerId());
+                        salesCustomerPartsBean.setWorkerName(workerOrder.getWorkerName());
+                        salesCustomerPartsBean.setWorkOrderNo(workerOrder.getWorkerOrderId());
+                        salesCustomerPartsBean.setCustomerName(orderBase.getUserName());
+                        salesCustomerPartsBean.setCustomerTel(orderBase.getUserMobile());
+                        salesCustomerPartsBean.setReceiveWebsitId(adminWebsit.getWebsitId());
+                        salesCustomerPartsBean.setReceivePartsWebsitId(adminWebsit.getPartsWebsitId());
+                        salesCustomerPartsBean.setRemark(workerOrder.getRemark());
 
 
-                    List<SalesCustomerPartsItemBean> salesCustomerPartsItemBeans = new ArrayList<>();
+                        List<SalesCustomerPartsItemBean> salesCustomerPartsItemBeans = new ArrayList<>();
 
-                    for (WorkerOrderItem workerOrderItem : inner) {
-                        SalesCustomerPartsItemBean salesCustomerPartsItemBean = new SalesCustomerPartsItemBean();
+                        for (WorkerOrderItem workerOrderItem : inner) {
+                            SalesCustomerPartsItemBean salesCustomerPartsItemBean = new SalesCustomerPartsItemBean();
 
-                        salesCustomerPartsItemBean.setOldPartsName(workerOrderItem.getOldPartsName());
-                        salesCustomerPartsItemBean.setOldPartsNumber(workerOrderItem.getOldPartsNumber());
-                        salesCustomerPartsItemBean.setPartsNumber(workerOrderItem.getGoodsCode());
-                        salesCustomerPartsItemBean.setQty(workerOrderItem.getNum());
+                            salesCustomerPartsItemBean.setOldPartsName(workerOrderItem.getOldPartsName());
+                            salesCustomerPartsItemBean.setOldPartsNumber(workerOrderItem.getOldPartsNumber());
+                            salesCustomerPartsItemBean.setPartsNumber(workerOrderItem.getGoodsCode());
+                            salesCustomerPartsItemBean.setQty(workerOrderItem.getNum());
 
-                        salesCustomerPartsItemBeans.add(salesCustomerPartsItemBean);
+                            salesCustomerPartsItemBeans.add(salesCustomerPartsItemBean);
 
-                    }
+                        }
 
-                    salesCustomerPartsBean.setItems(salesCustomerPartsItemBeans);
+                        salesCustomerPartsBean.setItems(salesCustomerPartsItemBeans);
 
-                    salesCustomerPartsBeans.add(salesCustomerPartsBean);
+                        salesCustomerPartsBeans.add(salesCustomerPartsBean);
 
-                }
+                    }
 
 
-                if (!CollectionUtils.isEmpty(OUTSIDE)){
-                    SalesCustomerPartsBean salesCustomerPartsBean = new SalesCustomerPartsBean();
-                    salesCustomerPartsBean.setCompanyWechatId(workerOrder.getCompanyWechatId());
-                    salesCustomerPartsBean.setCompanyWechatName(workerOrder.getCompanyWechatName());
-                    salesCustomerPartsBean.setRepairFlag("OUTSIDE");
-                    salesCustomerPartsBean.setIdentity(workerOrder.getIdentity());
-                    salesCustomerPartsBean.setWorkerId(workerOrder.getWorkerId());
-                    salesCustomerPartsBean.setWorkerName(workerOrder.getWorkerName());
-                    salesCustomerPartsBean.setCustomerName(workerOrder.getUserName());
-                    salesCustomerPartsBean.setCustomerTel(workerOrder.getUserMobile());
-                    salesCustomerPartsBean.setRemark(workerOrder.getRemark());
+                    if (!CollectionUtils.isEmpty(OUTSIDE)){
+                        SalesCustomerPartsBean salesCustomerPartsBean = new SalesCustomerPartsBean();
+                        salesCustomerPartsBean.setCompanyWechatId(workerOrder.getCompanyWechatId());
+                        salesCustomerPartsBean.setCompanyWechatName(workerOrder.getCompanyWechatName());
+                        salesCustomerPartsBean.setRepairFlag("OUTSIDE");
+                        salesCustomerPartsBean.setIdentity(workerOrder.getIdentity());
+                        salesCustomerPartsBean.setWorkerId(workerOrder.getWorkerId());
+                        salesCustomerPartsBean.setWorkerName(workerOrder.getWorkerName());
+                        salesCustomerPartsBean.setWorkOrderNo(workerOrder.getWorkerOrderId());
+                        salesCustomerPartsBean.setCustomerName(orderBase.getUserName());
+                        salesCustomerPartsBean.setCustomerTel(orderBase.getUserMobile());
+                        salesCustomerPartsBean.setReceiveWebsitId(adminWebsit.getWebsitId());
+                        salesCustomerPartsBean.setReceivePartsWebsitId(adminWebsit.getPartsWebsitId());
+                        salesCustomerPartsBean.setRemark(workerOrder.getRemark());
 
 
-                    List<SalesCustomerPartsItemBean> salesCustomerPartsItemBeans = new ArrayList<>();
+                        List<SalesCustomerPartsItemBean> salesCustomerPartsItemBeans = new ArrayList<>();
 
-                    for (WorkerOrderItem workerOrderItem : OUTSIDE) {
-                        SalesCustomerPartsItemBean salesCustomerPartsItemBean = new SalesCustomerPartsItemBean();
+                        for (WorkerOrderItem workerOrderItem : OUTSIDE) {
+                            SalesCustomerPartsItemBean salesCustomerPartsItemBean = new SalesCustomerPartsItemBean();
 
-                        salesCustomerPartsItemBean.setOldPartsName(workerOrderItem.getOldPartsName());
-                        salesCustomerPartsItemBean.setOldPartsNumber(workerOrderItem.getOldPartsNumber());
-                        salesCustomerPartsItemBean.setPartsNumber(workerOrderItem.getGoodsCode());
-                        salesCustomerPartsItemBean.setQty(workerOrderItem.getNum());
+                            salesCustomerPartsItemBean.setOldPartsName(workerOrderItem.getOldPartsName());
+                            salesCustomerPartsItemBean.setOldPartsNumber(workerOrderItem.getOldPartsNumber());
+                            salesCustomerPartsItemBean.setPartsNumber(workerOrderItem.getGoodsCode());
+                            salesCustomerPartsItemBean.setQty(workerOrderItem.getNum());
 
-                        salesCustomerPartsItemBeans.add(salesCustomerPartsItemBean);
+                            salesCustomerPartsItemBeans.add(salesCustomerPartsItemBean);
 
-                    }
+                        }
 
-                    salesCustomerPartsBean.setItems(salesCustomerPartsItemBeans);
+                        salesCustomerPartsBean.setItems(salesCustomerPartsItemBeans);
 
-                    salesCustomerPartsBeans.add(salesCustomerPartsBean);
+                        salesCustomerPartsBeans.add(salesCustomerPartsBean);
 
-                }
+                    }
 
 
 
-                if (CollectionUtil.isNotEmpty(salesCustomerPartsBeans)) {
-                    // 开始处理库存
-                    for (SalesCustomerPartsBean salesCustomerPartsBean : salesCustomerPartsBeans) {
-                        oldRefundManageLogic.add(salesCustomerPartsBean);
-                    }
+                    if (CollectionUtil.isNotEmpty(salesCustomerPartsBeans)) {
+                        // 开始处理库存
+                        for (SalesCustomerPartsBean salesCustomerPartsBean : salesCustomerPartsBeans) {
+                            oldRefundManageLogic.add(salesCustomerPartsBean);
+                        }
 
+                    }
                 }
 
             }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/schedule/WorkerOldPartsHandlerSchedule.java

@@ -1,6 +1,7 @@
 package com.gree.mall.miniapp.schedule;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
 import com.gree.mall.miniapp.bean.material.parts.SalesCustomerPartsBean;
@@ -40,9 +41,11 @@ public class WorkerOldPartsHandlerSchedule {
     //上一次执行完后5秒再扫表
     @Scheduled(initialDelay = 5000, fixedDelay = 5000)
     private void infoTask() {
+        final DateTime curDate = DateUtil.date();
         List<WorkerSalesCustomerInfo> infoList = workerSalesCustomerInfoService.lambdaQuery()
                 .eq(WorkerSalesCustomerInfo::getIsExec, IsEnum.N.getValue())
                 .isNull(WorkerSalesCustomerInfo::getExecTime)
+                .between(WorkerSalesCustomerInfo::getCreateTime, DateUtil.offsetDay(curDate, -2), curDate)
                 .orderByAsc(WorkerSalesCustomerInfo::getCreateTime)
                 .list();