no message

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

@@ -46,7 +46,7 @@ public class SalesCustomerPartsBean {
     private String workerName;
 
     @ApiModelProperty(value = "工单编号", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "工单编号不能空")
+//    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "工单编号不能空")
     private String workOrderNo;
 
     @ApiModelProperty(value = "用户名称", required = true)

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

@@ -194,6 +194,9 @@ public class OldRefundManageLogic {
             // 保存主表和明细
             WebsitPartsOldRefundManage partsOldRefundManage = new WebsitPartsOldRefundManage();
             BeanUtils.copyProperties(oldRefundManageBean, partsOldRefundManage);
+            // workOrderNo与pgId是同值
+            partsOldRefundManage.setPgId(oldRefundManageBean.getWorkOrderNo());
+
             List<WebsitPartsOldRefundManageItem> partsOldRefundManageItems = new ArrayList<>();
             for (OldRefundManageItemBean itemBean : oldRefundManageBean.getOldRefundManageItemBeanList()) {
                 WebsitPartsOldRefundManageItem partsOldRefundManageItem = new WebsitPartsOldRefundManageItem();

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

@@ -467,100 +467,96 @@ 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.setWorkOrderNo(workerOrder.getWorkerOrderId());
+                    salesCustomerPartsBean.setCustomerName(workerOrder.getUserName());
+                    salesCustomerPartsBean.setCustomerTel(workerOrder.getUserMobile());
+                    salesCustomerPartsBean.setReceiveWebsitId(adminWebsit.getWebsitId());
+                    salesCustomerPartsBean.setReceivePartsWebsitId(adminWebsit.getPartsWebsitId());
+                    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);
-
-                        }
-
-                        salesCustomerPartsBean.setItems(salesCustomerPartsItemBeans);
-
-                        salesCustomerPartsBeans.add(salesCustomerPartsBean);
+                        salesCustomerPartsItemBeans.add(salesCustomerPartsItemBean);
 
                     }
 
+                    salesCustomerPartsBean.setItems(salesCustomerPartsItemBeans);
 
-                    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());
+                    salesCustomerPartsBeans.add(salesCustomerPartsBean);
 
+                }
 
-                        List<SalesCustomerPartsItemBean> salesCustomerPartsItemBeans = new ArrayList<>();
 
-                        for (WorkerOrderItem workerOrderItem : OUTSIDE) {
-                            SalesCustomerPartsItemBean salesCustomerPartsItemBean = new SalesCustomerPartsItemBean();
+                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(workerOrder.getUserName());
+                    salesCustomerPartsBean.setCustomerTel(workerOrder.getUserMobile());
+                    salesCustomerPartsBean.setReceiveWebsitId(adminWebsit.getWebsitId());
+                    salesCustomerPartsBean.setReceivePartsWebsitId(adminWebsit.getPartsWebsitId());
+                    salesCustomerPartsBean.setRemark(workerOrder.getRemark());
 
-                            salesCustomerPartsItemBean.setOldPartsName(workerOrderItem.getOldPartsName());
-                            salesCustomerPartsItemBean.setOldPartsNumber(workerOrderItem.getOldPartsNumber());
-                            salesCustomerPartsItemBean.setPartsNumber(workerOrderItem.getGoodsCode());
-                            salesCustomerPartsItemBean.setQty(workerOrderItem.getNum());
 
-                            salesCustomerPartsItemBeans.add(salesCustomerPartsItemBean);
+                    List<SalesCustomerPartsItemBean> salesCustomerPartsItemBeans = new ArrayList<>();
 
-                        }
+                    for (WorkerOrderItem workerOrderItem : OUTSIDE) {
+                        SalesCustomerPartsItemBean salesCustomerPartsItemBean = new SalesCustomerPartsItemBean();
 
-                        salesCustomerPartsBean.setItems(salesCustomerPartsItemBeans);
+                        salesCustomerPartsItemBean.setOldPartsName(workerOrderItem.getOldPartsName());
+                        salesCustomerPartsItemBean.setOldPartsNumber(workerOrderItem.getOldPartsNumber());
+                        salesCustomerPartsItemBean.setPartsNumber(workerOrderItem.getGoodsCode());
+                        salesCustomerPartsItemBean.setQty(workerOrderItem.getNum());
 
-                        salesCustomerPartsBeans.add(salesCustomerPartsBean);
+                        salesCustomerPartsItemBeans.add(salesCustomerPartsItemBean);
 
                     }
 
+                    salesCustomerPartsBean.setItems(salesCustomerPartsItemBeans);
 
+                    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);
                     }
-                }
 
+                }
             }
+
         } catch (Exception e) {
             log.error(workerOrder.getOrderId() + " 师傅配件扣自有库存失败: ", e);
         }