1

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

@@ -205,13 +205,15 @@ public class RepairPersonnelService {
         if(!repair.getStatus().equals(RepairStatusEnum.TO_BE_REPAIRED.status())){
             throw new BusinessException(ResultCode.REPAIR_STATUS_NOT_EXITS);
         }
-        List<PriceList> priceListList = priceListService.getByRepairId(repair.getRepairId());
-        List<PriceList> collect = priceListList.stream().filter(entity ->entity.getType()== 0 && entity.getRecoveryStatus() == 0).collect(Collectors.toList());
-        if(collect.size() >0){
-            repairLogService.saveBySysUser(userId,repair.getRepairId(),RepairStatusEnum.TO_BE_TESTED.status(),"维修完成");
-        }else {
-            repairLogService.saveBySysUser(userId,repair.getRepairId(), RepairStatusEnum.TO_BE_PAID.status(), "维修完成");
-        }
+        repairLogService.saveBySysUser(userId,repair.getRepairId(),RepairStatusEnum.TO_BE_TESTED.status(),"维修完成");
+
+//        List<PriceList> priceListList = priceListService.getByRepairId(repair.getRepairId());
+//        List<PriceList> collect = priceListList.stream().filter(entity ->entity.getType()== 0 && entity.getRecoveryStatus() == 0).collect(Collectors.toList());
+//        if(collect.size() >0){
+//            repairLogService.saveBySysUser(userId,repair.getRepairId(),RepairStatusEnum.TO_BE_TESTED.status(),"维修完成");
+//        }else {
+//            repairLogService.saveBySysUser(userId,repair.getRepairId(), RepairStatusEnum.TO_BE_PAID.status(), "维修完成");
+//        }
         repairRegisterService.repairOver(repair.getRepairId(),param.getRemark());
 
     }

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

@@ -42,6 +42,8 @@ public class RepairServiceImpl extends ServiceImpl<IRepairMapper, Repair> implem
     IRepairPayService repairPayService;
     @Autowired
     IRepairFaultService repairFaultService;
+    @Autowired
+    IRepairRegisterPartService repairRegisterPartService;
 
     @Override
     public void updateRepairStatus(String repairId, Integer status) {
@@ -80,7 +82,12 @@ public class RepairServiceImpl extends ServiceImpl<IRepairMapper, Repair> implem
         }
         repairPayService.updatePayStatus(orderSn,tradeNo,openid);
         if(orderSn.contains("se_s")){
-            repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_RECOVERED.status(),"完成维修支付成功");
+            List<RepairRegisterPart> registerParts = repairRegisterPartService.getByRepairId(repairPay.getRepairId());
+            if(registerParts != null && registerParts.size() >0){
+                repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_RECOVERED.status(),"完成维修支付成功");
+            }else {
+                repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_SHIPPED.status(),"完成维修支付成功");
+            }
         }
         if(orderSn.contains("se_c")){
             repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status(),"取消维修支付成功");