登录API｜用户信息API响应参数+用户身份标识stageMarker;

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

@@ -102,8 +102,24 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
         }
     }
 
+    /**
+     * 脱敏处理
+     *
+     * @param reviewUserInfo 审核中开关配置
+     * @return AdamLoginInfoVo
+     */
     public AdamLoginInfoVo desensitize(Boolean reviewUserInfo) {
         this.userInfo.desensitize(reviewUserInfo);
         return this;
     }
+
+    /**
+     * 身份识别
+     *
+     * @return AdamLoginInfoVo
+     */
+    public AdamLoginInfoVo finalRating() {
+        this.userInfo.rating(this.userMemberVo);
+        return this;
+    }
 }

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

@@ -71,6 +71,22 @@ public class AdamMemberVo implements java.io.Serializable, Cloneable {
     @ApiModelProperty(position = 24, value = "标记[0-普通用户｜2-过期会员｜10-老会员｜11-新会员]")
     private Integer stageMarker;
 
+    public void setUserMemberVo(AdamUserMemberVo userMemberVo) {
+        this.userMemberVo = userMemberVo;
+        this.rating(userMemberVo);
+    }
+
+    private AdamMemberVo rating(AdamUserMemberVo userMemberVo) {
+        if (null == userMemberVo) {
+            this.setStageMarker(0);
+        } else if (userMemberVo.isActive()) {
+            this.setStageMarker(userMemberVo.isOldMember() ? 10 : 11);
+        } else {
+            this.setStageMarker(2);
+        }
+        return this;
+    }
+
     public Integer getOnsale() {
         return null == onsale ? 1 : onsale;
     }

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

@@ -60,6 +60,9 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
     private String rongCloudToken;
     @ApiModelProperty(position = 28, value = "身份二维码")
     private String qrCode;
+    @ApiModelProperty(position = 30, value = "标记[0-普通用户｜2-过期会员｜10-老会员｜11-新会员]")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private Integer stageMarker;
 
     private static final AdamUserInfoVo obj = new AdamUserInfoVo();
 
@@ -137,4 +140,15 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
 
         return this;
     }
+
+    public AdamUserInfoVo rating(AdamUserMemberVo userMemberVo) {
+        if (null == userMemberVo) {
+            this.setStageMarker(0);
+        } else if (userMemberVo.isActive()) {
+            this.setStageMarker(userMemberVo.isOldMember() ? 10 : 11);
+        } else {
+            this.setStageMarker(2);
+        }
+        return this;
+    }
 }

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

@@ -140,7 +140,7 @@ public class AdamLoginController {
         loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
 
         log.info(UserPathDto.setData("登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
-        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo));
+        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo).finalRating());
     }
 
     @ApiOperationSupport(order = 3)
@@ -177,7 +177,7 @@ public class AdamLoginController {
         }
 
         log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
-        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo));
+        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo).finalRating());
     }
 
     @ApiOperationSupport(order = 4)
@@ -204,7 +204,7 @@ public class AdamLoginController {
         }
 
         log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
-        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo));
+        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo).finalRating());
     }
 
     @ApiOperationSupport(order = 5)
@@ -255,7 +255,7 @@ public class AdamLoginController {
         loginInfoVo.setWechatUnionid(wechatUnionid);
 
         log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
-        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo));
+        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo).finalRating());
     }
 
     @ApiOperationSupport(order = 6)
@@ -289,7 +289,7 @@ public class AdamLoginController {
         loginInfoVo.setToken(this.ssoProcess(loginInfoVo.getUserInfo()));
 
         log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
-        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo));
+        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo).finalRating());
     }
 
     @ApiOperationSupport(order = 7)

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

@@ -51,17 +51,12 @@ public class AdamMemberController {
                 memberVo.setUserMemberVo(userMemberVo);
 
                 if (null == userMemberVo) {
-                    memberVo.setStageMarker(0);
                     memberVo.setRightsVoList(adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId(), 0));
                 } else if (userMemberVo.isActive()) {
-                    memberVo.setStageMarker(userMemberVo.isOldMember() ? 10 : 11);
-
                     memberVo.setRightsVoList(
                             userMemberVo.isOldMember() ? adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId(), 1)
                             : adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId(), 0)
                     );
-                } else {
-                    memberVo.setStageMarker(2);
                 }
             } else {
                 memberVo.setRightsVoList(adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId(), 0));

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

@@ -310,10 +310,11 @@ public class AdamUserController {
 
         Map<String, Object> map = CollectionUtil.mapStringObject();
         AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
-        map.put("userInfo", userInfoVo.desensitize(reviewUserInfo));
         map.put("realNameInfo", adamRdmService.getRealInfoVoByUid(currentUid));
         map.put("thirdPartInfo", adamRdmService.getThirdPartVoListByUid(currentUid));
-        map.put("userMemberVo", adamRdmService.getUserMemberVoByUid(currentUid));
+        AdamUserMemberVo userMemberVo = adamRdmService.getUserMemberVoByUid(currentUid);
+        map.put("userMemberVo", userMemberVo);
+        map.put("userInfo", userInfoVo.desensitize(reviewUserInfo).rating(userMemberVo));
         map.put("memberVo", adamRdmService.getMemberSimpleVo());
 
         return ResponseDto.success(map);