From 59aced4fe04f7e2fdcca81cb9ef279a70522301e Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 十二月 2019 12:30:44 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 8426794..35b0952 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -85,7 +85,7 @@
public static final String TAOBAO_SPECIAL_PID_DEFAULT = "mm_124933865_56750082_89555600043";
// 濂栧姳鍒告渶楂樻瘮渚�
- public static final BigDecimal MAX_REWARD_RATE = new BigDecimal("0.35");
+ public static final BigDecimal MAX_REWARD_RATE = new BigDecimal("0.31");
// 杩斿洖缁欏鎴风鐨勮处鍙峰皝绂佹彁绀鸿
public static final String FORBIDDEN_USER_REASON_DESC = "浣犵殑璐﹀彿鎴栫粦瀹氱殑绗笁鏂硅处鍙峰凡琚皝绂侊紝灏佺鍘熷洜鍙湪甯姪涓績鐨勭浉鍏宠鍒欎腑鍙傜湅锛屽鏈夌枒闂垨鐢宠瘔瑙ｉ櫎灏佺璇疯仈绯诲鏈�";
@@ -117,6 +117,8 @@
public static final int TOKEN_DAYS = 1;
// 璧犻�佹湁鏁堟湡-澶�
public static final int GIVE_DAYS = 1;
+ // 閲戝竵鏈夋晥澶╂暟
+ public static final int GOLD_COIN_VALID_DAYS = 30;
// 寰俊鑷姩鎻愮幇閲戦
@@ -125,7 +127,7 @@
public static final int AUTO_EXTRACT_MIN_SURPLUS = 2;
// vip銆佺孩鍖呫�佸鍔卞埜鍊掕鏃� 2.1涓婄嚎鏃堕棿
- public static final String VIP_ONLINE_TIME = "2019-12-20";
+ public static final String VIP_ONLINE_TIME = "2019-12-22";
// 绾㈠寘閭�璇峰鍔�
public static final String RED_PACK_ONLINE_TIME = "2019-12-14";
--
Gitblit v1.8.0