lyhzzz 2 gadi atpakaļ
vecāks
revīzija
226a5eb42c

+ 58 - 0
src/main/java/com/fdkankan/sale/common/RepairStatusEnumMsg.java

@@ -0,0 +1,58 @@
+package com.fdkankan.sale.common;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
+
+public enum RepairStatusEnumMsg {
+
+    TO_BE_RECEIVED(0, "待客服接单"),
+    TO_BE_CHECK(10, "维修工{userName}检测中"),
+    TO_BE_QUOTED(20, "售后{userName}费用确认中"),
+    TO_BE_CONFIRMED(30, "待确认报价"),
+    TO_BE_CANCELED(40, "已取消维修"),
+    TO_BE_PREPARED(50, "正在准备所需备件"),
+    TO_BE_REPAIRED(60, "维修工{userName}维修中"),
+    TO_BE_TESTED(70, "测试{userName}正在测试"),
+    TO_BE_PAID(80, "待支付费用"),
+    TO_BE_RECOVERED(90, "待回收备件"),
+    TO_BE_CANCELED_RECOVERED(91, "待回收备件"),
+    TO_BE_SHIPPED(100, "待取回/寄回设备"),
+    OVER_SHIPPED(110, "售后{userName}已完成发货"),
+    ;
+
+    private Integer status;
+    private String message;
+
+    private RepairStatusEnumMsg(Integer status, String message) {
+        this.status = status;
+        this.message = message;
+    }
+
+    public Integer status() {
+        return this.status;
+    }
+
+    public String message() {
+        return this.message;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    private static Map<Integer, RepairStatusEnumMsg> map ;
+
+    static {
+        map = Arrays.asList(values()).stream().collect(Collectors.toMap(RepairStatusEnumMsg::getStatus, UnaryOperator.identity()));
+    }
+    public static RepairStatusEnumMsg getByStatus(Integer status){
+        return map.get(status);
+    }
+
+}

+ 4 - 1
src/main/java/com/fdkankan/sale/service/impl/RepairInfoService.java

@@ -185,6 +185,7 @@ public class RepairInfoService {
         if(log.getRepairStatus() >=RepairStatusEnum.OVER_SHIPPED.status()){
             return null;
         }
+        String subTitle = RepairStatusEnum.getByStatus(log.getRepairStatus()).getMessage();
         List<Integer> noUserNameList = Arrays.asList(10, 30,40, 80, 110);
 
         if(!noUserNameList.contains(log.getRepairStatus())){
@@ -206,9 +207,11 @@ public class RepairInfoService {
             SysUser sysUser = sysUserService.getById(sysUserId);
             if(sysUser != null){
                 log.setSysUserName(sysUser.getUserName());
+                subTitle = subTitle.replace("{userName}",sysUser.getUserName());
             }
-        }
 
+        }
+        log.setSubTitle(subTitle);
         log.setRemark(RepairStatusEnum.getByStatus(log.getRepairStatus()).getMessage());
         return log;
     }

+ 2 - 0
src/main/java/com/fdkankan/sale/vo/response/RepairLogVo.java

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