会员下单预览+地区+身份标识;

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

@@ -20,6 +20,8 @@ public class AdamMemberOrderPreviewVo implements Serializable {
     private AdamRealInfoVo realInfoVo;
     @ApiModelProperty(position = 14, value = "生日")
     private String birthday;
+    @ApiModelProperty(position = 15, value = "常住地/区域[100]", example = "北京 北京市 朝阳区")
+    private String area;
 
     private static final AdamMemberOrderPreviewVo obj = new AdamMemberOrderPreviewVo();
 

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

@@ -60,16 +60,31 @@ public class AdamMemberOrderController {
         if (null == memberVo) {
             return ResponseDto.failure(ErrorMapping.get("10201"));
         }
+        AdamMemberPriceVo memberPriceVo = adamRdmService.getMemberPriceVoByPriceId(mno, id);
+        if (null == memberPriceVo) {
+            return ResponseDto.failure(ErrorMapping.get("10202"));
+        }
+        String currentUid = CurrentUtil.getCurrentUid();
 
         AdamMemberOrderPreviewVo previewVo = AdamMemberOrderPreviewVo.getNew();
         previewVo.setMemberId(mno);
         previewVo.setMemberTitle(memberVo.getTitle());
 
-        previewVo.setRealInfoVo(adamRdmService.getRealInfoVoByUid(CurrentUtil.getCurrentUid()));
-        previewVo.setPriceVo(adamRdmService.getMemberPriceVoByPriceId(mno, id));
+        previewVo.setRealInfoVo(adamRdmService.getRealInfoVoByUid(currentUid));
+        previewVo.setPriceVo(memberPriceVo);
+
+        AdamUserMemberVo userMemberVo = adamRdmService.getUserMemberVoByUid(currentUid);
+        if (null == userMemberVo) {
+            memberVo.setStageMarker(0);
+        } else if (userMemberVo.isActive()) {
+            memberVo.setStageMarker(userMemberVo.isOldMember() ? 10 : 11);
+        } else {
+            memberVo.setStageMarker(2);
+        }
 
-        AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(CurrentUtil.getCurrentUid());
-        previewVo.setBirthday(null == userInfoVo ? null : userInfoVo.getBirthday());
+        AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
+        previewVo.setBirthday(userInfoVo.getBirthday());
+        previewVo.setArea(userInfoVo.getArea());
 
         return ResponseDto.success(previewVo);
     }