linxk 3 hafta önce
ebeveyn
işleme
3acae7901a

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

@@ -266,8 +266,30 @@ public class UserApiController extends AbstractApiController {
         if (user == null) {
             return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
         }
-        User temp = BeanUtil.toBean(userForm, User.class);
+        User temp = new User();
         temp.setId(userId);
+        if (StrUtil.isNotBlank(userForm.getBank())){
+            temp.setBank(userForm.getBank());
+        }
+        if (StrUtil.isNotBlank(userForm.getPhoneNo())){
+            temp.setPhoneNo(userForm.getPhoneNo());
+        }
+        if (StrUtil.isNotBlank(userForm.getName())){
+            temp.setName(userForm.getName());
+        }
+        if (StrUtil.isNotBlank(userForm.getHeadPic())){
+            temp.setHeadPic(userForm.getHeadPic());
+        }
+        if (StrUtil.isNotBlank(userForm.getNickname())){
+            temp.setNickname(userForm.getNickname());
+        }
+        if (StrUtil.isNotBlank(userForm.getBankAccount())){
+            temp.setBankAccount(userForm.getBankAccount());
+        }
+        if (StrUtil.isNotBlank(userForm.getBankAccountName())){
+            temp.setBankAccountName(userForm.getBankAccountName());
+        }
+        temp.setUpdateTime(DateUtil.date());
         userService.update(temp);
         user = userService.findById(userId);
         if (StrUtil.isNotBlank(userForm.getPhoneNo())) {

+ 11 - 11
cif-service/src/main/resources/static/i18n/messages_bn.properties → cif-service/src/main/resources/static/i18n/messages_bn_BD.properties

@@ -16,18 +16,18 @@ BizTypeEnum.WITHDRAWAL_FEE=withdrawal fee
 BizTypeEnum.FREEZE=freeze
 BizTypeEnum.UNFREEZE=unfreeze
 
-RechargeStatusEnum.PROCESSED=processed
-RechargeStatusEnum.SUCCESS=success
-RechargeStatusEnum.FAIL=fail
-RechargeStatusEnum.CANCEL=cancel
+RechargeStatusEnum.PROCESSED=Processing
+RechargeStatusEnum.SUCCESS=Completed
+RechargeStatusEnum.FAIL=Failed
+RechargeStatusEnum.CANCEL=Canceled
 
-WithdrawStatusEnum.WAITING_REVIEW=waiting_review
-WithdrawStatusEnum.PROCESSED=processed
-WithdrawStatusEnum.REVIEW_FAIL=review_fail
-WithdrawStatusEnum.SUCCESS=success
-WithdrawStatusEnum.FAIL=fail
+WithdrawStatusEnum.WAITING_REVIEW=Waiting_Review
+WithdrawStatusEnum.PROCESSED=Processing
+WithdrawStatusEnum.REVIEW_FAIL=Review_Failed
+WithdrawStatusEnum.SUCCESS=Completed
+WithdrawStatusEnum.FAIL=Failed
 WithdrawStatusEnum.CANCEL=cancel
 
-RedEnvelopeStatusEnum.PROCESSED=processed
-RedEnvelopeStatusEnum.SUCCESS=success
+RedEnvelopeStatusEnum.PROCESSED=Processing
+RedEnvelopeStatusEnum.SUCCESS=Completed
 

+ 12 - 12
cif-service/src/main/resources/static/i18n/messages_en.properties → cif-service/src/main/resources/static/i18n/messages_en_US.properties

@@ -16,18 +16,18 @@ BizTypeEnum.WITHDRAWAL_FEE=withdrawal fee
 BizTypeEnum.FREEZE=freeze
 BizTypeEnum.UNFREEZE=unfreeze
 
-RechargeStatusEnum.PROCESSED=processed
-RechargeStatusEnum.SUCCESS=success
-RechargeStatusEnum.FAIL=fail
-RechargeStatusEnum.CANCEL=cancel
+RechargeStatusEnum.PROCESSED=Processing
+RechargeStatusEnum.SUCCESS=Completed
+RechargeStatusEnum.FAIL=Failed
+RechargeStatusEnum.CANCEL=Closed
 
-WithdrawStatusEnum.WAITING_REVIEW=waiting_review
-WithdrawStatusEnum.PROCESSED=processed
-WithdrawStatusEnum.REVIEW_FAIL=review_fail
-WithdrawStatusEnum.SUCCESS=success
-WithdrawStatusEnum.FAIL=fail
-WithdrawStatusEnum.CANCEL=cancel
+WithdrawStatusEnum.WAITING_REVIEW=Waiting_Review
+WithdrawStatusEnum.PROCESSED=Processing
+WithdrawStatusEnum.REVIEW_FAIL=Review_Failed
+WithdrawStatusEnum.SUCCESS=Completed
+WithdrawStatusEnum.FAIL=Failed
+WithdrawStatusEnum.CANCEL=Closed
 
-RedEnvelopeStatusEnum.PROCESSED=processed
-RedEnvelopeStatusEnum.SUCCESS=success
+RedEnvelopeStatusEnum.PROCESSED=Processing
+RedEnvelopeStatusEnum.SUCCESS=Completed
 

+ 0 - 2
cif-service/src/main/resources/static/i18n/messages_zh.properties

@@ -1,2 +0,0 @@
-user.appname=测试中文
-SUCCESS=成功

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

@@ -0,0 +1,33 @@
+
+BizTypeEnum.RECHARGE=??
+BizTypeEnum.WITHDRAW=??
+BizTypeEnum.OPEN_GROUP_PAY=????
+BizTypeEnum.JOIN_GROUP_PAY=????
+BizTypeEnum.FAIL_GROUP_REFUND=?????
+BizTypeEnum.SUCCESS_GROUP_REFUND=????
+BizTypeEnum.OPEN_GROUP_RED_ENVELOPE=??????
+BizTypeEnum.JOIN_GROUP_RED_ENVELOPE=??????
+BizTypeEnum.SIGN_RED_ENVELOPE=??????
+BizTypeEnum.FIRST_COMMISSION=????
+BizTypeEnum.SECONDARY_COMMISSION=????
+BizTypeEnum.PROMOTION_COMMISSION=????
+BizTypeEnum.REFUND_RECHARGE=????
+BizTypeEnum.WITHDRAWAL_FEE=?????
+BizTypeEnum.FREEZE=??
+BizTypeEnum.UNFREEZE=??
+
+RechargeStatusEnum.PROCESSED=???
+RechargeStatusEnum.SUCCESS=????
+RechargeStatusEnum.FAIL=????
+RechargeStatusEnum.CANCEL=????
+
+WithdrawStatusEnum.WAITING_REVIEW=???
+WithdrawStatusEnum.PROCESSED=???
+WithdrawStatusEnum.REVIEW_FAIL=?????
+WithdrawStatusEnum.SUCCESS=??
+WithdrawStatusEnum.FAIL=??
+WithdrawStatusEnum.CANCEL=????
+
+RedEnvelopeStatusEnum.PROCESSED=???
+RedEnvelopeStatusEnum.SUCCESS=???
+