From a980ade25b3dc1a7da482e37113f2935a2719c0b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 05 十一月 2019 10:01:11 +0800
Subject: [PATCH] 红包表明修改

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 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 73c4d60..5a60248 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -7,7 +7,7 @@
 
 import org.yeshi.utils.annotation.MapUtil;
 
-import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
 import com.yeshi.fanli.entity.config.AlipayConfig;
 import com.yeshi.fanli.entity.config.ConstantConfig;
 import com.yeshi.fanli.entity.config.SMSConfig;
@@ -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,26 @@
 	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;
+	// 绾㈠寘濂栧姳-鍗曚綅鏃堕棿绫荤疮璁′骇鐢熲墺200閲戝竵
+	public static final long RED_PACK_GOLD_COIN = 200;
+	
+	
+	
 	public static WXGZConfig wxGZConfig;
 
 	// 鐭俊楠岃瘉鐮侀厤缃�
@@ -248,6 +269,8 @@
 			return "鍞搧浼�";
 		case SOURCE_TYPE_SUNING:
 			return "鑻忓畞";
+		case SOURCE_TYPE_ELME:
+			return "楗夸簡涔�";
 		default:// 鍏朵粬绫诲瀷
 			return "";
 		}
@@ -263,9 +286,17 @@
 	}
 
 	public static String getAppName(String platform, String version) {
-		if (VersionUtil.greaterThan_2_0(platform, version))
-			return Constant.systemCommonConfig.getProjectName();
-		else
-			return "杩斿埄鍒�";
+		// if (VersionUtil.greaterThan_2_0(platform, version))
+		return Constant.systemCommonConfig.getProjectChineseName();
+		// else
+		// return "杩斿埄鍒�";
+	}
+
+	public static WXAccountInfoDTO getWXAccount(String platform, String version) {
+		// return new WXAccountInfoDTO("wx43617e2ed82c5b28",
+		// "f8a65908fb4681bdd181de70f6ab9a3b", "wx5c0d167c6e3ad726",
+		// "0c79d5869bb0f2d7c13e43f9a18f440d");
+		return new WXAccountInfoDTO("wxa99686bb65a9f466", "57390718ddedaa1591f6876cdcf96f43", "wx5c0d167c6e3ad726",
+				"0c79d5869bb0f2d7c13e43f9a18f440d");
 	}
 }

--
Gitblit v1.8.0