From 1fd8f11537bb74c1f7e611e35a766cbbd34eff05 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 18:14:43 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
index 43ce1e7..0c12c68 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -152,14 +152,22 @@
 	public static final double THREE_STAGE_RANDOM_MAX = 2;
 	
 	// 鏂颁汉濂栧姳杩炵画澶╂暟
-	public static final long RED_PACK_NEW_USER_DAYS = 7;
+	public static final long TLJ_NEW_USER_DAYS = 7;
 	// 鏂颁汉濂栧姳鏈�楂�
-	public static final BigDecimal RED_PACK_NEW_USER_MONEY = new BigDecimal("2");
+	public static final BigDecimal TLJ_NEW_USER_MONEY = new BigDecimal("2");
 	// 鏂颁汉濂栧姳绗竴娆¢殢鏈烘渶灏�
-	public static final int RED_PACK_NEW_USER_MIN = 50;
+	public static final int TLJ_NEW_USER_MIN = 50;
 	// 鏂颁汉濂栧姳绗竴娆¢殢鏈烘渶澶�
-	public static final int RED_PACK_NEW_USER_MAX = 60;
-		
+	public static final int TLJ_NEW_USER_MAX = 60;
+	// 鏂颁汉绾㈠寘鏈夋晥鏈�10澶�
+	public static final int TLJ_NEW_USER_LIMIT = 10;
+	// 鏂颁汉瀹氫箟锛� 鑷畬鎴愭敞鍐岃捣10澶╁唴锛�
+	public static final int TLJ_NEW_USER_DEFINE = 10;
+	
+	// vip濂栧姳鍒稿埜5寮�
+	public static final int VIP_COUPON_REWARD_NUM = 30;
+	// vip璧犻�佸厤鍗曞埜5寮�
+	public static final int VIP_COUPON_GIVEFREE_NUM = 5;
 	
 	
 	public static WXGZConfig wxGZConfig;

--
Gitblit v1.8.0