From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |   90 ++++++++++++++++++++++++++++++--------------
 1 files changed, 61 insertions(+), 29 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 f8b32ae..7b147d4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -6,6 +6,7 @@
 import java.util.Set;
 
 import org.yeshi.utils.annotation.MapUtil;
+import org.yeshi.utils.entity.wx.WXAPPInfo;
 
 import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
 import com.yeshi.fanli.entity.config.AlipayConfig;
@@ -23,9 +24,17 @@
 
 	public static boolean IS_TEST = true;
 
+	public static boolean ENABLE_MQ = true;
+
 	public static int PAGE_SIZE = 20;
 	
-	public static String YINGYONGBAO_LINK="https://a.app.qq.com/o/simple.jsp?pkgname=com.yeshi.ec.rebate";
+	// 鏂扮殑瑙勫垯鐢熸晥鏃堕棿
+	public static final long NEW_ORDER_FANLI_RULE_TIME = TimeUtil.convertToTimeTemp("2020-04-28 16:00:00", "yyyy-MM-dd HH:mm:ss");
+
+	// 楠岃瘉鏂囨湰鍙d护鎴栭摼鎺id
+	public static Long LINK_TOKEN_VERIFY_UID = 437032L;
+
+	public static String YINGYONGBAO_LINK = "https://w.url.cn/s/AHUuT7i";
 
 	public final static String UIDAESKEY = "WW782ss@8*px/%2v";
 
@@ -75,7 +84,6 @@
 	public static String Extract_Activty;
 	public static String HB_Activity;
 
-	public static final String EXTRACT_MIN_MONEY = "extract_min_money";
 	public static final String MYLIKE = "mylike";
 	public static final String MYDYNAMIC = "mydynamic";
 
@@ -85,7 +93,7 @@
 	public static final String TAOBAO_SPECIAL_PID_DEFAULT = "mm_124933865_56750082_89555600043";
 
 	// 濂栧姳鍒告渶楂樻瘮渚�
-	public static final BigDecimal MAX_REWARD_RATE = new BigDecimal("0.35");
+	public static final BigDecimal MAX_REWARD_RATE = new BigDecimal("0.31");
 
 	// 杩斿洖缁欏鎴风鐨勮处鍙峰皝绂佹彁绀鸿
 	public static final String FORBIDDEN_USER_REASON_DESC = "浣犵殑璐﹀彿鎴栫粦瀹氱殑绗笁鏂硅处鍙峰凡琚皝绂侊紝灏佺鍘熷洜鍙湪甯姪涓績鐨勭浉鍏宠鍒欎腑鍙傜湅锛屽鏈夌枒闂垨鐢宠瘔瑙i櫎灏佺璇疯仈绯诲鏈�";
@@ -117,40 +125,44 @@
 	public static final int TOKEN_DAYS = 1;
 	// 璧犻�佹湁鏁堟湡-澶�
 	public static final int GIVE_DAYS = 1;
-	
-	
+	// 閲戝竵鏈夋晥澶╂暟
+	public static final int GOLD_COIN_VALID_DAYS = 30;
+
 	// 寰俊鑷姩鎻愮幇閲戦
 	public static final int AUTO_EXTRACT_MONEY = 1;
 	// 寰俊鑷姩鎻愮幇鏈�浣庝綑棰�
 	public static final int AUTO_EXTRACT_MIN_SURPLUS = 2;
-	
 
-	// 绾㈠寘濂栧姳-閭�璇锋椂闂寸瓫閫� 2019-11-14 11:51:43
-	public static final long RED_PACK_REWARD_TIME = 1573703503000L;
-	// 涓�闃舵锛�20澶╂暟闄愬埗  
+	// vip銆佺孩鍖呫�佸鍔卞埜鍊掕鏃� 2.1涓婄嚎鏃堕棿
+	public static final String VIP_ONLINE_TIME = "2019-12-22";
+
+	// 绾㈠寘閭�璇峰鍔�
+	public static final String RED_PACK_ONLINE_TIME = "2019-12-14";
+
+	// 涓�闃舵锛�20澶╂暟闄愬埗
 	public static final int ONE_STAGE_LIMIT_DAYS = 20;
-	// 涓�闃舵锛氱珛寰楃幇閲�3鍏� 
+	// 涓�闃舵锛氱珛寰楃幇閲�3鍏�
 	public static final BigDecimal ONE_STAGE_MONEY = new BigDecimal("3");
-	
-	// 浜岄樁娈碉細90澶╂暟闄愬埗  
+
+	// 浜岄樁娈碉細90澶╂暟闄愬埗
 	public static final int TWO_STAGE_LIMIT_DAYS = 90;
