Merge remote-tracking branch 'origin/dev_20211205' into dev_20211205

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -395,16 +395,16 @@ public class AdamUserController {
 
         userProfileVo.setMemberVo(adamRdmService.getMemberSimpleVo());
 
-        userProfileVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(currentUid));
+        AdamUserMemberVo userMemberVo = adamRdmService.getUserMemberVoByUid(currentUid);
+        userProfileVo.setUserMemberVo(userMemberVo);
 
         AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
-        userProfileVo.setUserInfo(userInfoVo);
+        userProfileVo.setUserInfo(adamRdmService.ratingProvince(userInfoVo).desensitize(reviewUserInfo).rating(userMemberVo));
 
         AdamMemberJoinusVo memberJoinusVo = adamRdmService.getMemberJoinusVo();
         if (org.springframework.util.StringUtils.startsWithIgnoreCase(userInfoVo.getQrCode(), "lN")) {
             memberJoinusVo.setState(0);
         } else {
-            AdamUserMemberVo userMemberVo = adamRdmService.getUserMemberVoByUid(currentUid);
             memberJoinusVo.setState(1);
             memberJoinusVo.setType(null != userMemberVo && userMemberVo.isActive() ? 50 : 10);
             memberJoinusVo.setQrCode(userInfoVo.getQrCode());