From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 cc3a7e3..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
@@ -1,15 +1,13 @@
package com.matrix.system.fenxiao.vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
import java.math.BigDecimal;
import java.util.Date;
-import com.matrix.core.anotations.Extend;
-
-import io.swagger.annotations.ApiModelProperty;
-
+@Data
public class ShopSalesmanApplyVo {
- @Extend
- private static final long serialVersionUID = 1L;
/**
* 审核状态-1、待审核
@@ -23,6 +21,10 @@
* 审核状态-3未通过
*/
public static final int APPLY_STATUS_WTG = 3;
+ /**
+ * 审核状态-4系统删除
+ */
+ public static final int APPLY_STATUS_XTQX = 4;
/**
@@ -42,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;
@@ -69,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;
@@ -80,6 +89,7 @@
private BigDecimal balance;
@ApiModelProperty(value = "等级")
private String grade;
+
@ApiModelProperty(value = "加入时间")
private Date createTime;
@ApiModelProperty(value = "状态")
--
Gitblit v1.9.1