From d28bed1a1275131a5ca37f7da37961e2b518ac07 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 13:44:00 +0800
Subject: [PATCH] 淘礼金创建异常处理

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |   77 +++++++++++++++++++++++++++++++++++---
 1 files changed, 70 insertions(+), 7 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 4d49e06..25a254b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -1,14 +1,18 @@
 package com.yeshi.fanli.util;
 
+import java.util.HashSet;
 import java.util.Properties;
+import java.util.Set;
+
+import org.yeshi.utils.annotation.MapUtil;
 
 import com.yeshi.fanli.entity.config.AlipayConfig;
+import com.yeshi.fanli.entity.config.ConstantConfig;
 import com.yeshi.fanli.entity.config.SMSConfig;
 import com.yeshi.fanli.entity.config.SystemCommonConfig;
 import com.yeshi.fanli.entity.config.WXGZConfig;
 import com.yeshi.fanli.entity.config.ZNXConfig;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.annotation.MapUtil;
 
 public class Constant {
 	public static boolean IS_TASK = false;
@@ -18,8 +22,6 @@
 	public static boolean IS_TEST = true;
 
 	public static int PAGE_SIZE = 20;
-	public static int[] TASK_TYPE = { 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008// 寰俊浠诲姟绫诲瀷缂栧彿
-	};
 
 	public final static String UIDAESKEY = "WW782ss@8*px/%2v";
 
@@ -73,9 +75,30 @@
 	public static final String MYLIKE = "mylike";
 	public static final String MYDYNAMIC = "mydynamic";
 
-	// 鏉ユ簮
+	public static final String TAOBAO_AUTH_APPKEY = "24980167";
+	public static final String TAOBAO_AUTH_APPSECRET = "e0a2e05deabf5ce039b52e5b492d5382";
+	public static final String TAOBAO_RELATION_PID_DEFAULT = "mm_124933865_56750082_87140050199";
+	public static final String TAOBAO_SPECIAL_PID_DEFAULT = "mm_124933865_56750082_89555600043";
+
+	// 杩斿洖缁欏鎴风鐨勮处鍙峰皝绂佹彁绀鸿
+	public static final String FORBIDDEN_USER_REASON_DESC = "浣犵殑璐﹀彿鎴栫粦瀹氱殑绗笁鏂硅处鍙峰凡琚皝绂侊紝灏佺鍘熷洜鍙湪甯姪涓績鐨勭浉鍏宠鍒欎腑鍙傜湅锛屽鏈夌枒闂垨鐢宠瘔瑙i櫎灏佺璇疯仈绯诲鏈�";
+
+	// 鐢ㄦ埛琚皝绂�
+	public static final int CODE_FORBIDDEN_USER = 80001;
+
+	// 鏉ユ簮-娣樺疂
 	public static final int SOURCE_TYPE_TAOBAO = 1;
+	// 鏉ユ簮-浜笢
 	public static final int SOURCE_TYPE_JD = 2;
+	// 鏉ユ簮-鎷煎澶�
+	public static final int SOURCE_TYPE_PDD = 3;
+
+	// 鑷喘-杩斿埄
+	public static final int TYPE_REBATE = 1;
+	// 鍒嗕韩
+	public static final int TYPE_SHAER = 2;
+	// 閭�璇�
+	public static final int TYPE_INVITE = 3;
 
 	public static WXGZConfig wxGZConfig;
 
@@ -88,6 +111,8 @@
 	public static AlipayConfig alipayConfig;
 
 	public static ZNXConfig znxConfig;
+
+	public static ConstantConfig constantConfig;
 
 	/**
 	 * 娣樺疂鍟嗗搧绾㈠寘
@@ -139,8 +164,11 @@
 
 	public static final String WEBPAGE_SIGN_KEY = "@?,223Hbb88lll";
 
-	// public static final String TAOKE_ANDROID_APPKEY = "24587154";
-	// public static final String TAOKE_IOS_APPKEY = "24838852";
+	// 鏂颁汉鎶藉-鏈�澶ф鏁�
+	public static final int MAX_COUNT_LOTTERY_NEWBIES = 5;
+
+	// 绾跨▼绛夊緟鏁伴噺
+	public static Set<Long> waitingThreadSet = new HashSet<>();
 
 	static {
 
@@ -171,8 +199,21 @@
 
 		if (znxConfig == null) {
 			Properties ps = org.yeshi.utils.PropertiesUtil
-					.getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("znx_msg.properties"));
+					.getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("push_msg.properties"));
 			znxConfig = (ZNXConfig) MapUtil.parseMap(ZNXConfig.class, ps);
+		}
+
+		if (constantConfig == null) {
+			Properties ps = org.yeshi.utils.PropertiesUtil
+					.getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("constant.properties"));
+			constantConfig = (ConstantConfig) MapUtil.parseMap(ConstantConfig.class, ps);
+			IS_OUTNET = Boolean.parseBoolean(constantConfig.getOutNetWork());
+			IS_TASK = Boolean.parseBoolean(constantConfig.getTask());
+			IS_TEST = Boolean.parseBoolean(constantConfig.getTest());
+
+			System.out.println("IS_OUTNET:" + IS_OUTNET);
+			System.out.println("IS_TASK:" + IS_TASK);
+			System.out.println("IS_TEST:" + IS_TEST);
 		}
 
 		Extract_Activty = String.format("%s.ui.mine.MyRedPacketsActivity",
@@ -180,4 +221,26 @@
 		HB_Activity = String.format("%s.ui.main.MainActivity",
 				Constant.systemCommonConfig.getAndroidBaseactivityName());
 	}
+
+	public static String getSourceName(int sourceType) {
+		switch (sourceType) {
+		case SOURCE_TYPE_TAOBAO:
+			return "娣樺疂";
+		case SOURCE_TYPE_JD:
+			return "浜笢";
+		case SOURCE_TYPE_PDD:
+			return "鎷煎澶�";
+		default:// 鍏朵粬绫诲瀷
+			return "";
+		}
+	}
+
+	public static int getPlatformCode(String platform) {
+		if ("android".equalsIgnoreCase(platform))
+			return 1;
+		else if ("ios".equalsIgnoreCase(platform))
+			return 2;
+		else
+			return 0;// 鏈煡
+	}
 }

--
Gitblit v1.8.0