FengChaoYu 9 kuukautta sitten
vanhempi
commit
41a7ef1505

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

@@ -57,6 +57,7 @@ public class WorkerOldRefundManageLogic {
     private final WorkerStockAccService workerStockAccService;
     private final MaterialGoodsStockLogic materialGoodsStockLogic;
     private final StorageService storageService;
+    private final WorkerOrderItemService workerOrderItemService;
 
     public IPage<OldRefundManageVO> pageList(ZfireParamBean zfireParamBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
@@ -486,13 +487,17 @@ public class WorkerOldRefundManageLogic {
             throw new RemoteServiceException("非保存状态,转换失败");
         }
 
+        final List<WebsitPartsOldRefundManageItem> items = websitPartsOldRefundManageItemService.lambdaQuery()
+                .eq(WebsitPartsOldRefundManageItem::getApplyNo, applyNo)
+                .list();
+
         List<WebsitPartsOldRefundManageRecord> records = websitPartsOldRefundManageRecordService.lambdaQuery()
                 .eq(WebsitPartsOldRefundManageRecord::getApplyNo, applyNo)
                 .list();
         // 取反
         String refType = PartsRepairFlagEnum.INNER.getKey().equals(refundManage.getRepairFlag()) ?
-                PartsRefTypeEnum.OUTSIDE_TO_SALES.getKey() :
-                PartsRefTypeEnum.OLD_REFUND.getKey();
+                PartsRefTypeEnum.OUTSIDE_TO_SALES.getRemark() :
+                PartsRefTypeEnum.OLD_REFUND.getRemark();
 
         // 取反
         String repairFlag = PartsRepairFlagEnum.INNER.getKey().equals(refundManage.getRepairFlag()) ?
@@ -527,6 +532,14 @@ public class WorkerOldRefundManageLogic {
                 .set(WebsitPartsOldRefundManage::getRefundAmount, totalRefundAmount)
                 .eq(WebsitPartsOldRefundManage::getApplyNo, applyNo)
                 .update();
+
+        workerOrderItemService.lambdaUpdate()
+                .set(WorkerOrderItem::getRepairFlag, repairFlag)
+                .in(WorkerOrderItem::getId, items.stream()
+                        .map(WebsitPartsOldRefundManageItem::getWorkerOrderItemId)
+                        .collect(Collectors.toList()))
+                .update();
+
     }
 
     private List<WebsitStockDTO> createWebsitStockDTO(WebsitPartsOldRefundManage partsOldRefundManage, List<WebsitPartsOldRefundManageItem> partsOldRefundManageItems) {