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/activity/entity/ActivitySignWriteoff.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java
index 7ab47e4..e4435f5 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java
@@ -66,13 +66,14 @@
 	private Date  winTime;
 	
 	/**
-	 * 状态(1:待兑换 2:待发货  3:已兑换  )
+	 * 状态(1:待兑换 2:待发货  3:已兑换 4:已失效 )
 	 */
 	private Integer  state;
 	public static final int STATE_ONE = 1;
 	public static final int STATE_TWO = 2;
 	public static final int STATE_THREE = 3;
-	
+	public static final int STATE_FOUR = 4;
+
 	/**
 	 * 中奖者ID
 	 */
@@ -85,7 +86,7 @@
 	 */
 
 
-	private Long  logisticsId;
+	private Integer  logisticsId;
 	
 	/**
 	 * 中奖记录ID
@@ -114,8 +115,6 @@
 
 
 	private Long  writeoffUserid;
-
-
 
   
 }
\ No newline at end of file

--
Gitblit v1.9.1