Merge remote-tracking branch 'origin/develop' into develop

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

@@ -38,7 +38,7 @@ public class SalesCustomerPartsBean {
     private String identity;
 
     @ApiModelProperty(value = "师傅编号", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "师傅编号不能空")
+//    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "师傅编号不能空")
     private String workerId;
 
     @ApiModelProperty(value = "师傅名称", required = true)

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

@@ -2,7 +2,6 @@ package com.gree.mall.miniapp.logic.material.parts;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -155,7 +154,8 @@ public class OldRefundManageLogic {
                             .collect(Collectors.toList()))
                     .list();
             if (CollectionUtil.isEmpty(workerStockList)) {
-                throw new RemoteServiceException("在“" + websit.getName() + "”未找到新件配件库存");
+                return "";
+//                throw new RemoteServiceException("在“" + websit.getName() + "”未找到新件配件库存");
             }
 
             // 查询配件资料

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

@@ -539,6 +539,9 @@ public class PayOrderLogic {
                         List<SalesCustomerPartsItemBean> salesCustomerPartsItemBeans = new ArrayList<>();
 
                         for (WorkerOrderItem workerOrderItem : inner) {
+                            if (workerOrderItem.getChargeType().equals("SERV")) {
+                                continue;
+                            }
                             SalesCustomerPartsItemBean salesCustomerPartsItemBean = new SalesCustomerPartsItemBean();
 
                             salesCustomerPartsItemBean.setOldPartsName(workerOrderItem.getOldPartsName());
@@ -577,6 +580,9 @@ public class PayOrderLogic {
                         List<SalesCustomerPartsItemBean> salesCustomerPartsItemBeans = new ArrayList<>();
 
                         for (WorkerOrderItem workerOrderItem : OUTSIDE) {
+                            if (workerOrderItem.getChargeType().equals("SERV")) {
+                                continue;
+                            }
                             SalesCustomerPartsItemBean salesCustomerPartsItemBean = new SalesCustomerPartsItemBean();
 
                             salesCustomerPartsItemBean.setOldPartsName(workerOrderItem.getOldPartsName());
@@ -599,7 +605,9 @@ public class PayOrderLogic {
                     if (CollectionUtil.isNotEmpty(salesCustomerPartsBeans)) {
                         // 开始处理库存
                         for (SalesCustomerPartsBean salesCustomerPartsBean : salesCustomerPartsBeans) {
-                            oldRefundManageLogic.add(salesCustomerPartsBean);
+                            if (CollectionUtil.isNotEmpty(salesCustomerPartsBean.getItems())) {
+                                oldRefundManageLogic.add(salesCustomerPartsBean);
+                            }
                         }
 
                     }

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsPVO.java

@@ -15,13 +15,13 @@ import java.util.Date;
 @ZfireField(tbName = "a")
 public class WebsitGoodsPVO {
 
-    @ApiModelProperty(value = "商品编号")
+    @ApiModelProperty(value = "配件编号")
     private String goodsId;
 
 //    @ApiModelProperty(value = "商户名称")
 //    private String companyWechatName;
 
-    @ApiModelProperty(value = "商品名称")
+    @ApiModelProperty(value = "配件名称")
     private String goodsName;
 
     @ApiModelProperty(value = "配件编码")

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/stock/WorkerStockLogic.java

@@ -414,7 +414,8 @@ public class WorkerStockLogic {
                         .collect(Collectors.toList()))
                 .list();
         if (CollectionUtil.isEmpty(workerStockList)) {
-            throw new RemoteServiceException("在“" + websit.getName() + "”未找到新件配件库存");
+            return "";
+//            throw new RemoteServiceException("在“" + websit.getName() + "”未找到新件配件库存");
         }
 
         // 查询配件资料

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -467,6 +467,9 @@ public class SettlementOrderLogic {
                             List<SalesCustomerPartsItemBean> salesCustomerPartsItemBeans = new ArrayList<>();
 
                             for (WorkerOrderItem workerOrderItem : inner) {
+                                if (workerOrderItem.getChargeType().equals("SERV")) {
+                                    continue;
+                                }
                                 SalesCustomerPartsItemBean salesCustomerPartsItemBean = new SalesCustomerPartsItemBean();
 
                                 salesCustomerPartsItemBean.setOldPartsName(workerOrderItem.getOldPartsName());
@@ -505,6 +508,9 @@ public class SettlementOrderLogic {
                             List<SalesCustomerPartsItemBean> salesCustomerPartsItemBeans = new ArrayList<>();
 
                             for (WorkerOrderItem workerOrderItem : OUTSIDE) {
+                                if (workerOrderItem.getChargeType().equals("SERV")) {
+                                    continue;
+                                }
                                 SalesCustomerPartsItemBean salesCustomerPartsItemBean = new SalesCustomerPartsItemBean();
 
                                 salesCustomerPartsItemBean.setOldPartsName(workerOrderItem.getOldPartsName());