From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 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 309a32f..f81700d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -24,7 +24,15 @@
public static boolean IS_TEST = true;
+ public static boolean ENABLE_MQ = true;
+
public static int PAGE_SIZE = 20;
+
+ // 鏂扮殑瑙勫垯鐢熸晥鏃堕棿
+ public static final long NEW_ORDER_FANLI_RULE_TIME = TimeUtil.convertToTimeTemp("2020-04-28 16:00:00", "yyyy-MM-dd HH:mm:ss");
+
+ // 楠岃瘉鏂囨湰鍙ｄ护鎴栭摼鎺id
+ public static Long LINK_TOKEN_VERIFY_UID = 437032L;
public static String YINGYONGBAO_LINK = "https://w.url.cn/s/AHUuT7i";
@@ -100,7 +108,7 @@
// 鏉ユ簮-鎷煎澶�
public static final int SOURCE_TYPE_PDD = 3;
// 鏉ユ簮-鍞搧浼�
- public static final int SOURCE_TYPE_WPH = 4;
+ public static final int SOURCE_TYPE_VIP = 4;
// 鏉ユ簮-鑻忓畞
public static final int SOURCE_TYPE_SUNING = 5;
// 鏉ユ簮-楗夸簡涔�
@@ -168,12 +176,11 @@
// 鏂颁汉瀹氫箟锛� 鑷畬鎴愭敞鍐岃捣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;
@@ -244,17 +251,23 @@
public static final String WXHEADURL = "wx/headImg/";
public static final String WEBPAGE_SIGN_KEY = "@?,223Hbb88lll";
-
- 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 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 int MAX_COUNT_LOTTERY_NEWBIES = 5;
+ public static final Long[] NO_UPGRADE_UIDS=new Long[]{1700696L};
+
+
+
// 绾跨▼绛夊緟鏁伴噺
public static Set<Long> waitingThreadSet = new HashSet<>();
@@ -319,7 +332,7 @@
return "浜笢";
case SOURCE_TYPE_PDD:
return "鎷煎澶�";
- case SOURCE_TYPE_WPH:
+ case SOURCE_TYPE_VIP:
return "鍞搧浼�";
case SOURCE_TYPE_SUNING:
return "鑻忓畞";
--
Gitblit v1.8.0