no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsSalesOrderLogic.java

@@ -819,7 +819,7 @@ public class WebsitPartsSalesOrderLogic {
                 .setWorkerName(partsSalesOrderBean.getWorkerName())
                 .setSalesId(partsSalesOrderBean.getId())
                 .setRef(partsSalesOrderBean.getId())
-                .setRefType(PartsRefTypeEnum.SALES.toString())
+                .setRefType(PartsRefTypeEnum.SALES.getRemark())
                 .setRefundAmount(partsSalesOrderBean.getTotalAmount())
                 .setRefundState(PartsRefundStateEnum.WAIT.getKey())
                 .setIsExec(IsEnum.N.getValue())

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WorkerOldRefundManageLogic.java

@@ -194,7 +194,7 @@ public class WorkerOldRefundManageLogic {
      * @param examineRemark
      */
     @Transactional
-    public void examine(String applyNo, Boolean isDisc, String examineRemark) {
+    public void examine(String applyNo, Boolean isDisc, String examineRemark) throws Exception {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         WebsitPartsOldRefundManage partsOldRefundManage = websitPartsOldRefundManageService.getById(applyNo);
         if (Objects.isNull(partsOldRefundManage)) {
@@ -204,8 +204,8 @@ public class WorkerOldRefundManageLogic {
             throw new RemoteServiceException("申请单号不存在");
         }
 
-        String refType = PartsRefTypeEnum.OUTSIDE_TO_SALES.toString();
-        String flag = isDisc ? PartsOrderFlagEnum.AGREE.getKey() : PartsOrderFlagEnum.WAIT_REVIEW.toString();
+        String refType = PartsRefTypeEnum.OUTSIDE_TO_SALES.getRemark();
+        String flag = isDisc ? PartsOrderFlagEnum.AGREE.getKey() : PartsOrderFlagEnum.WAIT_REVIEW.getKey();
 
         DateTime curDate = DateUtil.date();
         partsOldRefundManage.setExamineRemark(examineRemark)
@@ -222,11 +222,11 @@ public class WorkerOldRefundManageLogic {
                 .list();
 
         // 已审批的处理
-        if (flag.equals(PartsOrderFlagEnum.AGREE.toString())) {
+        if (flag.equals(PartsOrderFlagEnum.AGREE.getKey())) {
             // 减师傅临占旧件库存
-//            List<WorkerStockDTO> workerStockDTOList = oldRefundManageInnerLogic.createWorkerStockDTO(partsOldRefundManage, partsOldRefundManageItems,
-//                    refType, PartsStockPartsAttrEnum.TEMP_OLD.toString(), null, flag);
-//            partsStockLogic.handleWorkerStock(workerStockDTOList);
+            List<WorkerStockDTO> workerStockDTOList = oldRefundManageInnerLogic.createWorkerStockDTO(partsOldRefundManage, partsOldRefundManageItems,
+                    refType, PartsAttrEnum.TEMP_OLD.getKey(), null, flag);
+            materialGoodsStockLogic.handleWorkerStock(workerStockDTOList);
 
             List<WebsitPartsOldRefundManageRecord> partsNewRefundManageRecords = websitPartsOldRefundManageRecordService.lambdaQuery()
                     .eq(WebsitPartsOldRefundManageRecord::getApplyNo, partsOldRefundManage.getApplyNo())
@@ -244,7 +244,7 @@ public class WorkerOldRefundManageLogic {
      * @param reviewRemark
      */
     @Transactional(rollbackFor = Exception.class)
-    public void review(String applyNo, Boolean reviewResult, String reviewRemark) {
+    public void review(String applyNo, Boolean reviewResult, String reviewRemark) throws Exception {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         WebsitPartsOldRefundManage partsOldRefundManage = websitPartsOldRefundManageService.getById(applyNo);
         if (Objects.isNull(partsOldRefundManage)) {
@@ -254,7 +254,7 @@ public class WorkerOldRefundManageLogic {
             throw new RemoteServiceException("申请单号不存在");
         }
 
-        String refType = PartsRefTypeEnum.OUTSIDE_TO_SALES.getKey();
+        String refType = PartsRefTypeEnum.OUTSIDE_TO_SALES.getRemark();
         String flag = PartsOrderFlagEnum.REVIEWED.getKey();
 
         DateTime curDate = DateUtil.date();
@@ -273,10 +273,10 @@ public class WorkerOldRefundManageLogic {
 
         // 已复核的处理
         // 减师傅临占旧件库存
-//        List<WorkerStockDTO> workerStockDTOList = oldRefundManageInnerLogic.createWorkerStockDTO(partsOldRefundManage, partsOldRefundManageItems,
-//                refType, PartsStockPartsAttrEnum.TEMP_OLD.toString(), null, flag);
-//
-//        partsStockLogic.handleWorkerStock(workerStockDTOList);
+        List<WorkerStockDTO> workerStockDTOList = oldRefundManageInnerLogic.createWorkerStockDTO(partsOldRefundManage, partsOldRefundManageItems,
+                refType, PartsAttrEnum.TEMP_OLD.getKey(), null, flag);
+
+        materialGoodsStockLogic.handleWorkerStock(workerStockDTOList);
 
         if (reviewResult) {
             List<WebsitPartsOldRefundManageRecord> partsNewRefundManageRecords = websitPartsOldRefundManageRecordService.lambdaQuery()

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/worker/NewRefundManageLogic.java

@@ -171,7 +171,7 @@ public class NewRefundManageLogic {
                     .setSalesId(partsNewRefundManageRecord.getSalesId())
                     .setSalesItemId(partsNewRefundManageRecord.getSalesItemId())
                     .setRef(partsNewRefundManage.getApplyNo())
-                    .setRefType(PartsRefTypeEnum.NEW_REFUND.getKey())
+                    .setRefType(PartsRefTypeEnum.NEW_REFUND.getRemark())
                     .setPartsNumber(partsNewRefundManageRecord.getPartsNumber())
                     .setPartsName(partsNewRefundManageRecord.getPartsName())
                     .setRefundAmount(partsNewRefundManageRecord.getRefundAmount())

mall-server-api/src/main/java/com/gree/mall/manager/schedule/PartsRefundSchedule.java

@@ -145,7 +145,7 @@ public class PartsRefundSchedule {
                     .setIsExec(true)
                     .setInfo(refundSerialnumber);
             String refType = partsRefundRecord.getRefType();
-            if (refType.equals(PartsRefTypeEnum.NEW_REFUND.getKey())) {
+            if (refType.equals(PartsRefTypeEnum.NEW_REFUND.getRemark())) {
                 // 新件返还表
                 websitPartsNewRefundManageRecordService.lambdaUpdate()
                         .set(WebsitPartsNewRefundManageRecord::getRefundTime, refundTime)
@@ -155,7 +155,7 @@ public class PartsRefundSchedule {
                         .set(WebsitPartsNewRefundManageRecord::getRefundSerialnumber, refundSerialnumber)
                         .eq(WebsitPartsNewRefundManageRecord::getId, partsRefundRecord.getRecordId())
                         .update();
-            } else if (refType.equals(PartsRefTypeEnum.OLD_REFUND.toString()) || refType.equals(PartsRefTypeEnum.OUTSIDE_TO_SALES.toString())) {
+            } else if (refType.equals(PartsRefTypeEnum.OLD_REFUND.getRemark()) || refType.equals(PartsRefTypeEnum.OUTSIDE_TO_SALES.getRemark())) {
                 // 旧件返还表
                 websitPartsOldRefundManageRecordService.lambdaUpdate()
                         .set(WebsitPartsOldRefundManageRecord::getRefundTime, refundTime)