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/entity/ShopSalesmanApply.java | 76 ++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java
index f40a697..80bb8a8 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java
@@ -1,65 +1,79 @@
package com.matrix.system.fenxiao.entity;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.matrix.core.anotations.Extend;
import com.matrix.system.score.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description 推广员申请记录
- * @author jyy
- * @date 2021-03-10 15:22
+ * @author yourName
+ * @date 2021-03-10 17:34
*/
@Data
@TableName("shop_salesman_apply")
public class ShopSalesmanApply extends BaseEntity {
- @Extend
- private static final long serialVersionUID = 1L;
-
-
-
-
-
/**
- * 申请方式1、自主申请，2、自动添加，3上级邀请，4、手动添加
+ * 审核状态-1、待审核
*/
+ public static final int APPLY_STATUS_DSH = 1;
+ /**
+ * 审核状态-2通过
+ */
+ public static final int APPLY_STATUS_TG= 2;
+ /**
+ * 审核状态-3未通过
+ */
+ public static final int APPLY_STATUS_WTG = 3;
+ /**
+ * 审核状态-4系统删除
+ */
+ public static final int APPLY_STATUS_XTQX = 4;
+ /**
+ * 申请方式1、自主申请
+ */
+ public static final int APPLY_WAY_SELF=1;
+ /**
+ * 申请方式2、自动添加
+ */
+ public static final int APPLY_WAY_AUTO_ADD=2;
+ /**
+ * 申请方式3上级邀请
+ */
+ public static final int APPLY_WAY_INVITATION=3;
+ /**
+ * 申请方式 4、手动添加
+ */
+ public static final int APPLY_WAY_HAND_ADD=4;
+
+
+
+ @ApiModelProperty(value = "申请方式1、自主申请，2、自动添加，3上级邀请，4、手动添加")
private Integer applyWay;
-
- /**
- * 申请用户id
- */
-
+ @ApiModelProperty(value = "申请用户id")
private Long userId;
- /**
- * 邀请用户ID
- */
-
+ @ApiModelProperty(value = "邀请用户ID")
private Long parentUserId;
- /**
- * 申请状态1、待审核，2通过，3未通过
- */
-
+ @ApiModelProperty(value = "申请状态1、待审核，2通过，3未通过")
private Integer applyStatus;
-
- /**
- * 备注
- */
-
+ @ApiModelProperty(value = "备注")
private String remark;
+
+ @ApiModelProperty(value = "等级ID")
+ private long gradeId;
/**
* 公司ID
*/
-
-
+ @ApiModelProperty(hidden = true)
private Long companyId;
--
Gitblit v1.9.1