From be641cbe14bf20c807dccceb1c4b825d80443aed Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 08 一月 2020 14:42:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java
index 7b78c2d..704dd96 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java
@@ -39,6 +39,7 @@
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.jd.JDGoodsClass;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.log.LogHelper;
@@ -149,7 +150,7 @@
@RequestMapping(value = "getTopCategory", method = RequestMethod.POST)
public void getTopCategory(WXMPAcceptData acceptData, PrintWriter out) {
JSONObject data = new JSONObject();
- data.put("list", configService.get("jd_wxmp_class"));
+ data.put("list", configService.get(ConfigKeyEnum.jdWXMPClass.getKey()));
out.print(JsonUtil.loadTrueResult(data));
}
@@ -365,7 +366,7 @@
List<ShamUser> listShareUser = new ArrayList<ShamUser>();
// 浜笢寮�鍚垎浜�
- String open = configService.get("share_jd_open");
+ String open = configService.get(ConfigKeyEnum.shareOpenJD.getKey());
if ("1".equals(open.trim())) {
extraVO.setShareValid(true);
MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();
@@ -409,7 +410,7 @@
extraVO.setFanliValid(true);
if (StringUtil.isNullOrEmpty(helpLink)) {
- helpLink = configService.get("no_rebate_help_link");
+ helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());
}
ShareVO shareInfoVO = new ShareVO();
@@ -532,7 +533,7 @@
extraVO.setShareValid(true);
if (StringUtil.isNullOrEmpty(helpLink)) {
- helpLink = configService.get("no_rebate_help_link");
+ helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());
}
ShareVO shareInfoVO = new ShareVO();
--
Gitblit v1.8.0