From 393d296e43f0e5f11e524cab5446bcd3eee94e89 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 12 Jun 2021 17:47:38 +0800
Subject: [PATCH] 新增赠送项目是否计算消耗控制

---
 zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 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 e27543d..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
@@ -1,14 +1,11 @@
 package com.matrix.system.activity.entity;
 
-import com.matrix.core.pojo.EntityDTO;
-import com.matrix.system.score.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.matrix.core.anotations.Extend;
+import com.matrix.system.score.entity.BaseEntity;
+import lombok.Data;
 
 import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import lombok.Data;
 
 /**
  * @description 领
@@ -26,11 +23,11 @@
 
 	
 	/**
-	 * openID
+	 * userId
 	 */
 
 
-	private String  openId;
+	private Long  userId;
 	
 	/**
 	 * 领取时间
@@ -54,12 +51,18 @@
 	private Long  awardId;
 	
 	/**
-	 * 是否已领取（1：待领取2:已领取）
+	 * 是否已领取（1：待领取2:已领取 3：待配送 4：待收货 5:已失效）
 	 */
 
 
 	private Integer  state;
-	
+
+	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