no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/stock/WorkerStockDTO.java

@@ -141,17 +141,17 @@ public class WorkerStockDTO {
 
     public void computeWorkerStock(WorkerStock workerStock, WorkerStockAcc workerStockAcc) throws RemoteServiceException {
         BigDecimal qty;
-        if (this.partsAttr.equals(PartsAttrEnum.NEW.toString())) {
+        if (this.partsAttr.equals(PartsAttrEnum.NEW.getKey())) {
             qty = workerStock.getQty();
-        } else if (this.partsAttr.equals(PartsAttrEnum.OLD.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.OLD.getKey())) {
             qty = workerStock.getOldQty();
-        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_NEW.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_NEW.getKey())) {
             qty = workerStock.getTempNewQty();
-        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_OLD.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_OLD.getKey())) {
             qty = workerStock.getTempOldQty();
-        } else if (this.partsAttr.equals(PartsAttrEnum.WAY.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.WAY.getKey())) {
             qty = workerStock.getWayQty();
-        } else if (this.partsAttr.equals(PartsAttrEnum.CHANGE_NEW.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.CHANGE_NEW.getKey())) {
             qty = workerStock.getChangeSalesQty();
         } else {
             throw new RemoteServiceException("配件库存属性不匹配：" + this.partsAttr);
@@ -171,17 +171,17 @@ public class WorkerStockDTO {
                 .setOperBy(this.operateBy)
                 .setOperTime(this.operateTime);
         // 注入库存
-        if (this.partsAttr.equals(PartsAttrEnum.NEW.toString())) {
+        if (this.partsAttr.equals(PartsAttrEnum.NEW.getKey())) {
             workerStock.setQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.OLD.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.OLD.getKey())) {
             workerStock.setOldQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_NEW.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_NEW.getKey())) {
             workerStock.setTempNewQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_OLD.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_OLD.getKey())) {
             workerStock.setTempOldQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.WAY.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.WAY.getKey())) {
             workerStock.setWayQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.CHANGE_NEW.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.CHANGE_NEW.getKey())) {
             workerStock.setChangeSalesQty(closeQty);
         }
         workerStock.setOperBy(this.operateBy)

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

@@ -173,6 +173,7 @@ public class NewRefundManageLogic {
                 workerStockDTO.setWebsitName(partsNewRefundManage.getReceiveWebsitName());
                 workerStockDTO.setPartsWebsitId(partsNewRefundManage.getReceivePartsWebsitId());
                 workerStockDTO.setSdate(DateUtil.date());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.toString());
                 workerStockDTO.setGoodsId(refundManageItem.getPartsNumber());
                 workerStockDTO.setGoodsName(refundManageItem.getPartsName());
                 workerStockDTO.setMaterialGroupName(refundManageItem.getMaterialGroupName());
@@ -198,6 +199,7 @@ public class NewRefundManageLogic {
                 workerStockDTO.setWebsitName(partsNewRefundManage.getReceiveWebsitName());
                 workerStockDTO.setPartsWebsitId(partsNewRefundManage.getReceivePartsWebsitId());
                 workerStockDTO.setSdate(DateUtil.date());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.toString());
                 workerStockDTO.setGoodsId(refundManageItem.getPartsNumber());
                 workerStockDTO.setGoodsName(refundManageItem.getPartsName());
                 workerStockDTO.setMaterialGroupName(refundManageItem.getMaterialGroupName());

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

@@ -250,6 +250,7 @@ public class OldRefundManageLogic {
                 workerStockDTO.setWebsitName(partsOldRefundManage.getReceiveWebsitName());
                 workerStockDTO.setPartsWebsitId(partsOldRefundManage.getReceivePartsWebsitId());
                 workerStockDTO.setSdate(DateUtil.date());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.toString());
                 workerStockDTO.setGoodsId(refundManageItem.getNewPartsNumber());
                 workerStockDTO.setGoodsName(refundManageItem.getNewPartsName());
                 workerStockDTO.setMaterialGroupName(refundManageItem.getNewMaterialGroupName());
@@ -279,6 +280,7 @@ public class OldRefundManageLogic {
                 workerStockDTO.setWebsitName(partsOldRefundManage.getReceiveWebsitName());
                 workerStockDTO.setPartsWebsitId(partsOldRefundManage.getReceivePartsWebsitId());
                 workerStockDTO.setSdate(DateUtil.date());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.toString());
                 workerStockDTO.setGoodsId(refundManageItem.getNewPartsNumber());
                 workerStockDTO.setGoodsName(refundManageItem.getNewPartsName());
                 workerStockDTO.setMaterialGroupName(refundManageItem.getNewMaterialGroupName());

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

