From b0c5d432ec041221dcbe81ca5ae3aa20fe3bddc6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 22 Mar 2021 20:17:58 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java
index 2526ee5..8c6b859 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java
@@ -16,10 +16,33 @@
 @TableName("score_vip_detail")
 public class ScoreVipDetail  extends BaseEntity{
 	@Extend
-	private static final long serialVersionUID = 1L; 
+	private static final long serialVersionUID = 1L;
 
-	
+	/**
+	 * 获取类型(1:现金消费)
+	 */
+	public static final int SCORE_VIP_TYPE_CASH=1;
 
+	/**
+	 * 获取类型(2:赠送等)
+	 */
+	public static final int SCORE_VIP_TYPE_CONSUME=2;
+	/** 有效*/
+	public static final int SCORE_STATUS_YX=1;
+	/** 无效*/
+	public static final int SCORE_STATUS_WX=2;
+
+
+
+	/**
+	 * 用户openId
+	 */
+	private String openId;
+
+	/**
+	 * erp用户Id
+	 */
+	private Long vipId;
 
 	
 	/**
@@ -76,7 +99,7 @@
 	 */
 
 
-	private String  businessId;
+	private Long  businessId;
 	
 	/**
 	 * 所属公司_id

--
Gitblit v1.9.1