From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 28 +---------------------------
1 files changed, 1 insertions(+), 27 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 11ea9d9..9759fa2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -172,37 +172,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 = "2012-03-01";
// 濂栧姳鍒稿�掕鏃� - 澶╂暟
--
Gitblit v1.8.0