实体调整

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/issue/IssueOrderStatus.java

@@ -4,9 +4,7 @@ package cn.com.taiji.core.entity.dict.issue;
  * 订单状态
  **/
 public enum IssueOrderStatus {
-    /**
-     * 描述
-     */
+
     CANCEL("-1", "已取消"), // 订单取消
     NORMAL("0", "正常"), // 订单进行中
     ACTIVE("1", "已激活"), //
@@ -14,14 +12,8 @@ public enum IssueOrderStatus {
     FAIL_END("-2", "失败的结束"),// 如订单审核失败
     ;
 
-    /**
-     * 状态码
-     */
     private final String code;
 
-    /**
-     * 状态描述
-     */
     private final String status;
 
     IssueOrderStatus(String code, String status) {
@@ -29,22 +21,6 @@ public enum IssueOrderStatus {
         this.status = status;
     }
 
-    /**
-     * 根据编码查找枚举
-     *
-     * @param code
-     *            编码
-     * @return step 描述
-     **/
-    public static String findName(String code) {
-        for (IssueOrderStatus instance : IssueOrderStatus.values()) {
-            if (instance.getCode().equals(code)) {
-                return instance.getStatus();
-            }
-        }
-        return null;
-    }
-
     public String getCode() {
         return code;
     }
@@ -52,4 +28,5 @@ public enum IssueOrderStatus {
     public String getStatus() {
         return status;
     }
+
 }

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/issue/IssueOrderStep.java

@@ -1,10 +1,7 @@
 package cn.com.taiji.core.entity.dict.issue;
 
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-
-
 /**
- * 字典表
+ * 发行订单阶段
  * @author : qiubh
  * @date : 2025-05-09
  */
@@ -23,25 +20,10 @@ public enum IssueOrderStep {
     ACTIVED(11, "已完成"),
     APPLY_CHANGE(12, "申请换货"),
     APPLY_RETURN(13, "申请退货"),
-    ORDER_STEP_14(14, "已结束"),
-    ORDER_STEP_15(15, "退款中"),
-    ORDER_STEP_16(16, "退款成功"),
-    ORDER_STEP_17(17, "退货成功"),
-    ORDER_STEP_18(18, "换货-设备已回收"),
-    ORDER_STEP_19(19, "审核中"),
-    /*ORDER_STEP_20(20, ApplyType.CARD.getName()),
-    ORDER_STEP_21(21, ApplyType.OBU.getName()),
-    ORDER_STEP_22(22, ApplyType.ALL.getName()),
-    ORDER_STEP_23(23, ApplyType.EXCHANGE_CARD.getName()),
-    ORDER_STEP_24(24, ApplyType.EXCHANGE_OBU.getName()),
-    ORDER_STEP_25(25, ApplyType.EXCHANGE_ALL.getName()),*/
-
-    ORDER_STEP_30(30, "异地-邮寄地址填写"),
-    ORDER_STEP_31(31, "异地-售前退货"),
-    ORDER_STEP_32(32, "异地-售前退货后确认收货"),
-    ORDER_STEP_33(33, "异地-售前换货"),
-    ORDER_STEP_34(34, "异地-售前换货后确认收货"),
-    ORDER_STEP_35(35, "异地-确认下单"),
+    ORDER_CLOSE(14, "已结束"),
+    REFUNDING(15, "退款中"),
+    REFUNDED(16, "退款成功"),
+    RETURNED(17, "退货成功"),
 
     ;
 
@@ -49,36 +31,6 @@ public enum IssueOrderStep {
 
     private final String step;
 
-    /**
-     * 根据编码查找枚举
-     *
-/*     * @param code 编码
-     * @return {@link OrderStepTypeEnum } 实例
-     **//*
-    public static OrderStepTypeEnum find(Integer code) throws ServiceHandleException {
-        for (OrderStepTypeEnum instance : OrderStepTypeEnum.values()) {
-            if (instance.getCode().equals(code)) {
-                return instance;
-            }
-        }
-        return null;
-    }*/
-
-    /**
-     * 根据编码查找枚举
-     *
-     * @param code 编码
-     * @return step 描述
-     **/
- /*   public static String findName(Integer code) {
-        for (OrderStepTypeEnum instance : OrderStepTypeEnum.values()) {
-            if (instance.getCode().equals(code)) {
-                return instance.getStep();
-            }
-        }
-       return null;
-    }*/
-
     IssueOrderStep(Integer code, String step) {
         this.code = code;
         this.step = step;
@@ -91,4 +43,5 @@ public enum IssueOrderStep {
     public String getStep() {
         return this.step;
     }
+
 }