From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'

---
 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 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 94d522b..b32fe45 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
@@ -23,20 +23,43 @@
 	 */
 	public static final int SCORE_VIP_TYPE_CASH=1;
 
+
 	/**
 	 * 获取类型(2：赠送等)
 	 */
 	public static final int SCORE_VIP_TYPE_CONSUME=2;
+	/**
+	 * 获取类型(3推荐客户)
+	 */
+	public static final int SCORE_VIP_TYPE_REFERRER=3;
+	/**
+	 * 获取类型(4参加活动)
+	 */
+	public static final int SCORE_VIP_TYPE_JOIN_ACTIVE=4;
+
 
 	/**
-	 * 用户openId
+	 * 获取类型(4人工调整)
 	 */
-	private String openId;
+	public static final int SCORE_VIP_TYPE_USERCHANGE=4;
+	/**
+	 * 获取类型(5积分失效)
+	 */
+	public static final int SCORE_OVER_TIME=5;
+
+	/** 有效*/
+	public static final int SCORE_STATUS_YX=1;
+	/** 无效*/
+	public static final int SCORE_STATUS_WX=2;
+
+
+
+
 
 	/**
 	 * erp用户Id
 	 */
-	private String vipId;
+	private Long vipId;
 
 	
 	/**
@@ -93,7 +116,7 @@
 	 */
 
 
-	private String  businessId;
+	private Long  businessId;
 	
 	/**
 	 * 所属公司_id

--
Gitblit v1.9.1