From 26f41e1a5c34a3e36c9e73c237e3643e707924ce Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 18 一月 2020 11:36:51 +0800
Subject: [PATCH] 商城订单失效退还红包
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index d557dad..dc83d13 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -27,6 +27,7 @@
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.dynamic.DynamicInfo;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.dynamic.ArticleOfficialService;
@@ -159,7 +160,7 @@
// 2.0.6鐗堟湰澧炲姞 瀛﹂櫌鏍忕洰
if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
- list.add(menu6);
+ //list.add(menu6);
}
list.add(menu4);
@@ -473,7 +474,7 @@
@RequestMapping(value = "getArticleHot", method = RequestMethod.POST)
public void getArticleHot(AcceptData acceptData, PrintWriter out) {
JSONObject data = new JSONObject();
- data.put("words", configService.get("article_hot_words"));
+ data.put("words", configService.get(ConfigKeyEnum.articleHotWords.getKey()));
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0