From e9285f6e48b26bdd494569e660006ec87f3ad66b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 31 十月 2019 14:00:43 +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 | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 2e599a9..27fdd0f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -101,6 +101,8 @@
public static final int SOURCE_TYPE_WPH = 4;
// 鏉ユ簮-鑻忓畞
public static final int SOURCE_TYPE_SUNING = 5;
+ // 鏉ユ簮-楗夸簡涔�
+ public static final int SOURCE_TYPE_ELME = 6;
// 鑷喘-杩斿埄
public static final int TYPE_REBATE = 1;
@@ -113,7 +115,22 @@
public static final int TOKEN_DAYS = 1;
// 璧犻�佹湁鏁堟湡-澶�
public static final int GIVE_DAYS = 1;
+
+
+ // 寰俊鑷姩鎻愮幇閲戦
+ public static final int AUTO_EXTRACT_MONEY = 1;
+ // 寰俊鑷姩鎻愮幇鏈�浣庝綑棰�
+ public static final int AUTO_EXTRACT_MIN_SURPLUS = 2;
+
+ // 绾㈠寘濂栧姳闅忔満鑼冨洿
+ 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;
+
public static WXGZConfig wxGZConfig;
// 鐭俊楠岃瘉鐮侀厤缃�
@@ -248,6 +265,8 @@
return "鍞搧浼�";
case SOURCE_TYPE_SUNING:
return "鑻忓畞";
+ case SOURCE_TYPE_ELME:
+ return "楗夸簡涔�";
default:// 鍏朵粬绫诲瀷
return "";
}
--
Gitblit v1.8.0