~会员卡展示+会员ID;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberJoinusVo.java

@@ -22,6 +22,8 @@ public class AdamMemberJoinusVo implements java.io.Serializable, Cloneable {
     private Integer state;
     @ApiModelProperty(position = 16, value = "权益详情[200]", example = "加入摩登天空会员您可享受到.....")
     private String interestsDetail;
+    @ApiModelProperty(position = 17, value = "会员ID", example = "123456")
+    private String memberNo;
 
     private static final AdamMemberJoinusVo obj = new AdamMemberJoinusVo();
 

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

@@ -118,6 +118,9 @@ public class AdamMemberController {
             joinusVo = adamRdmService.getMemberJoinusVo(null != userMemberVo && userMemberVo.isActive() ? 50 : 10);
             joinusVo.setState(1);
             joinusVo.setQrCode(userInfoVo.getQrCode());
+            if (null != userMemberVo) {
+                joinusVo.setMemberNo(userMemberVo.getMemberNo());
+            }
         }
 
         return ResponseDto.success(joinusVo);
@@ -145,6 +148,9 @@ public class AdamMemberController {
         AdamMemberJoinusVo joinusVo = adamRdmService.getMemberJoinusVo(null != userMemberVo && userMemberVo.isActive() ? 50 : 10);
         joinusVo.setState(1);
         joinusVo.setQrCode(userInfoVo.getQrCode());
+        if (null != userMemberVo) {
+            joinusVo.setMemberNo(userMemberVo.getMemberNo());
+        }
 
         try {
             feignAdamPlatformClient.initScore(currentUid);

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

@@ -399,6 +399,9 @@ public class AdamUserController {
         userProfileVo.setUserMemberVo(userMemberVo);
 
         AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
+        if (null == userInfoVo) {
+            return ResponseDto.success();
+        }
         userProfileVo.setUserInfo(adamRdmService.ratingProvince(userInfoVo).desensitize(reviewUserInfo).rating(userMemberVo));
 
         AdamMemberJoinusVo memberJoinusVo;
@@ -408,6 +411,9 @@ public class AdamUserController {
             memberJoinusVo = adamRdmService.getMemberJoinusVo(null != userMemberVo && userMemberVo.isActive() ? 50 : 10);
             memberJoinusVo.setState(1);
             memberJoinusVo.setQrCode(userInfoVo.getQrCode());
+            if (null != userMemberVo) {
+                memberJoinusVo.setMemberNo(userMemberVo.getMemberNo());
+            }
         }
         userProfileVo.setMemberJoinusVo(memberJoinusVo);
 
@@ -428,10 +434,10 @@ public class AdamUserController {
         } else {
             uid = CurrentUtil.getCurrentUid();
         }
-        if (uid == null) {
+        AdamUserInfoVo userInfoVo;
+        if (uid == null || null == (userInfoVo = adamRdmService.getUserInfoVoByUid(uid))) {
             return ResponseDto.failure("账号不存在，请确认");
         }
-        AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
         AdamUserInfoSimpleVo vo = AdamUserInfoSimpleVo.getNew();
         if (userInfoVo.getState().equals(1)) {
             vo.setMobile(userInfoVo.getMobile());