From 15269f168b9d2bf559c93ced761f192393e2d928 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 31 三月 2020 12:04:09 +0800
Subject: [PATCH] Merge branch 'div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 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 b662307..11ea9d9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -181,25 +181,28 @@
// 璁㈠崟瀹炰粯娆�
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;
-
+// // 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";
// 濂栧姳鍒稿�掕鏃� - 澶╂暟
--
Gitblit v1.8.0