From 8b2191df2f7d94aa299bd43dcbe97c94e5a61bbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 十一月 2019 14:53:34 +0800
Subject: [PATCH] RocketMQ的消息整改

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |   70 +++++++++++++++++++++++++++++-----
 1 files changed, 59 insertions(+), 11 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 2105715..43ce1e7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -24,6 +24,8 @@
 	public static boolean IS_TEST = true;
 
 	public static int PAGE_SIZE = 20;
+	
+	public static String YINGYONGBAO_LINK="https://a.app.qq.com/o/simple.jsp?pkgname=com.yeshi.ec.rebate";
 
 	public final static String UIDAESKEY = "WW782ss@8*px/%2v";
 
@@ -101,6 +103,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 +117,51 @@
 	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;
+	
 
+	// 绾㈠寘濂栧姳-閭�璇锋椂闂寸瓫閫� 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;
+	// 鏂颁汉濂栧姳鏈�楂�
+	public static final BigDecimal RED_PACK_NEW_USER_MONEY = new BigDecimal("2");
+	// 鏂颁汉濂栧姳绗竴娆¢殢鏈烘渶灏�
+	public static final int RED_PACK_NEW_USER_MIN = 50;
+	// 鏂颁汉濂栧姳绗竴娆¢殢鏈烘渶澶�
+	public static final int RED_PACK_NEW_USER_MAX = 60;
+		
+	
+	
 	public static WXGZConfig wxGZConfig;
 
 	// 鐭俊楠岃瘉鐮侀厤缃�
@@ -248,6 +296,8 @@
 			return "鍞搧浼�";
 		case SOURCE_TYPE_SUNING:
 			return "鑻忓畞";
+		case SOURCE_TYPE_ELME:
+			return "楗夸簡涔�";
 		default:// 鍏朵粬绫诲瀷
 			return "";
 		}
@@ -263,19 +313,17 @@
 	}
 
 	public static String getAppName(String platform, String version) {
-		if (VersionUtil.greaterThan_2_0(platform, version))
-			return Constant.systemCommonConfig.getProjectChineseName();
-		else
-			return "杩斿埄鍒�";
+		// if (VersionUtil.greaterThan_2_0(platform, version))
+		return Constant.systemCommonConfig.getProjectChineseName();
+		// else
+		// return "杩斿埄鍒�";
 	}
 
 	public static WXAccountInfoDTO getWXAccount(String platform, String version) {
-//		if (VersionUtil.greaterThan_2_0(platform, version)) {
-//			return new WXAccountInfoDTO("wxa99686bb65a9f466", "57390718ddedaa1591f6876cdcf96f43", "wx879fb78463222cd5",
-//					"2ad8ec333a9f96b13c5c5c1c2b13cd67");
-//		} else {
-			return new WXAccountInfoDTO("wx43617e2ed82c5b28", "f8a65908fb4681bdd181de70f6ab9a3b", "wx5c0d167c6e3ad726",
-					"0c79d5869bb0f2d7c13e43f9a18f440d");
-//		}
+		// return new WXAccountInfoDTO("wx43617e2ed82c5b28",
+		// "f8a65908fb4681bdd181de70f6ab9a3b", "wx5c0d167c6e3ad726",
+		// "0c79d5869bb0f2d7c13e43f9a18f440d");
+		return new WXAccountInfoDTO("wxa99686bb65a9f466", "57390718ddedaa1591f6876cdcf96f43", "wx5c0d167c6e3ad726",
+				"0c79d5869bb0f2d7c13e43f9a18f440d");
 	}
 }

--
Gitblit v1.8.0