fix some bug

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

@@ -14,31 +14,31 @@ import java.util.List;
 @AllArgsConstructor
 public enum BizTypeEnum {
     
-    RECHARGE(1001, "充值", "RECHARGE"),
-    WITHDRAW(2001, "提现", "WITHDRAW"),
-    OPEN_GROUP_PAY(3001, "开团支付", "OPEN GROUP PAY"),
-    JOIN_GROUP_PAY(3002, "参团支付", "JOIN GROUP PAY"),
+    RECHARGE(1001, "充值"),
+    WITHDRAW(2001, "提现"),
+    OPEN_GROUP_PAY(3001, "开团支付"),
+    JOIN_GROUP_PAY(3002, "参团支付"),
     
-    FAIL_GROUP_REFUND(4001, "未成团退款", "FAIL GROUP REFUND"),
-    SUCCESS_GROUP_REFUND(4002, "成团退款", "SUCCESS GROUP REFUND"),
+    FAIL_GROUP_REFUND(4001, "未成团退款"),
+    SUCCESS_GROUP_REFUND(4002, "成团退款"),
     
-    OPEN_GROUP_RED_ENVELOPE(5001, "开团红包收益", "OPEN GROUP RED ENVELOPE"),
-    JOIN_GROUP_RED_ENVELOPE(5002, "参团红包收益", "JOIN GROUP RED ENVELOPE"),
+    OPEN_GROUP_RED_ENVELOPE(5001, "开团红包收益"),
+    JOIN_GROUP_RED_ENVELOPE(5002, "参团红包收益"),
     
-    SIGN_RED_ENVELOPE(5003, "签到红包收益", "SIGN RED ENVELOPE"),
+    SIGN_RED_ENVELOPE(5003, "签到红包收益"),
     
-    FIRST_COMMISSION(5004, "一级佣金", "FIRST COMMISSION"),
+    FIRST_COMMISSION(5004, "一级佣金"),
     
-    SECONDARY_COMMISSION(5005, "二级佣金", "SECONDARY COMMISSION"),
+    SECONDARY_COMMISSION(5005, "二级佣金"),
     
-    PROMOTION_COMMISSION(5006, "直推佣金", "PROMOTION COMMISSION"),
+    PROMOTION_COMMISSION(5006, "直推佣金"),
     
-    REFUND_RECHARGE(6001, "充值返点", "REFUND RECHARGE"),
+    REFUND_RECHARGE(6001, "充值返点"),
     
-    WITHDRAWAL_FEE(7001, "提现手续费", "WITHDRAWAL FEE"),
+    WITHDRAWAL_FEE(7001, "提现手续费"),
     
-    FREEZE(8001, "冻结", "FREEZE"),
-    UNFREEZE(9001, "解冻", "UNFREEZE"),
+    FREEZE(8001, "冻结"),
+    UNFREEZE(9001, "解冻"),
     ;
     
     /**
@@ -55,10 +55,6 @@ public enum BizTypeEnum {
     @Getter
     private String value;
     
-    @Setter
-    @Getter
-    private String showVal;
-    
     public static String getValueByKey(int key) {
         for (BizTypeEnum value : values()) {
             if (value.key == key) {

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

@@ -10,12 +10,12 @@ import lombok.Setter;
 @AllArgsConstructor
 public enum WithdrawStatusEnum {
     
-    WAITING_REVIEW(1, "待审核", "WAITING REVIEW"),
-    PROCESSED(2, "处理中", "PROCESSED"),
-    REVIEW_FAIL(3, "审核不通过", "REVIEW FAIL"),
-    SUCCESS(4, "成功", "SUCCESS"),
-    FAIL(5, "失败", "FAIL"),
-    CANCEL(6, "超时取消", "CANCEL"),
+    WAITING_REVIEW(1, "待审核"),
+    PROCESSED(2, "处理中"),
+    REVIEW_FAIL(3, "审核不通过"),
+    SUCCESS(4, "成功"),
+    FAIL(5, "失败"),
+    CANCEL(6, "超时取消"),
     ;
     
     @Setter
@@ -26,10 +26,6 @@ public enum WithdrawStatusEnum {
     @Getter
     private String value;
     
-    @Setter
-    @Getter
-    private String showValue;
-    
     public static WithdrawStatusEnum getEnum(Integer key) {
         for (WithdrawStatusEnum temp : WithdrawStatusEnum.values()) {
             if (temp.key.compareTo(key) == 0) {

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.getShowVal()).build();
+                            EnumBo bo = EnumBo.builder().code(temp.getKey()).name(temp.getValue()).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.getShowValue()).build();
+                            EnumBo bo = EnumBo.builder().code(temp.getKey()).name(temp.getValue()).build();
                             String msg = LocalUtil.get("WithdrawStatusEnum." + temp.name());
                             if (StrUtil.isNotBlank(msg)) {
                                 bo.setName(msg);

cif-service/src/main/resources/static/i18n/messages_bn_BD.properties

@@ -1,18 +1,18 @@
 
 BizTypeEnum.RECHARGE=recharge
 BizTypeEnum.WITHDRAW=withdraw
-BizTypeEnum.OPEN_GROUP_PAY=open group pay
-BizTypeEnum.JOIN_GROUP_PAY=join group pay
-BizTypeEnum.FAIL_GROUP_REFUND=fail group refund
-BizTypeEnum.SUCCESS_GROUP_REFUND=success group refund
-BizTypeEnum.OPEN_GROUP_RED_ENVELOPE=Open Group Reward
-BizTypeEnum.JOIN_GROUP_RED_ENVELOPE=Join Group Reward
-BizTypeEnum.SIGN_RED_ENVELOPE=Check-in Reward
-BizTypeEnum.FIRST_COMMISSION=Direct Referral Reward
-BizTypeEnum.SECONDARY_COMMISSION=Indirect Referral Reward
-BizTypeEnum.PROMOTION_COMMISSION=Refer Friends Reward
-BizTypeEnum.REFUND_RECHARGE=refund recharge
-BizTypeEnum.WITHDRAWAL_FEE=withdrawal fee
+BizTypeEnum.OPEN GROUP PAY=open group pay
+BizTypeEnum.JOIN GROUP PAY=join group pay
+BizTypeEnum.FAIL GROUP REFUND=fail group refund
+BizTypeEnum.SUCCESS GROUP REFUND=success group refund
+BizTypeEnum.OPEN GROUP RED ENVELOPE=Open Group Reward
+BizTypeEnum.JOIN GROUP RED ENVELOPE=Join Group Reward
+BizTypeEnum.SIGN RED ENVELOPE=Check-in Reward
+BizTypeEnum.FIRST COMMISSION=Direct Referral Reward
+BizTypeEnum.SECONDARY COMMISSION=Indirect Referral Reward
+BizTypeEnum.PROMOTION COMMISSION=Refer Friends Reward
+BizTypeEnum.REFUND RECHARGE=refund recharge
+BizTypeEnum.WITHDRAWAL FEE=withdrawal fee
 BizTypeEnum.FREEZE=freeze
 BizTypeEnum.UNFREEZE=unfreeze
 
@@ -20,10 +20,9 @@ RechargeStatusEnum.PROCESSED=Processing
 RechargeStatusEnum.SUCCESS=Completed
 RechargeStatusEnum.FAIL=Failed
 RechargeStatusEnum.CANCEL=Closed
-
-WithdrawStatusEnum.WAITING_REVIEW=Waiting_Review
+WithdrawStatusEnum.WAITING REVIEW=Waiting Review
 WithdrawStatusEnum.PROCESSED=Processing
-WithdrawStatusEnum.REVIEW_FAIL=Review_Failed
+WithdrawStatusEnum.REVIEW FAIL=Review Failed
 WithdrawStatusEnum.SUCCESS=Completed
 WithdrawStatusEnum.FAIL=Failed
 WithdrawStatusEnum.CANCEL=Closed

cif-service/src/main/resources/static/i18n/messages_en.properties

@@ -20,10 +20,9 @@ RechargeStatusEnum.PROCESSED=Processing
 RechargeStatusEnum.SUCCESS=Completed
 RechargeStatusEnum.FAIL=Failed
 RechargeStatusEnum.CANCEL=Closed
-
-WithdrawStatusEnum.WAITING_REVIEW=Waiting_Review
+WithdrawStatusEnum.WAITING_REVIEW=Waiting Review
 WithdrawStatusEnum.PROCESSED=Processing
-WithdrawStatusEnum.REVIEW_FAIL=Review_Failed
+WithdrawStatusEnum.REVIEW_FAIL=Review Failed
 WithdrawStatusEnum.SUCCESS=Completed
 WithdrawStatusEnum.FAIL=Failed
 WithdrawStatusEnum.CANCEL=Closed

cif-service/src/main/resources/static/i18n/messages_en_US.properties

@@ -20,10 +20,9 @@ RechargeStatusEnum.PROCESSED=Processing
 RechargeStatusEnum.SUCCESS=Completed
 RechargeStatusEnum.FAIL=Failed
 RechargeStatusEnum.CANCEL=Closed
-
-WithdrawStatusEnum.WAITING_REVIEW=Waiting_Review
+WithdrawStatusEnum.WAITING_REVIEW=Waiting Review
 WithdrawStatusEnum.PROCESSED=Processing
-WithdrawStatusEnum.REVIEW_FAIL=Review_Failed
+WithdrawStatusEnum.REVIEW_FAIL=Review Failed
 WithdrawStatusEnum.SUCCESS=Completed
 WithdrawStatusEnum.FAIL=Failed
 WithdrawStatusEnum.CANCEL=Closed