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/ActivitySignReceiveRecord.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java
index 4782536..07a2563 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java
@@ -51,7 +51,7 @@
 	private Long  awardId;
 	
 	/**
-	 * 是否已领取（1：待领取2:已领取）
+	 * 是否已领取（1：待领取2:已领取 3：待配送 4：待收货 5:已失效）
 	 */
 
 
@@ -59,7 +59,10 @@
 
 	public static final int STATE_ING = 1;
 	public static final int STATE_DONE = 2;
-	
+	public static final int STATE_THREE = 3;
+	public static final int STATE_FOUR = 4;
+	public static final int STATE_FIVE = 5;
+
 	/**
 	 * 核销码
 	 */
@@ -81,6 +84,19 @@
 
 	private Long  companyId;
 
+	/**
+	 * 收货人
+	 */
+	private String  consignee;
+	/**
+	 * 联系电话
+	 */
+	private String  consigneePhone;
+	/**
+	 * 收货地址
+	 */
+	private String  consigneeAddress;
+
 
 
   

--
Gitblit v1.9.1