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/ShopRevenueFlow.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java
index 68a0b7d..2a2130b 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java
@@ -3,6 +3,7 @@
 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;
 
 /**
@@ -16,43 +17,50 @@
 	@Extend
 	private static final long serialVersionUID = 1L; 
 
-	
+	/**
+	 * 推广收益类型    推广收益
+	 */
+    public static final String TYPE_TGSY = "推广收益";
+    /**
+     * 推广收益类型   邀请收益
+     */
+   
+    public static final String TYPE_YQSY = "邀请收益";
 
 
 	
 	/**
 	 * 用户id
 	 */
-
-
-	private String  userId;
+	@ApiModelProperty(hidden = true)
+	private Long  userId;
 	
 	/**
 	 * 收益说明
 	 */
 
-
+	@ApiModelProperty(value = "收益说明")
 	private String  revenueContent;
 	
 	/**
 	 * 收益金额
 	 */
 
-
+	@ApiModelProperty(value = "收益金额")
 	private Double  amount;
 	
 	/**
 	 * 原始订单ID
 	 */
 
-
+	@ApiModelProperty(value = "原始订单ID")
 	private Long  businessId;
 	
 	/**
 	 * 公司ID
 	 */
 
-
+	@ApiModelProperty(hidden = true)
 	private Long  companyId;
 
 

--
Gitblit v1.9.1