From d22d18f40d088277195e5c3ab587d07450f1a94d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 四月 2020 18:22:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 57 ++++++++++++++++++---------------------------------------
1 files changed, 18 insertions(+), 39 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 ee3d832..428dd59 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -24,11 +24,12 @@
public static boolean IS_TEST = true;
+ public static boolean ENABLE_MQ = false;
+
public static int PAGE_SIZE = 20;
-
+
// 楠岃瘉鏂囨湰鍙ｄ护鎴栭摼鎺id
public static Long LINK_TOKEN_VERIFY_UID = 437032L;
-
public static String YINGYONGBAO_LINK = "https://w.url.cn/s/AHUuT7i";
@@ -172,38 +173,11 @@
// 鏂颁汉瀹氫箟锛� 鑷畬鎴愭敞鍐岃捣10澶╁唴锛�
public static final int TLJ_NEW_USER_DEFINE = 10;
- // vip濂栧姳鍒稿埜5寮�
- public static final int VIP_COUPON_REWARD_NUM = 15;
- // 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");
-
- // vip-涓�闃舵鍒嗕韩璁㈠崟鏁版嵁
- public static final int VIP_PROCESS_1_ZIGOU = 60;
- public static final int VIP_PROCESS_1_SHARE = 120;
- public static final int VIP_PROCESS_1_TEAM = 8;
- public static final int VIP_PROCESS_1_TEAM_SECOND = 16;
-
- // vip-浜岄樁娈靛垎浜鍗曟暟鎹�
- public static final int VIP_PROCESS_2_ZIGOU = 120;
- public static final int VIP_PROCESS_2_SHARE = 240;
- public static final int VIP_PROCESS_2_TEAM = 16;
- public static final int VIP_PROCESS_2_TEAM_SECOND = 32;
-
-
- // vip-涓夐樁娈靛垎浜鍗曟暟鎹�
- public static final int VIP_PROCESS_3_ZIGOU = 240;
- public static final int VIP_PROCESS_3_SHARE = 480;
- public static final int VIP_PROCESS_3_TEAM = 32;
- public static final int VIP_PROCESS_3_TEAM_SECOND = 64;
-
-
+
// 璁㈠崟鍒楄〃鏄�> 鏃堕棿 TODO
- public static final String ORDER_SHOW_BRACE_TIME = "2019-12-14";
-
+ public static final String ORDER_SHOW_BRACE_TIME = "1999-03-01";
// 濂栧姳鍒稿�掕鏃� - 澶╂暟
public static final int COUPON_REWARD_LIMIT_DAY = 5;
@@ -274,17 +248,22 @@
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 long NEW_ORDER_FANLI_RULE_TIME = TimeUtil.convertToTimeTemp("2020-04-18", "yyyy-MM-dd");
+
+ // 浣跨敤濂栧姳鍒告渶澶ч噾棰濋檺鍒�
+ public static final BigDecimal REWARD_COUPON_LIMIT_MONEY = new BigDecimal("10");
- // 鏂颁汉鎶藉-鏈�澶ф鏁�
- public static final int MAX_COUNT_LOTTERY_NEWBIES = 5;
+
// 绾跨▼绛夊緟鏁伴噺
public static Set<Long> waitingThreadSet = new HashSet<>();
--
Gitblit v1.8.0