From 88c7df1d5089d8e39f356a68eaccc18f308e190c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:10:07 +0800
Subject: [PATCH] Merge branch 'div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 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 4c27596..ee3d832 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -25,8 +25,12 @@
public static boolean IS_TEST = true;
public static int PAGE_SIZE = 20;
+
+ // 楠岃瘉鏂囨湰鍙ｄ护鎴栭摼鎺id
+ public static Long LINK_TOKEN_VERIFY_UID = 437032L;
+
- public static String YINGYONGBAO_LINK = "https://a.app.qq.com/o/simple.jsp?pkgname=com.yeshi.ec.rebate";
+ public static String YINGYONGBAO_LINK = "https://w.url.cn/s/AHUuT7i";
public final static String UIDAESKEY = "WW782ss@8*px/%2v";
@@ -76,7 +80,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";
@@ -170,11 +173,37 @@
public static final int TLJ_NEW_USER_DEFINE = 10;
// vip濂栧姳鍒稿埜5寮�
- public static final int VIP_COUPON_REWARD_NUM = 30;
+ 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 int COUPON_REWARD_LIMIT_DAY = 5;
@@ -247,6 +276,8 @@
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", "", "");
@@ -335,9 +366,9 @@
else if ("ios".equalsIgnoreCase(platform))
return 2;
else if ("wxmp".equalsIgnoreCase(platform))
- return 4;// 鏈煡
+ return 4;
else
- return 0;
+ return 0;// 鏈煡
}
public static String getAppName(String platform, String version) {
--
Gitblit v1.8.0