1

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

@@ -181,9 +181,9 @@ public class RepairPersonnelService {
         RepairRegisterLog repairRegisterLog = repairRegisterLogService.saveLog(repairRegister);
         this.addRepairPart(param.getPartList(),repair,repairRegister,repairRegisterLog.getRegisterLogId());
         if(repair.getWarrantyType() == 0){
-            repairLogService.saveBySysUser(userId,repair.getRepairId(),RepairStatusEnum.TO_BE_PREPARED.status(),"维修中添加备件");
+            repairLogService.saveBySysUser(userId,repair.getRepairId(),RepairStatusEnum.TO_BE_PREPARED.status(),"维修中添加备件",repairRegisterLog.getRegisterLogId());
         }else {
-            repairLogService.saveBySysUser(userId,repair.getRepairId(),RepairStatusEnum.TO_BE_QUOTED.status(),"维修中添加备件");
+            repairLogService.saveBySysUser(userId,repair.getRepairId(),RepairStatusEnum.TO_BE_QUOTED.status(),"维修中添加备件",repairRegisterLog.getRegisterLogId());
         }
 
     }

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

@@ -258,6 +258,10 @@ public class RepairSaleService {
         if(!repair.getStatus().equals(RepairStatusEnum.TO_BE_CANCELED.status()) && !repair.getStatus().equals(RepairStatusEnum.TO_BE_PAID.status())){
             throw new BusinessException(ResultCode.REPAIR_STATUS_NOT_EXITS);
         }
+        RepairPay byRepairId = repairPayService.getByRepairId(repair.getRepairId(), 1);
+        if(byRepairId != null){
+            throw new BusinessException(ResultCode.ORDER_PAY_ERROR);
+        }
         BigDecimal payAmount;
         if(repair.getStatus().equals(RepairStatusEnum.TO_BE_CANCELED.status())){
             payAmount = priceListService.getRobAmountByRepairId(repair.getRepairId());