@@ -166,6 +166,7 @@ public class WebsitPartsSalesOrderLogic {
                 workerStockDTO.setWebsitName(partsSalesOrderBean.getWebsitName());
                 workerStockDTO.setSdate(DateUtil.date());
                 workerStockDTO.setPartsWebsitId(item.getPartsWebsitId());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.toString());
                 workerStockDTO.setGoodsId(item.getPartsNumber());
                 workerStockDTO.setGoodsName(item.getPartsName());
                 workerStockDTO.setMaterialGroupName(item.getMaterialGroupName());
@@ -190,6 +191,7 @@ public class WebsitPartsSalesOrderLogic {
                 workerStockDTO.setWebsitName(partsSalesOrderBean.getWebsitName());
                 workerStockDTO.setSdate(DateUtil.date());
                 workerStockDTO.setPartsWebsitId(item.getPartsWebsitId());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.toString());
                 workerStockDTO.setGoodsId(item.getPartsNumber());
                 workerStockDTO.setGoodsName(item.getPartsName());
                 workerStockDTO.setMaterialGroupName(item.getMaterialGroupName());

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/stock/MaterialGoodsStockLogic.java

@@ -412,11 +412,11 @@ public class MaterialGoodsStockLogic {
             salesItemRecordDTO.setSalesId(partsNewRefundManageItem.getSalesId());
             salesItemRecordDTOList.add(salesItemRecordDTO);
         }
-        return this.handleShopSales(websitId, partsWebsitId, identity, salesItemRecordDTOList, refType);
+        return this.handleWebsitSales(websitId, partsWebsitId, identity, salesItemRecordDTOList, refType);
     }
 
-    private List<PartsRefundRecordDTO> handleShopSales(String websitId, String partsWebsitId, String identity,
-                                                       List<SalesItemRecordDTO> salesItemRecordDTOList, String refType
+    private List<PartsRefundRecordDTO> handleWebsitSales(String websitId, String partsWebsitId, String identity,
+                                                         List<SalesItemRecordDTO> salesItemRecordDTOList, String refType
     ) throws Exception {
         // 锁定销售单明细
         String lockName = websitId + "|" + partsWebsitId + "|" + identity;
@@ -546,6 +546,6 @@ public class MaterialGoodsStockLogic {
             salesItemRecordDTO.setIsBackup(partsOldRefundManageItem.getIsBackup());
             salesItemRecordDTOList.add(salesItemRecordDTO);
         }
-        return this.handleShopSales(receiveWebsitId, receivePartsWebsitId, identity, salesItemRecordDTOList, refType);
+        return this.handleWebsitSales(receiveWebsitId, receivePartsWebsitId, identity, salesItemRecordDTOList, refType);
     }
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/stock/WorkerStockDTO.java

@@ -159,13 +159,13 @@ public class WorkerStockDTO {
             qty = workerStock.getQty();
         } else if (this.partsAttr.equals(PartsAttrEnum.OLD.getKey())) {
             qty = workerStock.getOldQty();
-        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_NEW.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_NEW.getKey())) {
             qty = workerStock.getTempNewQty();
-        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_OLD.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_OLD.getKey())) {
             qty = workerStock.getTempOldQty();
-        } else if (this.partsAttr.equals(PartsAttrEnum.WAY.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.WAY.getKey())) {
             qty = workerStock.getWayQty();
-        } else if (this.partsAttr.equals(PartsAttrEnum.CHANGE_NEW.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.CHANGE_NEW.getKey())) {
             qty = workerStock.getChangeSalesQty();
         } else {
             throw new RemoteServiceException("配件库存属性不匹配：" + this.partsAttr);
@@ -189,13 +189,13 @@ public class WorkerStockDTO {
             workerStock.setQty(closeQty);
         } else if (this.partsAttr.equals(PartsAttrEnum.OLD.getKey())) {
             workerStock.setOldQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_NEW.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_NEW.getKey())) {
             workerStock.setTempNewQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_OLD.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_OLD.getKey())) {
             workerStock.setTempOldQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.WAY.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.WAY.getKey())) {
             workerStock.setWayQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.CHANGE_NEW.toString())) {
+        } else if (this.partsAttr.equals(PartsAttrEnum.CHANGE_NEW.getKey())) {
             workerStock.setChangeSalesQty(closeQty);
         }
         workerStock.setOperBy(this.operateBy)