-	// 浜岄樁娈碉細-闃熷弸浜х敓鐨勮鍗曚腑锛堣嚜璐�+鍒嗕韩锛夛紝閭�璇蜂汉绱浜х敓鈮�1 鍏冨閲� 
+	// 浜岄樁娈碉細-闃熷弸浜х敓鐨勮鍗曚腑锛堣嚜璐�+鍒嗕韩锛夛紝閭�璇蜂汉绱浜х敓鈮�1 鍏冨閲�
 	public static final BigDecimal TWO_STAGE_ORDER_REWARD_MIN = new BigDecimal("1");
 	// 浜岄樁娈碉細 绾㈠寘閲戦鏈�灏�3鍏�
 	public static final BigDecimal TWO_STAGE_MONEY_MIN = new BigDecimal("3");
-	// 浜岄樁娈碉細姣忔鏈�澶氬鍔�0.5  
+	// 浜岄樁娈碉細姣忔鏈�澶氬鍔�0.5
 	public static final BigDecimal TWO_STAGE_MONEY_ADD = new BigDecimal("0.5");
 	// 浜岄樁娈碉細 澧炲姞9娆�
-	public static final int TWO_STAGE_MONEY_ADD_NUM = 9; 
-	
+	public static final int TWO_STAGE_MONEY_ADD_NUM = 9;
+
 	// 涓夐樁娈碉細杩炵画濂栧姳鏈堟暟
 	public static final int THREE_STAGE_REWARD_MONTH = 15;
-	// 涓夐樁娈碉細-杩炵画 15 涓湀濂藉弸姣忔湀鈥滅粰浣犵疮璁′骇鐢熲墺2 鍏冨 閲戔��  
+	// 涓夐樁娈碉細-杩炵画 15 涓湀濂藉弸姣忔湀鈥滅粰浣犵疮璁′骇鐢熲墺2 鍏冨 閲戔��
 	public static final BigDecimal THREE_STAGE_ORDER_REWARD_MIN = new BigDecimal("2");
 	// 涓夐樁娈碉細绾㈠寘濂栧姳闅忔満鑼冨洿
 	public static final double THREE_STAGE_RANDOM_MIN = 1.5;
 	public static final double THREE_STAGE_RANDOM_MAX = 2;
-	
+
 	// 鏂颁汉濂栧姳杩炵画澶╂暟
 	public static final long TLJ_NEW_USER_DAYS = 7;
 	// 鏂颁汉濂栧姳鏈�楂�
@@ -163,15 +175,19 @@
 	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;
-	// vip璧犻�侀噾甯�
-	public static final int VIP_COLDCOIN_NUM = 1800;
-	
-	
+
+	// 璁㈠崟瀹炰粯娆�
+	public static final BigDecimal VIP_ORDER_PAY = new BigDecimal("1");
+
+	// 璁㈠崟鍒楄〃鏄�> 鏃堕棿 TODO
+	public static final String ORDER_SHOW_BRACE_TIME = "1999-03-01";
+
+	// 濂栧姳鍒稿�掕鏃� - 澶╂暟
+	public static final int COUPON_REWARD_LIMIT_DAY = 5;
+
+	// 涓撳睘閭�璇风爜鐢宠鐩存帴绮変笣闄愬埗
+	public static final int INVITE_CODRE_TAILOR_LIMIT = 2;
+
 	public static WXGZConfig wxGZConfig;
 
 	// 鐭俊楠岃瘉鐮侀厤缃�
@@ -236,8 +252,22 @@
 
 	public static final String WEBPAGE_SIGN_KEY = "@?,223Hbb88lll";
 
-	// 鏂颁汉鎶藉-鏈�澶ф鏁�
-	public static final int MAX_COUNT_LOTTERY_NEWBIES = 5;
+	public static final String WXMP_SIGN_KEY = "xyJBaNliK&*!uAIShEn8g@@";
+
+	public static final String WXMP_USER_SIGN_KEY = "xyJBaNliShEn8g@@";
+
+	public static final WXAPPInfo WXMP_APP_INFO = new WXAPPInfo("wxc22f3bd53cb25012",
+			"4c7b166fecb6d9f53837e993f2214673", "", "");
+
+
+	// 浣跨敤濂栧姳鍒告渶澶ч噾棰濋檺鍒�
+	public static final BigDecimal REWARD_COUPON_LIMIT_MONEY = new BigDecimal("10");
+	
+	
+	public static final Long[] NO_UPGRADE_UIDS=new Long[]{1700696L};
+	
+	
+	
 
 	// 绾跨▼绛夊緟鏁伴噺
 	public static Set<Long> waitingThreadSet = new HashSet<>();
@@ -318,6 +348,8 @@
 			return 1;
 		else if ("ios".equalsIgnoreCase(platform))
 			return 2;
+		else if ("wxmp".equalsIgnoreCase(platform))
+			return 4;
 		else
 			return 0;// 鏈煡
 	}

--
Gitblit v1.8.0