From 52bc8ff0de3c7538d1401423c1cba9615c0c2082 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期四, 18 六月 2020 17:22:24 +0800 Subject: [PATCH] 发圈商品来源修改 + 云发单规则调整 --- fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 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 f81700d..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; @@ -91,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"); @@ -197,6 +202,8 @@ public static SystemCommonConfig systemCommonConfig; public static AlipayConfig alipayConfig; + + public static AlipayWapConfig alipayWapConfig; public static ZNXConfig znxConfig; @@ -298,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 -- Gitblit v1.8.0