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/shopXcx/bean/ShopActivities.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivities.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivities.java
index 5cbb9a8..84d0d00 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivities.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivities.java
@@ -34,6 +34,10 @@
 	 * 活动类型 签到
 	 */
 	public static final int ACTIVITIES_TYPE_SIGN = 4;
+	/**
+	 * 活动类型转盘抽奖
+	 */
+	public static final int ACTIVITIES_TYPE_LUCKYDRAW = 5;
 
 	/**
 	 * 活动状态 开启
@@ -86,7 +90,7 @@
 	private Integer  actStatus;
 
 	//未发布
-	public static final int ACTSTATUS_STATUS_RELEASE = 2;
+	public static final int ACTSTATUS_STATUS_RELEASE = 1;
 	//未开始
 	public static final int ACTSTATUS_STATUS_READY = 2;
 	//进行中

--
Gitblit v1.9.1