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

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

@@ -184,7 +184,7 @@ public class PayOrderLogic {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         workerOrderBuy.setCompanyWechatId(currentCompanyWechat.getCompanyWechatId());
         workerOrderBuy.setCompanyWechatName(currentCompanyWechat.getCompanyName());
-        workerOrderBuy.setWorkerId(currentCompanyWechat.getUser().getWorkerNumber());
+        workerOrderBuy.setWorkerNumber(currentCompanyWechat.getUser().getWorkerNumber());
         workerOrderBuy.setWorkerName(currentCompanyWechat.getUser().getNickName());
         workerOrderBuy.setWorkerMobile(currentCompanyWechat.getUser().getMobile());
         workerOrderBuy.setCreateBy(currentCompanyWechat.getUser().getNickName());
@@ -500,7 +500,7 @@ public class PayOrderLogic {
                     salesCustomerPartsBean.setCompanyWechatName(workerOrder.getCompanyWechatName());
                     salesCustomerPartsBean.setRepairFlag("INNER");
                     salesCustomerPartsBean.setIdentity(workerOrder.getIdentity());
-                    salesCustomerPartsBean.setWorkerId(workerOrder.getWorkerId());
+                    salesCustomerPartsBean.setWorkerId(workerOrder.getWorkerNumber());
                     salesCustomerPartsBean.setWorkerName(workerOrder.getWorkerName());
                     salesCustomerPartsBean.setWorkOrderNo(workerOrder.getWorkerOrderId());
                     salesCustomerPartsBean.setCustomerName(workerOrder.getUserName());
@@ -538,7 +538,7 @@ public class PayOrderLogic {
                     salesCustomerPartsBean.setCompanyWechatName(workerOrder.getCompanyWechatName());
                     salesCustomerPartsBean.setRepairFlag("OUTSIDE");
                     salesCustomerPartsBean.setIdentity(workerOrder.getIdentity());
-                    salesCustomerPartsBean.setWorkerId(workerOrder.getWorkerId());
+                    salesCustomerPartsBean.setWorkerId(workerOrder.getWorkerNumber());
                     salesCustomerPartsBean.setWorkerName(workerOrder.getWorkerName());
                     salesCustomerPartsBean.setWorkOrderNo(workerOrder.getWorkerOrderId());
                     salesCustomerPartsBean.setCustomerName(workerOrder.getUserName());
@@ -665,7 +665,7 @@ public class PayOrderLogic {
             workerStockDTO.setCompanyWechatId(workerOrder.getCompanyWechatId());
             workerStockDTO.setCompanyWechatName(workerOrder.getCompanyWechatName());
             workerStockDTO.setIdentity(workerOrder.getIdentity());
-            workerStockDTO.setWorkerId(workerOrder.getWorkerId());
+            workerStockDTO.setWorkerId(workerOrder.getWorkerNumber());
             workerStockDTO.setWorkerName(workerOrder.getWorkerName());
             workerStockDTO.setWebsitId(workerOrder.getWebsitId());
             workerStockDTO.setWebsitName(workerOrder.getWebsitName());
@@ -698,7 +698,7 @@ public class PayOrderLogic {
         WorkerSettlementManual one = workerSettlementManualService.lambdaQuery()
                 .eq(WorkerSettlementManual::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId())
                 .eq(WorkerSettlementManual::getWebsitId, workerOrder.getWebsitId())
-                .eq(WorkerSettlementManual::getWorkerId, workerOrder.getWorkerId())
+                .eq(WorkerSettlementManual::getWorkerId, workerOrder.getWorkerNumber())
                 .last("limit 1").one();
         if (one != null){
             one.setWorkerAmount(workerOrder.getManualAmount().add(one.getWorkerAmount()));
@@ -712,7 +712,7 @@ public class PayOrderLogic {
             workerSettlement.setCompanyWechatName(currentCompanyWechat.getCompanyName());
             workerSettlement.setWebsitId(workerOrder.getWebsitId());
             workerSettlement.setWebsitName(workerOrder.getWebsitName());
-            workerSettlement.setWorkerId(workerOrder.getWorkerId());
+            workerSettlement.setWorkerId(workerOrder.getWorkerNumber());
             workerSettlement.setWorkerName(workerOrder.getWorkerName());
             workerSettlement.setWorkerMobile(workerOrder.getWorkerMobile());
             workerSettlement.setIdentity(workerOrder.getIdentity());
@@ -768,7 +768,7 @@ public class PayOrderLogic {
                 .eq(WorkerSettlement::getWebsitId, workerOrder.getWebsitId())
                 .eq(WorkerSettlement::getType, "OTHER")
                 .eq(WorkerSettlement::getPayType, workerOrder.getPayType())
-                .eq(WorkerSettlement::getWorkerId, workerOrder.getWorkerId()).last("limit 1").one();
+                .eq(WorkerSettlement::getWorkerId, workerOrder.getWorkerNumber()).last("limit 1").one();
         if (one != null){
             one.setCommissionAmount(workerOrder.getCommissionAmount().add(one.getCommissionAmount()));
             one.setWorkerAmount(workerOrder.getWorkerAmount().add(one.getWorkerAmount()));
@@ -782,7 +782,7 @@ public class PayOrderLogic {
             workerSettlement.setCompanyWechatName(currentCompanyWechat.getCompanyName());
             workerSettlement.setWebsitId(workerOrder.getWebsitId());
             workerSettlement.setWebsitName(workerOrder.getWebsitName());
-            workerSettlement.setWorkerId(workerOrder.getWorkerId());
+            workerSettlement.setWorkerId(workerOrder.getWorkerNumber());
             workerSettlement.setWorkerName(workerOrder.getWorkerName());
             workerSettlement.setWorkerMobile(workerOrder.getWorkerMobile());
             workerSettlement.setIdentity(workerOrder.getIdentity());
@@ -806,7 +806,7 @@ public class PayOrderLogic {
             websitNormRecord.setCompanyWechatName(workerOrder.getCompanyWechatName());
             websitNormRecord.setGoodsType(workerOrder.getGoodsType());
             websitNormRecord.setWorkerId(workerOrder.getUserId());
-            websitNormRecord.setWorkerNumber(workerOrder.getWorkerId());
+            websitNormRecord.setWorkerNumber(workerOrder.getWorkerNumber());
             websitNormRecord.setWorkerName(workerOrder.getWorkerName());
             websitNormRecord.setOrderId(workerOrder.getWorkerOrderId());
             websitNormRecord.setRefOrder(workerOrder.getOrderId());
@@ -889,7 +889,7 @@ public class PayOrderLogic {
                 )
                 .eq(!StringUtil.isEmpty(payStatus) && payStatus.equals(MaterialExamineStatusEnum.PAID.getKey()),WorkerOrder::getRefundStatus, IsYesNoEnum.NO.getKey())
 
-                .eq(WorkerOrder::getWorkerId,currentCompanyWechat.getUser().getWorkerNumber())
+                .eq(WorkerOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber())
                 .between(!StringUtil.isEmpty(startTime),WorkerOrder::getCreateTime,startTime,endTime)
                 .in(WorkerOrder::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
                 .orderByDesc(WorkerOrder::getCreateTime)

mall-server-api/src/main/java/com/gree/mall/manager/bean/SalesCustomerPartsBean.java

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

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

@@ -448,7 +448,7 @@ public class SettlementOrderLogic {
                         salesCustomerPartsBean.setCompanyWechatName(workerOrder.getCompanyWechatName());
                         salesCustomerPartsBean.setRepairFlag("INNER");
                         salesCustomerPartsBean.setIdentity(workerOrder.getIdentity());
-                        salesCustomerPartsBean.setWorkerId(workerOrder.getWorkerId());
+                        salesCustomerPartsBean.setWorkerNumber(workerOrder.getWorkerNumber());
                         salesCustomerPartsBean.setWorkerName(workerOrder.getWorkerName());
                         salesCustomerPartsBean.setWorkOrderNo(workerOrder.getWorkerOrderId());
                         salesCustomerPartsBean.setCustomerName(workerOrder.getUserName());
@@ -486,7 +486,7 @@ public class SettlementOrderLogic {
                         salesCustomerPartsBean.setCompanyWechatName(workerOrder.getCompanyWechatName());
                         salesCustomerPartsBean.setRepairFlag("OUTSIDE");
                         salesCustomerPartsBean.setIdentity(workerOrder.getIdentity());
-                        salesCustomerPartsBean.setWorkerId(workerOrder.getWorkerId());
+                        salesCustomerPartsBean.setWorkerNumber(workerOrder.getWorkerNumber());
                         salesCustomerPartsBean.setWorkerName(workerOrder.getWorkerName());
                         salesCustomerPartsBean.setWorkOrderNo(workerOrder.getWorkerOrderId());
                         salesCustomerPartsBean.setCustomerName(workerOrder.getUserName());
@@ -599,7 +599,7 @@ public class SettlementOrderLogic {
             workerStockDTO.setCompanyWechatId(workerOrder.getCompanyWechatId());
             workerStockDTO.setCompanyWechatName(workerOrder.getCompanyWechatName());
             workerStockDTO.setIdentity(workerOrder.getIdentity());
-            workerStockDTO.setWorkerId(workerOrder.getWorkerId());
+            workerStockDTO.setWorkerId(workerOrder.getWorkerNumber());
             workerStockDTO.setWorkerName(workerOrder.getWorkerName());
             workerStockDTO.setWebsitId(workerOrder.getWebsitId());
             workerStockDTO.setWebsitName(workerOrder.getWebsitName());
@@ -635,7 +635,7 @@ public class SettlementOrderLogic {
             websitNormRecord.setCompanyWechatName(workerOrder.getCompanyWechatName());
             websitNormRecord.setGoodsType(workerOrder.getGoodsType());
             websitNormRecord.setWorkerId(workerOrder.getUserId());
-            websitNormRecord.setWorkerNumber(workerOrder.getWorkerId());
+            websitNormRecord.setWorkerNumber(workerOrder.getWorkerNumber());
             websitNormRecord.setWorkerName(workerOrder.getWorkerName());
             websitNormRecord.setOrderId(workerOrder.getWorkerOrderId());
             websitNormRecord.setRefOrder(workerOrder.getOrderId());
@@ -701,7 +701,7 @@ public class SettlementOrderLogic {
         WorkerSettlementManual one = workerSettlementManualService.lambdaQuery()
                 .eq(WorkerSettlementManual::getCompanyWechatId, adminCompanyWechat.getCompanyWechatId())
                 .eq(WorkerSettlementManual::getWebsitId, workerOrder.getWebsitId())
-                .eq(WorkerSettlementManual::getWorkerId, workerOrder.getWorkerId())
+                .eq(WorkerSettlementManual::getWorkerId, workerOrder.getWorkerNumber())
                 .last("limit 1").one();
         if (one != null) {
             one.setWorkerAmount(workerOrder.getManualAmount().add(one.getWorkerAmount()));
@@ -715,7 +715,7 @@ public class SettlementOrderLogic {
             workerSettlement.setCompanyWechatName(adminCompanyWechat.getCompanyName());
             workerSettlement.setWebsitId(workerOrder.getWebsitId());
             workerSettlement.setWebsitName(workerOrder.getWebsitName());
-            workerSettlement.setWorkerId(workerOrder.getWorkerId());
+            workerSettlement.setWorkerId(workerOrder.getWorkerNumber());
             workerSettlement.setWorkerName(workerOrder.getWorkerName());
             workerSettlement.setWorkerMobile(workerOrder.getWorkerMobile());
             workerSettlement.setIdentity(workerOrder.getIdentity());