1

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

@@ -112,17 +112,12 @@ public class RepairCustomerService {
         }
         if(param.getConfirm() == 1) {
             //有检测费用，已取消，无检测费用，直接到代发货
-            List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repair.getRepairId(), 1);
             BigDecimal robAmount = priceListService.getRobAmountByRepairId(repair.getRepairId());
 
             repairService.updateCancelStatus(repair.getRepairId(),1,param.getRemark());
             Integer status = null;
             if(robAmount.compareTo(BigDecimal.ZERO) <=0  || StatusUtil.getWarranty(repair.getWarrantyType())){
-                if(partVoList.size() >0){
-                    status = RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status();
-                }else {
-                    status = RepairStatusEnum.TO_BE_SHIPPED.status();
-                }
+                status = RepairStatusEnum.TO_BE_SHIPPED.status();
             } else {
                 status = RepairStatusEnum.TO_BE_CANCELED.status();
             }

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

@@ -85,14 +85,10 @@ public class RepairTesterService {
             entity.setPassTime(DateUtil.getDate());
             repairTestService.save(entity);
 
-            List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repair.getRepairId(), 1);
+            //List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repair.getRepairId(), 1);
             BigDecimal payAmount = priceListService.getAmountByRepairId(repair.getRepairId());
             if(StatusUtil.getWarranty(repair.getWarrantyType()) || payAmount.compareTo(BigDecimal.ZERO) <=0){
-                if(partVoList.size() >0){
-                    repairLogService.saveBySysUser(userId,testParam.getRepairId(), RepairStatusEnum.TO_BE_RECOVERED.status(),repair.getStatus(),"测试通过",entity.getTestId());
-                }else {
-                    repairLogService.saveBySysUser(userId,testParam.getRepairId(), RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"测试通过",entity.getTestId());
-                }
+                repairLogService.saveBySysUser(userId,testParam.getRepairId(), RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"测试通过",entity.getTestId());
             }else {
                 repairLogService.saveBySysUser(userId,testParam.getRepairId(), RepairStatusEnum.TO_BE_PAID.status(),repair.getStatus(),"测试通过",entity.getTestId());
             }