Explorar el Código

change enum name

Mr.qian hace 2 semanas
padre
commit
0de1ce4690

+ 46 - 54
cif-api/src/main/java/com/txz/cif/enums/BizTypeEnum.java

@@ -1,5 +1,9 @@
 package com.txz.cif.enums;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -7,51 +11,54 @@ import java.util.List;
  * 支付业务类型枚举类
  * 类型 1001充值 2001提现  3001开团支付 3002参团支付  4001未成团退款 4002成团退款 5001开团红包收益 5002参团红包收益 5003签到红包收益 5004一级红包佣金 5005二级红包佣金 6001充值返点 7001提现手续费 8001冻结 9001解冻
  */
+@AllArgsConstructor
 public enum BizTypeEnum {
-
-    RECHARGE( 1001, "充值"),
-    WITHDRAW( 2001, "提现"),
-    OPEN_GROUP_PAY( 3001, "开团支付"),
-    JOIN_GROUP_PAY( 3002, "参团支付"),
-
-    FAIL_GROUP_REFUND( 4001, "未成团退款"),
-    SUCCESS_GROUP_REFUND( 4002, "成团退款"),
-
-    OPEN_GROUP_RED_ENVELOPE( 5001, "开团红包收益"),
-    JOIN_GROUP_RED_ENVELOPE( 5002, "参团红包收益"),
-
-    SIGN_RED_ENVELOPE( 5003, "签到红包收益"),
-
-    FIRST_COMMISSION( 5004, "一级佣金"),
-
-    SECONDARY_COMMISSION( 5005, "二级佣金"),
-
-    PROMOTION_COMMISSION( 5006, "直推佣金"),
-
-    REFUND_RECHARGE( 6001, "充值返点"),
-
-    WITHDRAWAL_FEE( 7001, "提现手续费"),
-
-    FREEZE( 8001, "冻结"),
-    UNFREEZE( 9001, "解冻"),
+    
+    RECHARGE(1001, "充值", "RECHARGE"),
+    WITHDRAW(2001, "提现", "WITHDRAW"),
+    OPEN_GROUP_PAY(3001, "开团支付", "OPEN GROUP PAY"),
+    JOIN_GROUP_PAY(3002, "参团支付", "JOIN GROUP PAY"),
+    
+    FAIL_GROUP_REFUND(4001, "未成团退款", "FAIL GROUP REFUND"),
+    SUCCESS_GROUP_REFUND(4002, "成团退款", "SUCCESS GROUP REFUND"),
+    
+    OPEN_GROUP_RED_ENVELOPE(5001, "开团红包收益", "OPEN GROUP RED ENVELOPE"),
+    JOIN_GROUP_RED_ENVELOPE(5002, "参团红包收益", "JOIN GROUP RED ENVELOPE"),
+    
+    SIGN_RED_ENVELOPE(5003, "签到红包收益", "SIGN RED ENVELOPE"),
+    
+    FIRST_COMMISSION(5004, "一级佣金", "FIRST COMMISSION"),
+    
+    SECONDARY_COMMISSION(5005, "二级佣金", "SECONDARY COMMISSION"),
+    
+    PROMOTION_COMMISSION(5006, "直推佣金", "PROMOTION COMMISSION"),
+    
+    REFUND_RECHARGE(6001, "充值返点", "REFUND RECHARGE"),
+    
+    WITHDRAWAL_FEE(7001, "提现手续费", "WITHDRAWAL FEE"),
+    
+    FREEZE(8001, "冻结", "FREEZE"),
+    UNFREEZE(9001, "解冻", "UNFREEZE"),
     ;
-
+    
     /**
      * 平台标识
      */
+    @Setter
+    @Getter
     private int key;
-
+    
     /**
      * 平台名称
      */
+    @Setter
+    @Getter
     private String value;
-
-
-    BizTypeEnum(int key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
+    
+    @Setter
+    @Getter
+    private String showVal;
+    
     public static String getValueByKey(int key) {
         for (BizTypeEnum value : values()) {
             if (value.key == key) {
@@ -60,9 +67,9 @@ public enum BizTypeEnum {
         }
         return null;
     }
-
+    
     public static List<BizTypeEnum> getRedEnvelopeTypes() {
-        List<BizTypeEnum> ret =new ArrayList<>();
+        List<BizTypeEnum> ret = new ArrayList<>();
         ret.add(BizTypeEnum.OPEN_GROUP_RED_ENVELOPE);
         ret.add(BizTypeEnum.JOIN_GROUP_RED_ENVELOPE);
         ret.add(BizTypeEnum.SIGN_RED_ENVELOPE);
@@ -71,7 +78,7 @@ public enum BizTypeEnum {
         ret.add(BizTypeEnum.PROMOTION_COMMISSION);
         return ret;
     }
-
+    
     public static BizTypeEnum getByKey(int key) {
         for (BizTypeEnum value : values()) {
             if (value.key == key) {
@@ -80,20 +87,5 @@ public enum BizTypeEnum {
         }
         return null;
     }
-
-    public int getKey() {
-        return key;
-    }
-
-    public void setKey(int key) {
-        this.key = key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
+    
 }

+ 28 - 26
cif-service/src/main/java/com/txz/cif/enums/WithdrawStatusEnum.java

@@ -1,41 +1,43 @@
 package com.txz.cif.enums;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
 /**
- *  状态 1待审核 2处理中 3审核不通过 4提现成功 5提现失败 6超时取消
+ * 状态 1待审核 2处理中 3审核不通过 4提现成功 5提现失败 6超时取消
  */
+@AllArgsConstructor
 public enum WithdrawStatusEnum {
-
-    WAITING_REVIEW(1, "待审核"),
-    PROCESSED(2, "处理中"),
-    REVIEW_FAIL(3, "审核不通过"),
-    SUCCESS(4, "成功"),
-    FAIL( 5, "失败"),
-    CANCEL( 6, "超时取消"),
+    
+    WAITING_REVIEW(1, "待审核", "WAITING REVIEW"),
+    PROCESSED(2, "处理中", "PROCESSED"),
+    REVIEW_FAIL(3, "审核不通过", "REVIEW FAIL"),
+    SUCCESS(4, "成功", "SUCCESS"),
+    FAIL(5, "失败", "FAIL"),
+    CANCEL(6, "超时取消", "CANCEL"),
     ;
-
+    
+    @Setter
+    @Getter
     private Integer key;
+    
+    @Setter
+    @Getter
     private String value;
-
-    WithdrawStatusEnum(Integer key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
+    
+    @Setter
+    @Getter
+    private String showValue;
+    
     public static WithdrawStatusEnum getEnum(Integer key) {
-        for (WithdrawStatusEnum temp: WithdrawStatusEnum.values()) {
-            if (temp.key.compareTo(key)== 0){
+        for (WithdrawStatusEnum temp : WithdrawStatusEnum.values()) {
+            if (temp.key.compareTo(key) == 0) {
                 return temp;
             }
         }
         return null;
     }
-
-
-    public Integer getKey() {
-        return key;
-    }
-
-    public String getDesc() {
-        return value;
-    }
+    
+    
 }

+ 2 - 2
cif-service/src/main/java/com/txz/cif/web/UserApiController.java

@@ -85,7 +85,7 @@ public class UserApiController extends AbstractApiController {
             case 1:
                 return ResultGenerator.genSuccessResult(Arrays.stream(BizTypeEnum.values())
                         .map(temp -> {
-                            EnumBo bo = EnumBo.builder().code(temp.getKey()).name(temp.getValue()).build();
+                            EnumBo bo = EnumBo.builder().code(temp.getKey()).name(temp.getShowVal()).build();
                             String msg = LocalUtil.get("BizTypeEnum." + temp.name());
                             if (StrUtil.isNotBlank(msg)) {
                                 bo.setName(msg);
@@ -105,7 +105,7 @@ public class UserApiController extends AbstractApiController {
             case 3:
                 return ResultGenerator.genSuccessResult(Arrays.stream(WithdrawStatusEnum.values())
                         .map(temp -> {
-                            EnumBo bo = EnumBo.builder().code(temp.getKey()).name(temp.getDesc()).build();
+                            EnumBo bo = EnumBo.builder().code(temp.getKey()).name(temp.getShowValue()).build();
                             String msg = LocalUtil.get("WithdrawStatusEnum." + temp.name());
                             if (StrUtil.isNotBlank(msg)) {
                                 bo.setName(msg);