保内维修，备件出库

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

@@ -35,6 +35,8 @@ public class RepairCustomerService {
     IRepairPayService repairPayService;
     @Autowired
     IPriceListService priceListService;
+    @Autowired
+    IRepairRegisterPartService repairRegisterPartService;
 
     public Object getRepairByOpenId(String openId) {
         List<Customer> list = customerService.getByOpenId(openId);
@@ -65,18 +67,23 @@ public class RepairCustomerService {
         if(!repair.getStatus().equals(RepairStatusEnum.TO_BE_CONFIRMED.status())){
             throw new BusinessException(ResultCode.REPAIR_STATUS_NOT_EXITS);
         }
-
         if(param.getConfirm() == 0){
             priceListService.updateStatusByRepairId(repair.getRepairId());
-            repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_PREPARED.status(),"确认维修");
+            //无备件更换，不需要备料，应直接进入维修中
+            List<RepairRegisterPart> partList = repairRegisterPartService.getByRepairId(repair.getRepairId());
+            if(partList == null || partList.size() <=0){
+                repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_REPAIRED.status(),"确认维修");
+            }else {
+                repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_PREPARED.status(),"确认维修");
+            }
         }
         if(param.getConfirm() == 1) {
             //有检测费用，已取消，无检测费用，直接到代发货
             BigDecimal robAmount = priceListService.getRobAmountByRepairId(repair.getRepairId());
             if(robAmount !=null && robAmount.compareTo(BigDecimal.ZERO) >0){
-                repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED.status(),"拒绝报价");
+                repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED.status(),"已取消维修");
             }else {
-                repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),"拒绝报价");
+                repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),"已取消维修");
             }
         }
     }

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

@@ -123,7 +123,7 @@ public class RepairPersonnelService {
                 repairStatus = RepairStatusEnum.TO_BE_REPAIRED.status();
             }
         }
-        repairLogService.saveBySysUser(userId,repair.getRepairId(),repairStatus,"维修登记");
+        repairLogService.saveBySysUser(userId,repair.getRepairId(),repairStatus,"维修检测");
         this.addRepairPart(param.getPartList(),repair,repairRegister,partIdMap);
 
         repairFaultService.delByRepairId(repair.getRepairId());
@@ -162,6 +162,9 @@ public class RepairPersonnelService {
             priceList.setCount(partVo.getPartCount());
             priceList.setPartId(part.getPartId());
             priceList.setPriceDiscount(part.getPartPriceDiscount());
+            if(repairRegister.getDefineDamage() == 0  && repair.getWarrantyType() == 0){
+                priceList.setStatus(1);
+            }
             priceListService.save(priceList);
 
         }

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

@@ -96,7 +96,7 @@ public class RepairSaleService {
         param.setOrderFaultImg(param.getImageUrl());
         orderReceivingService.save(param);
 
-        repairLogService.saveBySysUser(sysUserId,param.getRepairId(), RepairStatusEnum.TO_BE_CHECK.status(),"接单");
+        repairLogService.saveBySysUser(sysUserId,param.getRepairId(), RepairStatusEnum.TO_BE_CHECK.status(),"客服接单");
 
     }
 
@@ -151,7 +151,7 @@ public class RepairSaleService {
         customerAddressService.save(customerAddress);
 
         repairService.save(repair);
-        repairLogService.saveBySysUser(userId,repair.getRepairId(),RepairStatusEnum.TO_BE_RECEIVED.status(),"录单");
+        repairLogService.saveBySysUser(userId,repair.getRepairId(),RepairStatusEnum.TO_BE_RECEIVED.status(),"报修");