1

src/main/java/com/fdkankan/sale/common/RepairStatusEnum.java

@@ -12,7 +12,7 @@ public enum  RepairStatusEnum {
     TO_BE_CHECK(10, "维修检测"),
     TO_BE_QUOTED(20, "维修报价"),
     TO_BE_CONFIRMED(30, "维修确认"),
-    TO_BE_CANCELED(40, "维修取消"),
+    TO_BE_CANCELED(40, "维修支付"),
     TO_BE_PREPARED(50, "备件准备"),
     TO_BE_REPAIRED(60, "设备维修"),
     TO_BE_TESTED(70, "维修测试"),

src/main/java/com/fdkankan/sale/common/RepairStatusEnumMsg.java

@@ -11,7 +11,7 @@ public enum RepairStatusEnumMsg {
     TO_BE_CHECK(10, "{userName}检测中"),
     TO_BE_QUOTED(20, "{userName}费用确认中"),
     TO_BE_CONFIRMED(30, "待确认报价"),
-    TO_BE_CANCELED(40, "已取消维修"),
+    TO_BE_CANCELED(40, "待支付费用"),
     TO_BE_PREPARED(50, "正在准备所需备件"),
     TO_BE_REPAIRED(60, "{userName}维修中"),
     TO_BE_TESTED(70, "{userName}正在测试"),

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

@@ -88,12 +88,12 @@ public class RepairCustomerService {
 
             if(robAmount.compareTo(BigDecimal.ZERO) <=0  ||  repair.getWarrantyType() == 0 ){
                 if(partVoList.size() >0){
-                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status(),"已取消维修");
+                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status(),"取消维修");
                 }else {
-                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),"已取消维修");
+                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),"取消维修");
                 }
             } else {
-                repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED.status(),"已取消维修");
+                repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED.status(),"取消维修");
             }
 
         }

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

@@ -166,6 +166,7 @@ public class RepairInfoService {
                     repairLogVo.setCustomerAddress(customerAddress);
                     break;
             }
+            return setTitle(repairLogVo);
         }
         List<RepairLogVo> repairLogListVo = new ArrayList<>();
         if(repairLogList.size() >0){
@@ -176,6 +177,8 @@ public class RepairInfoService {
             }
             repairLogListVo.addAll(repairLogList);
         }
+
+
         return repairLogListVo;
     }
 
@@ -186,11 +189,14 @@ public class RepairInfoService {
         if(log.getRepairStatus() >=RepairStatusEnum.OVER_SHIPPED.status()){
             return null;
         }
+        return setTitle(log);
+    }
+
+    private RepairLogVo setTitle(RepairLogVo log) {
         String subTitle = RepairStatusEnumMsg.getByStatus(log.getRepairStatus()).getMessage();
         List<Integer> noUserNameList = Arrays.asList( 30,40, 80, 110);
-
         if(!noUserNameList.contains(log.getRepairStatus())){
-            OrderReceiving orderReceiving = orderReceivingService.getByRepairId(repairLogVo.getRepairId());
+            OrderReceiving orderReceiving = orderReceivingService.getByRepairId(log.getRepairId());
             Long sysUserId = null;
             switch (log.getRepairStatus()){
                 case 10 :
@@ -214,7 +220,8 @@ public class RepairInfoService {
 
         }
         log.setSubTitle(subTitle);
-        log.setRemark(RepairStatusEnum.getByStatus(log.getRepairStatus()).getMessage());
+        String title = RepairStatusEnum.getByStatus(log.getRepairStatus()).getMessage();
+        log.setTitle(title);
         return log;
     }
 

src/main/java/com/fdkankan/sale/vo/response/RepairLogVo.java

@@ -23,6 +23,8 @@ public class RepairLogVo extends RepairLog {
 
     private String subTitle;
 
+    private String title;
+
     public JSONArray getImagesInfo() {
         if(imagesInfo == null){
             return new JSONArray();