需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/enums/workorder/OrderBaseStatusEnum.java

@@ -25,10 +25,38 @@ public enum OrderBaseStatusEnum implements BaseEnum {
     DQD("DQD","待抢单"),
     DJD("DJD","待接单"),
     FWZ("FWZ","服务中"),
-    YCD("YCD","异常单"),
+    YCD("YCD","异常单"), //此处异常单状态，非order_base_status控制，而是根据is_exception或者order_flag的tag判断
     YWG("YWG","已完工待结算"),
     YJS("YJS","已结算"),
-    YQX("YQX","已取消")
+    YQX("YQX","已取消"),
+    CJ("CJ","创建"),
+    YPD("YPD","预派单"),
+    DXSPD("DXSPD","待销司派单"),
+    DZBPG("DZBPG","待总部派单"),
+    DSM("DSM","待上门"),
+    DWDSPGP("DWDSPGP","待一级网点审批改派"),
+    DXSSPGP("DXSSPGP","待销司审批改派"),
+    DTJXSSPGP("DTJXSSPGP","待同级销司审批改派"),
+    DZBSPGP("DZBSPGP","待总部审批改派"),
+    DWDPD("DWDPD","待网点派单"),
+    DFZXPD("DFZXPD","待分中心派单"),
+    DFZXSPGP("DFZXSPGP","待分中心审批改派"),
+    GCSZT("GCSZT","工程师在途"),
+    YZP("YZP","已转派"),
+    BFWG("BFWG","部分完工"),
+    FWZT("FWZT","服务暂停"),
+    WDBH("WDBH","网点驳回"),
+    XSBH("XSBH","销司驳回"),
+    TJXSBH("TJXSBH","同级销司驳回"),
+    ZBBH("ZBBH","总部驳回"),
+    FZXBH("FZXBH","分中心驳回"),
+    GCSZX("GCSZX","工程师完工"),
+    WDWG("WDWG","网点完工"),
+    YCGB("YCGB","异常关闭"),
+    LRCD("LRCD","录入存档"),
+    FWQX("FWQX","服务取消"),
+    FL("FL","分流3.0"),
+    YWGO("YWGO","已完工"),
     ;
 
     @EnumValue

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -383,7 +383,10 @@ public class OrderBaseLogic {
             throw new RemoteServiceException("暂无权限接单");
         }
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
-        if(!StringUtils.equals(pgOrderBase.getOrderStatus(),OrderBaseStatusEnum.DJD.getKey())){
+        if(!(StringUtils.equals(pgOrderBase.getOrderStatus(),OrderBaseStatusEnum.DJD.getKey())
+        || StringUtils.equals(pgOrderBase.getOrderStatus(),OrderBaseStatusEnum.DSM.getKey())
+                || StringUtils.equals(pgOrderBase.getOrderStatus(),OrderBaseStatusEnum.YZP.getKey())
+        )){
             throw new RemoteServiceException("当前状态不可接单");
         }
         pgOrderBase.setOrderStatus(OrderBaseStatusEnum.FWZ.getKey());

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseExcelLogic.java

@@ -958,6 +958,7 @@ public class OrderBaseExcelLogic {
 
             pgOrderBase.setComplaint(complaint);
             pgOrderBase.setUserName(userName);
+            pgOrderBase.setLinkName(userName);
             pgOrderBase.setUserMobile(userMobile);
 
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -857,7 +857,9 @@ public class OrderBaseLogic {
         if (pgOrderBase == null) {
             throw new RemoteServiceException("工单不存在");
         }
-        if (!(OrderBaseStatusEnum.YQX.getKey().equals(pgOrderBase.getOrderStatus()) || OrderBaseStatusEnum.FWQX.getKey().equals(pgOrderBase.getOrderStatus())
+        if (!(OrderBaseStatusEnum.YQX.getKey().equals(pgOrderBase.getOrderStatus())
+                || OrderBaseStatusEnum.FWZT.getKey().equals(pgOrderBase.getOrderStatus())
+                || OrderBaseStatusEnum.FWQX.getKey().equals(pgOrderBase.getOrderStatus())
                 || OrderBaseStatusEnum.YCGB.getKey().equals(pgOrderBase.getOrderStatus()))) {
             throw new RemoteServiceException("非已取消工单不可激活");
         }