linxk 1 هفته پیش
والد
کامیت
072ca7283b

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

@@ -16,6 +16,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.txz.cif.configurer.LocalUtil;
 import com.txz.cif.dubbo.client.OperatingConfigDubboServiceClient;
 import com.txz.cif.enums.BizTypeEnum;
 import com.txz.cif.enums.RechargeStatusEnum;
@@ -78,23 +79,62 @@ public class UserApiController extends AbstractApiController {
         switch (id){
             case 1:
                 return ResultGenerator.genSuccessResult(Arrays.stream(BizTypeEnum.values())
-                        .map(temp -> EnumBo.builder().code(temp.getKey()).name(temp.getValue()).build()).collect(Collectors.toList()));
+                        .map(temp -> {
+                            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);
+                            }
+                            return bo;
+                        }).collect(Collectors.toList()));
             case 2:
                 return ResultGenerator.genSuccessResult(Arrays.stream(RechargeStatusEnum.values())
-                        .map(temp -> EnumBo.builder().code(temp.getKey()).name(temp.getDesc()).build()).collect(Collectors.toList()));
+                        .map(temp ->  {
+                            EnumBo bo =  EnumBo.builder().code(temp.getKey()).name(temp.getDesc()).build();
+                            String msg = LocalUtil.get("RechargeStatusEnum."+temp.name());
+                            if (StrUtil.isNotBlank(msg) ){
+                                bo.setName(msg);
+                            }
+                            return bo;
+                        } ).collect(Collectors.toList()));
             case 3:
                 return ResultGenerator.genSuccessResult(Arrays.stream(WithdrawStatusEnum.values())
-                        .map(temp -> EnumBo.builder().code(temp.getKey()).name(temp.getDesc()).build()).collect(Collectors.toList()));
+                        .map(temp ->  {
+                            EnumBo bo =  EnumBo.builder().code(temp.getKey()).name(temp.getDesc()).build();
+                            String msg = LocalUtil.get("WithdrawStatusEnum."+temp.name());
+                            if (StrUtil.isNotBlank(msg) ){
+                                bo.setName(msg);
+                            }
+                            return bo;
+                        } ).collect(Collectors.toList()));
             case 4:
                 return ResultGenerator.genSuccessResult(Arrays.stream(RedEnvelopeStatusEnum.values())
-                        .map(temp -> EnumBo.builder().code(temp.getKey()).name(temp.getDesc()).build()).collect(Collectors.toList()));
+                        .map(temp -> {
+                            EnumBo bo =  EnumBo.builder().code(temp.getKey()).name(temp.getDesc()).build();
+                            String msg = LocalUtil.get("RedEnvelopeStatusEnum."+temp.name());
+                            if (StrUtil.isNotBlank(msg) ){
+                                bo.setName(msg);
+                            }
+                            return bo;
+                        }).collect(Collectors.toList()));
             case 5:
                 return ResultGenerator.genSuccessResult(BizTypeEnum.getRedEnvelopeTypes().stream()
-                        .map(temp -> EnumBo.builder().code(temp.getKey()).name(temp.getValue()).build()).collect(Collectors.toList()));
+                        .map(temp -> {
+                            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);
+                            }
+                            return bo;
+                        }).collect(Collectors.toList()));
         }
         return ResultGenerator.genSuccessResult();
     }
 
+//    public static void main(String[] args) {
+//        System.out.println("RedEnvelopeStatusEnum."+RedEnvelopeStatusEnum.SUCCESS.name());
+//    }
+
 
     @ApiOperation(value = "用户登陆", notes = "",httpMethod = "POST")
     @PostMapping("/login")

+ 33 - 0
cif-service/src/main/resources/static/i18n/messages_bn.properties

@@ -0,0 +1,33 @@
+
+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 red envelope
+BizTypeEnum.JOIN_GROUP_RED_ENVELOPE=join group red envelope
+BizTypeEnum.SIGN_RED_ENVELOPE=sign red envelope
+BizTypeEnum.FIRST_COMMISSION=first commission
+BizTypeEnum.SECONDARY_COMMISSION=secondary commission
+BizTypeEnum.PROMOTION_COMMISSION=promotion commission
+BizTypeEnum.REFUND_RECHARGE=refund recharge
+BizTypeEnum.WITHDRAWAL_FEE=withdrawal fee
+BizTypeEnum.FREEZE=freeze
+BizTypeEnum.UNFREEZE=unfreeze
+
+RechargeStatusEnum.PROCESSED=processed
+RechargeStatusEnum.SUCCESS=success
+RechargeStatusEnum.FAIL=fail
+RechargeStatusEnum.CANCEL=cancel
+
+WithdrawStatusEnum.WAITING_REVIEW=waiting_review
+WithdrawStatusEnum.PROCESSED=processed
+WithdrawStatusEnum.REVIEW_FAIL=review_fail
+WithdrawStatusEnum.SUCCESS=success
+WithdrawStatusEnum.FAIL=fail
+WithdrawStatusEnum.CANCEL=cancel
+
+RedEnvelopeStatusEnum.PROCESSED=processed
+RedEnvelopeStatusEnum.SUCCESS=success
+

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

@@ -1,2 +1,33 @@
-user.appname=test
-SUCCESS=success
+
+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 red envelope
+BizTypeEnum.JOIN_GROUP_RED_ENVELOPE=join group red envelope
+BizTypeEnum.SIGN_RED_ENVELOPE=sign red envelope
+BizTypeEnum.FIRST_COMMISSION=first commission
+BizTypeEnum.SECONDARY_COMMISSION=secondary commission
+BizTypeEnum.PROMOTION_COMMISSION=promotion commission
+BizTypeEnum.REFUND_RECHARGE=refund recharge
+BizTypeEnum.WITHDRAWAL_FEE=withdrawal fee
+BizTypeEnum.FREEZE=freeze
+BizTypeEnum.UNFREEZE=unfreeze
+
+RechargeStatusEnum.PROCESSED=processed
+RechargeStatusEnum.SUCCESS=success
+RechargeStatusEnum.FAIL=fail
+RechargeStatusEnum.CANCEL=cancel
+
+WithdrawStatusEnum.WAITING_REVIEW=waiting_review
+WithdrawStatusEnum.PROCESSED=processed
+WithdrawStatusEnum.REVIEW_FAIL=review_fail
+WithdrawStatusEnum.SUCCESS=success
+WithdrawStatusEnum.FAIL=fail
+WithdrawStatusEnum.CANCEL=cancel
+
+RedEnvelopeStatusEnum.PROCESSED=processed
+RedEnvelopeStatusEnum.SUCCESS=success
+