From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 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 428dd59..60bba33 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -10,6 +10,7 @@
import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.config.AlipayConfig;
+import com.yeshi.fanli.entity.config.AlipayWapConfig;
import com.yeshi.fanli.entity.config.ConstantConfig;
import com.yeshi.fanli.entity.config.SMSConfig;
import com.yeshi.fanli.entity.config.SystemCommonConfig;
@@ -24,9 +25,12 @@
public static boolean IS_TEST = true;
- public static boolean ENABLE_MQ = false;
+ public static boolean ENABLE_MQ = true;
public static int PAGE_SIZE = 20;
+
+ // 鏂扮殑瑙勫垯鐢熸晥鏃堕棿
+ public static final long NEW_ORDER_FANLI_RULE_TIME = TimeUtil.convertToTimeTemp("2020-04-28 16:00:00", "yyyy-MM-dd HH:mm:ss");
// 楠岃瘉鏂囨湰鍙ｄ护鎴栭摼鎺id
public static Long LINK_TOKEN_VERIFY_UID = 437032L;
@@ -88,6 +92,10 @@
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 YHG_CLOUD_GROUP_AWAKEN_KEY="蹇渷鐖嗘鎺ㄨ崘";
// 濂栧姳鍒告渶楂樻瘮渚�
public static final BigDecimal MAX_REWARD_RATE = new BigDecimal("0.31");
@@ -105,7 +113,7 @@
// 鏉ユ簮-鎷煎澶�
public static final int SOURCE_TYPE_PDD = 3;
// 鏉ユ簮-鍞搧浼�
- public static final int SOURCE_TYPE_WPH = 4;
+ public static final int SOURCE_TYPE_VIP = 4;
// 鏉ユ簮-鑻忓畞
public static final int SOURCE_TYPE_SUNING = 5;
// 鏉ユ簮-楗夸簡涔�
@@ -194,6 +202,8 @@
public static SystemCommonConfig systemCommonConfig;
public static AlipayConfig alipayConfig;
+
+ public static AlipayWapConfig alipayWapConfig;
public static ZNXConfig znxConfig;
@@ -256,11 +266,12 @@
public static final WXAPPInfo WXMP_APP_INFO = new WXAPPInfo("wxc22f3bd53cb25012",
"4c7b166fecb6d9f53837e993f2214673", "", "");
- // 鏂扮殑瑙勫垯鐢熸晥鏃堕棿
- public static final long NEW_ORDER_FANLI_RULE_TIME = TimeUtil.convertToTimeTemp("2020-04-18", "yyyy-MM-dd");
// 浣跨敤濂栧姳鍒告渶澶ч噾棰濋檺鍒�
public static final BigDecimal REWARD_COUPON_LIMIT_MONEY = new BigDecimal("10");
+
+
+ public static final Long[] NO_UPGRADE_UIDS=new Long[]{1700696L};
@@ -294,6 +305,13 @@
.getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("alipay.properties"));
alipayConfig = (AlipayConfig) MapUtil.parseMap(AlipayConfig.class, ps);
}
+
+ if (alipayWapConfig == null) {
+ Properties ps = org.yeshi.utils.PropertiesUtil
+ .getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("alipay_wap.properties"));
+ alipayWapConfig = (AlipayWapConfig) MapUtil.parseMap(AlipayWapConfig.class, ps);
+ }
+
if (znxConfig == null) {
Properties ps = org.yeshi.utils.PropertiesUtil
@@ -328,7 +346,7 @@
return "浜笢";
case SOURCE_TYPE_PDD:
return "鎷煎澶�";
- case SOURCE_TYPE_WPH:
+ case SOURCE_TYPE_VIP:
return "鍞搧浼�";
case SOURCE_TYPE_SUNING:
return "鑻忓畞";
--
Gitblit v1.8.0