From 241a49f9653aa83d1dcd9bf646208da3157df35a Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Mon, 05 Apr 2021 22:48:14 +0800 Subject: [PATCH] 合并BizUser表与SysVipInfo表 大部分逻辑已经修正 可能存在问题的 1、拼团秒杀 2、分享图 3、分销结算 --- zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java index 736c881..79acde3 100644 --- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java +++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java @@ -21,6 +21,10 @@ * 审核状态-3未通过 */ public static final int APPLY_STATUS_WTG = 3; + /** + * 审核状态-4系统删除 + */ + public static final int APPLY_STATUS_XTQX = 4; /** @@ -40,7 +44,8 @@ */ public static final int APPLY_WAY_HAND_ADD=4; - + @ApiModelProperty(value = "申请记录ID") + private Long id; @ApiModelProperty(value = "申请方式1、自主申请，2、自动添加，3上级邀请，4、手动添加(来源)") private Integer applyWay; @@ -67,10 +72,16 @@ @ApiModelProperty(value = "分销员") private String nickname; - @ApiModelProperty(value = "邀请人") + @ApiModelProperty(value = "头像") + private String avatarUrl; + @ApiModelProperty(value = "注册邀请人") private String parentUser; - @ApiModelProperty(value = "下级客户数") + @ApiModelProperty(value = "当前上级") + private String parentUserNow; + @ApiModelProperty(value = "推广客户") private Integer lowerLevelNum; + @ApiModelProperty(value = "邀请下级") + private Integer invitedNum; @ApiModelProperty(value = "累计收益") private BigDecimal totalRevenue; @@ -78,6 +89,7 @@ private BigDecimal balance; @ApiModelProperty(value = "等级") private String grade; + @ApiModelProperty(value = "加入时间") private Date createTime; @ApiModelProperty(value = "状态") -- Gitblit v1.9.1