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/controller/wxmp/v1/SearchController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java
index 64bf7d7..93266ce 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java
@@ -9,6 +9,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpSession;
+import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.util.SystemInfoUtil;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -196,7 +198,7 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
data.put("type", type);
data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,
- orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion()))));
+ orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion(),acceptData.getSystem()))));
out.print(JsonUtil.loadTrueResult(data));
return;
}
@@ -215,7 +217,7 @@
goodsType = Constant.SOURCE_TYPE_TAOBAO;
}
- List<HotSearch> list = hotSearchService.getHotSearchCache(goodsType);
+ List<HotSearch> list = hotSearchService.getHotSearchCache(goodsType,acceptData.getSystem());
if (list == null || list.size() == 0) {
out.print(JsonUtil.loadFalseResult("娌℃湁鏁版嵁"));
return;
@@ -228,7 +230,7 @@
JSONObject data = new JSONObject();
data.put("count", list.size());
data.put("hotSearchList", hotSearchList);
- data.put("helpLink", configService.get(ConfigKeyEnum.newerGonglue.getKey()));
+ data.put("helpLink", configService.getValue(ConfigKeyEnum.newerGonglue.getKey(), SystemInfoUtil.getSystem(acceptData)));
out.print(JsonUtil.loadTrueResult(data));
}
@@ -334,10 +336,10 @@
*/
private void searchJDGoods(WXMPAcceptData acceptData, String key, Integer page, String filter, Integer order,
PrintWriter out) {
-
+ SystemEnum system= SystemInfoUtil.getSystemByWXCXCAppId(acceptData.getAppId());
JDSearchResult result = null;
boolean hasCoupon = false;
- String way = configService.get(ConfigKeyEnum.jdApiSearchKey.getKey());
+ String way = configService.getValue(ConfigKeyEnum.jdApiSearchKey.getKey(), system);
if ("1".equals(way)) {
JDFilter filterAPI = new JDFilter();
filterAPI.setKeyword(SearchFilterUtil.filterSearchContent(key));
@@ -478,7 +480,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
for (JDGoods goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
if (hasCoupon) {
@@ -560,7 +562,7 @@
List<PDDGoodsDetail> goodsList = result.getGoodsList();
if (goodsList != null && goodsList.size() > 0) {
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
for (PDDGoodsDetail goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);
--
Gitblit v1.8.0