客户端会员信息添加会员等级，国家城市

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java

@@ -10,9 +10,12 @@ import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
 import cn.iocoder.yudao.module.customer.dal.dataobject.customerContacts.CustomerContactsDO;
 import cn.iocoder.yudao.module.customer.service.customerContacts.CustomerContactsService;
 import cn.iocoder.yudao.module.ecw.api.paramValid.ParamValidatorApi;
+import cn.iocoder.yudao.module.ecw.dal.dataobject.region.RegionDO;
 import cn.iocoder.yudao.module.ecw.service.internalMessage.InternalMessageService;
 import cn.iocoder.yudao.module.ecw.service.internalMessage.WebInternalMessageService;
+import cn.iocoder.yudao.module.ecw.service.region.RegionService;
 import cn.iocoder.yudao.module.member.controller.app.auth.vo.AppEmailUpdateReqVO;
+import cn.iocoder.yudao.module.member.service.level.MemberUserLevelConfigService;
 import cn.iocoder.yudao.module.member.vo.member.MemberUpdateReqVO;
 import cn.iocoder.yudao.module.member.controller.app.user.vo.*;
 import cn.iocoder.yudao.module.member.convert.user.UserConvert;
@@ -35,6 +38,8 @@ import cn.iocoder.yudao.module.member.vo.userEnterprise.UserEnterpriseCreateReqV
 import cn.iocoder.yudao.module.member.vo.userEnterprise.UserEnterpriseUpdateReqVO;
 import cn.iocoder.yudao.module.member.vo.userEnterpriseAuth.UserEnterpriseAuthBackVO;
 import cn.iocoder.yudao.module.member.vo.userEnterpriseAuth.UserEnterpriseAuthCreateReqVO;
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigBaseRespVO;
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserScoreLevelVO;
 import cn.iocoder.yudao.module.product.service.coupon.CouponService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
@@ -98,6 +103,12 @@ public class AppUserController {
     @Resource
     private PasswordEncoder passwordEncoder;
 
+    @Resource
+    private MemberUserLevelConfigService memberUserLevelConfigService;
+
+    @Resource
+    private RegionService regionService;
+
 
     @PutMapping("/update-nickname")
     @ApiOperation("修改用户昵称")
@@ -146,6 +157,26 @@ public class AppUserController {
         if (passwordEncoder.matches("88888888", user.getPassword())) {
             respVO.setIsSimplePassword(Boolean.TRUE);
         }
+        MemberUserLevelConfigBaseRespVO userScoreLevelVO = memberUserLevelConfigService.getLevelByCount(user.getTotalScore());
+        MemberUserScoreLevelVO scoreLevelVO = MemberUserScoreLevelVO.builder().memberId(user.getId())
+                .memberCode(user.getMemberCode())
+                .holdScore(user.getHoldScore())
+                .expiredScore(user.getExpiredScore())
+                .usedScore(user.getUsedScore())
+                .levelIcon(userScoreLevelVO.getIcon())
+                .levelName(userScoreLevelVO.getName())
+                .build();
+        respVO.setUserScoreLevelInfo(scoreLevelVO);
+        if (user.getCountry() != null) {
+            RegionDO region = regionService.getRegion(Long.valueOf(user.getCountry()));
+            respVO.setCountryTitleEn(region.getTitleEn());
+            respVO.setCountryTitleZh(region.getTitleZh());
+        }
+        if (user.getCity() != null) {
+            RegionDO region = regionService.getRegion(Long.valueOf(user.getCity()));
+            respVO.setCityTitleEn(region.getTitleEn());
+            respVO.setCityTitleZh(region.getTitleZh());
+        }
         return success(respVO);
     }
 

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppUserInfoRespVO.java

 package cn.iocoder.yudao.module.member.controller.app.user.vo;
 
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserScoreLevelVO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -67,4 +68,14 @@ public class AppUserInfoRespVO {
     @ApiModelProperty(value = "是否简单密码", example = "false")
     private Boolean isSimplePassword = Boolean.FALSE;
 
+    @ApiModelProperty(value = "会员积分信息")
+    private MemberUserScoreLevelVO userScoreLevelInfo;
+    @ApiModelProperty(value = "会员国家中文")
+    private String countryTitleZh;
+    @ApiModelProperty(value = "会员国家英文")
+    private String countryTitleEn;
+    @ApiModelProperty(value = "会员城市中文")
+    private String cityTitleZh;
+    @ApiModelProperty(value = "会员国家英文")
+    private String cityTitleEn;
 }