From 051e1e78cd217d14ca34c26afe485b6c9c85c01d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 12 九月 2019 16:42:04 +0800
Subject: [PATCH] 订单调整
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 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 98abda3..73c4d60 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -1,7 +1,13 @@
package com.yeshi.fanli.util;
+import java.math.BigDecimal;
+import java.util.HashSet;
import java.util.Properties;
+import java.util.Set;
+import org.yeshi.utils.annotation.MapUtil;
+
+import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.config.AlipayConfig;
import com.yeshi.fanli.entity.config.ConstantConfig;
import com.yeshi.fanli.entity.config.SMSConfig;
@@ -9,7 +15,6 @@
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;
@@ -77,6 +82,9 @@
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 BigDecimal MAX_REWARD_RATE = new BigDecimal("0.35");
+
// 杩斿洖缁欏鎴风鐨勮处鍙峰皝绂佹彁绀鸿
public static final String FORBIDDEN_USER_REASON_DESC = "浣犵殑璐﹀彿鎴栫粦瀹氱殑绗笁鏂硅处鍙峰凡琚皝绂侊紝灏佺鍘熷洜鍙湪甯姪涓績鐨勭浉鍏宠鍒欎腑鍙傜湅锛屽鏈夌枒闂垨鐢宠瘔瑙ｉ櫎灏佺璇疯仈绯诲鏈�";
@@ -89,6 +97,10 @@
public static final int SOURCE_TYPE_JD = 2;
// 鏉ユ簮-鎷煎澶�
public static final int SOURCE_TYPE_PDD = 3;
+ // 鏉ユ簮-鍞搧浼�
+ public static final int SOURCE_TYPE_WPH = 4;
+ // 鏉ユ簮-鑻忓畞
+ public static final int SOURCE_TYPE_SUNING = 5;
// 鑷喘-杩斿埄
public static final int TYPE_REBATE = 1;
@@ -96,6 +108,11 @@
public static final int TYPE_SHAER = 2;
// 閭�璇�
public static final int TYPE_INVITE = 3;
+
+ // 鍙ｄ护鏈夋晥鏈�-澶�
+ public static final int TOKEN_DAYS = 1;
+ // 璧犻�佹湁鏁堟湡-澶�
+ public static final int GIVE_DAYS = 1;
public static WXGZConfig wxGZConfig;
@@ -151,7 +168,7 @@
*/
public static final String BINDUSER = "2";
/**
- * 杩斿埄鍒哥郴缁熺殑ID锛堝畨鍗擄級
+ * 绯荤粺鐨処D锛堝畨鍗擄級
*/
public static final long FANLI = 4;
/**
@@ -161,11 +178,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 {
@@ -196,7 +213,7 @@
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);
}
@@ -227,9 +244,28 @@
return "浜笢";
case SOURCE_TYPE_PDD:
return "鎷煎澶�";
+ case SOURCE_TYPE_WPH:
+ return "鍞搧浼�";
+ case SOURCE_TYPE_SUNING:
+ 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;// 鏈煡
+ }
+
+ public static String getAppName(String platform, String version) {
+ if (VersionUtil.greaterThan_2_0(platform, version))
+ return Constant.systemCommonConfig.getProjectName();
+ else
+ return "杩斿埄鍒�";
}
}
--
Gitblit v1.8.0