From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 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 eb69dd2..43ce1e7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -123,21 +123,33 @@
public static final int AUTO_EXTRACT_MONEY = 1;
// 寰俊鑷姩鎻愮幇鏈�浣庝綑棰�
public static final int AUTO_EXTRACT_MIN_SURPLUS = 2;
-
- // 绾㈠寘濂栧姳-鍒拌处濂栧姳涓嶄綆浜�5鍏�
- public static final BigDecimal RED_PACK_ORDER_REWARD_MIN = new BigDecimal("5");
- // 绾㈠寘濂栧姳闅忔満鑼冨洿
- public static final double RED_PACK_RANDOM_MIN = 0.5;
- public static final double RED_PACK_RANDOM_MAX = 2;
- // 绾㈠寘濂栧姳璁㈠崟瀹炰粯娆炬渶浣�
- public static final BigDecimal RED_PACK_PAY_MIN = new BigDecimal("10");
- // 绾㈠寘濂栧姳鍒嗕韩璁㈠崟杩炵画濂栧姳鏈堟暟
- public static final int RED_PACK_REWARD_MONTH = 15;
- // 绾㈠寘濂栧姳-鍗曚綅鏃堕棿绫荤疮璁′骇鐢熲墺200閲戝竵
- public static final long RED_PACK_GOLD_COIN = 200;
+
// 绾㈠寘濂栧姳-閭�璇锋椂闂寸瓫閫� 2019-11-14 11:51:43
public static final long RED_PACK_REWARD_TIME = 1573703503000L;
+ // 涓�闃舵锛�20澶╂暟闄愬埗
+ public static final int ONE_STAGE_LIMIT_DAYS = 20;
+ // 涓�闃舵锛氱珛寰楃幇閲�3鍏�
+ public static final BigDecimal ONE_STAGE_MONEY = new BigDecimal("3");
+
+ // 浜岄樁娈碉細90澶╂暟闄愬埗
+ public static final int TWO_STAGE_LIMIT_DAYS = 90;
+ // 浜岄樁娈碉細-闃熷弸浜х敓鐨勮鍗曚腑锛堣嚜璐�+鍒嗕韩锛夛紝閭�璇蜂汉绱浜х敓鈮�1 鍏冨閲�
+ public static final BigDecimal TWO_STAGE_ORDER_REWARD_MIN = new BigDecimal("1");
+ // 浜岄樁娈碉細 绾㈠寘閲戦鏈�灏�3鍏�
+ public static final BigDecimal TWO_STAGE_MONEY_MIN = new BigDecimal("3");
+ // 浜岄樁娈碉細姣忔鏈�澶氬鍔�0.5
+ public static final BigDecimal TWO_STAGE_MONEY_ADD = new BigDecimal("0.5");
+ // 浜岄樁娈碉細 澧炲姞9娆�
+ public static final int TWO_STAGE_MONEY_ADD_NUM = 9;
+
+ // 涓夐樁娈碉細杩炵画濂栧姳鏈堟暟
+ public static final int THREE_STAGE_REWARD_MONTH = 15;
+ // 涓夐樁娈碉細-杩炵画 15 涓湀濂藉弸姣忔湀鈥滅粰浣犵疮璁′骇鐢熲墺2 鍏冨 閲戔��
+ public static final BigDecimal THREE_STAGE_ORDER_REWARD_MIN = new BigDecimal("2");
+ // 涓夐樁娈碉細绾㈠寘濂栧姳闅忔満鑼冨洿
+ public static final double THREE_STAGE_RANDOM_MIN = 1.5;
+ public static final double THREE_STAGE_RANDOM_MAX = 2;
// 鏂颁汉濂栧姳杩炵画澶╂暟
public static final long RED_PACK_NEW_USER_DAYS = 7;
--
Gitblit v1.8.0