记得上下班打卡 | git大法好,push需谨慎

Commit 0f24d155 authored by 张国柄's avatar 张国柄

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

parent c80aca7a
...@@ -22,6 +22,8 @@ public class AdamMemberOrderPreviewVo implements Serializable { ...@@ -22,6 +22,8 @@ public class AdamMemberOrderPreviewVo implements Serializable {
private String birthday; private String birthday;
@ApiModelProperty(position = 15, value = "常住地/区域[100]", example = "北京 北京市 朝阳区") @ApiModelProperty(position = 15, value = "常住地/区域[100]", example = "北京 北京市 朝阳区")
private String area; private String area;
@ApiModelProperty(position = 20, value = "标记[0-普通用户|2-过期会员|10-老会员|11-新会员]")
private Integer stageMarker;
private static final AdamMemberOrderPreviewVo obj = new AdamMemberOrderPreviewVo(); private static final AdamMemberOrderPreviewVo obj = new AdamMemberOrderPreviewVo();
......
...@@ -75,11 +75,11 @@ public class AdamMemberOrderController { ...@@ -75,11 +75,11 @@ public class AdamMemberOrderController {
AdamUserMemberVo userMemberVo = adamRdmService.getUserMemberVoByUid(currentUid); AdamUserMemberVo userMemberVo = adamRdmService.getUserMemberVoByUid(currentUid);
if (null == userMemberVo) { if (null == userMemberVo) {
memberVo.setStageMarker(0); previewVo.setStageMarker(0);
} else if (userMemberVo.isActive()) { } else if (userMemberVo.isActive()) {
memberVo.setStageMarker(userMemberVo.isOldMember() ? 10 : 11); previewVo.setStageMarker(userMemberVo.isOldMember() ? 10 : 11);
} else { } else {
memberVo.setStageMarker(2); previewVo.setStageMarker(2);
} }
AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid); AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment