1

src/main/java/com/fdkankan/sale/service/impl/RepairCheckAccountService.java

@@ -67,19 +67,19 @@ public class RepairCheckAccountService {
             throw new BusinessException(ResultCode.NOt_PAY);
         }
 
-        List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repair.getRepairId(), 1);
-
-        Integer status = null;
-        if(repairPay.getOrderType() == 0){
-            status = RepairStatusEnum.TO_BE_RECOVERED.status();
-        }
-        if(repairPay.getOrderType() == 1){
-            status = RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status();
-        }
-        if(partVoList.size() <=0){
-            status = RepairStatusEnum.TO_BE_SHIPPED.status();
-        }
-
+//        List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repair.getRepairId(), 1);
+//
+//        Integer status = null;
+//        if(repairPay.getOrderType() == 0){
+//            status = RepairStatusEnum.TO_BE_RECOVERED.status();
+//        }
+//        if(repairPay.getOrderType() == 1){
+//            status = RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status();
+//        }
+//        if(partVoList.size() <=0){
+//            status = RepairStatusEnum.TO_BE_SHIPPED.status();
+//        }
+        Integer status = RepairStatusEnum.TO_BE_SHIPPED.status();
         repairLogService.saveBySysUser(param.getSysUserId(),param.getRepairId(),status,repair.getStatus(),"到账登记");
 
         repairCheckAccountService.save(param);

src/main/java/com/fdkankan/sale/service/impl/RepairServiceImpl.java

@@ -101,20 +101,24 @@ public class RepairServiceImpl extends ServiceImpl<IRepairMapper, Repair> implem
         }
         repairPayService.updatePayStatus(orderSn,tradeNo,openid);
         if(orderSn.contains("s")){
-            List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repairPay.getRepairId(), 1);
-            if(partVoList.size() >0){
-                repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_RECOVERED.status(),repair.getStatus(),"完成维修支付成功");
-            }else {
-                repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"完成维修支付成功");
-            }
+//            List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repairPay.getRepairId(), 1);
+//            if(partVoList.size() >0){
+//                repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_RECOVERED.status(),repair.getStatus(),"完成维修支付成功");
+//            }else {
+//                repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"完成维修支付成功");
+//            }
+            repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"完成维修支付成功");
         }
         if(orderSn.contains("c")){
-            List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repairPay.getRepairId(), 1);
-            if(partVoList.size() >0){
-                repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status(),repair.getStatus(),"取消维修支付成功");
-            }else {
-                repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"取消维修支付成功");
-            }
+//            List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repairPay.getRepairId(), 1);
+//            if(partVoList.size() >0){
+//                repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status(),repair.getStatus(),"取消维修支付成功");
+//            }else {
+//                repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"取消维修支付成功");
+//            }
+
+            repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"取消维修支付成功");
+
         }
     }