From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java
index 24d9520..f0c435c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java
@@ -19,10 +19,9 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.search.HotSearch;
import com.yeshi.fanli.entity.bus.su.search.SuperHotSearch;
-import com.yeshi.fanli.entity.system.CustomerContent;
import com.yeshi.fanli.entity.taobao.SearchFilter;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.service.inter.config.CustomerContentService;
@@ -89,11 +88,11 @@
filter = fastFilter;
}
}
- JSONObject data = search(kw, page, filter, order, startprice, endprice);
+ JSONObject data = search(acceptData, kw, page, filter, order, startprice, endprice);
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
}
- private JSONObject search(String kw, int page, String filter, String order, String startprice, String endprice) {
+ private JSONObject search(AcceptData acceptData, String kw, int page, String filter, String order, String startprice, String endprice) {
SearchFilter sf = new SearchFilter();
sf.setKey(kw);
@@ -197,7 +196,7 @@
}
sf.setParams(params);
}
- TaoBaoSearchResult result = TaoBaoUtil.search(sf);
+ TaoBaoSearchResult result = TaoBaoUtil.search(sf,null,null);
List<TaoBaoSearchNav> navList = TaoBaoUtil.getBaseNav();
if (result.getNavList() != null)
navList.addAll(result.getNavList());
@@ -209,7 +208,7 @@
int fq = sf.getQuan();
int fh = sf.getHongbao();
boolean ft = sf.isTmall();
- BigDecimal proportion = manageService.getFanLiRate();
+ BigDecimal proportion = manageService.getFanLiRate(acceptData.getSystem());
if (fq == 0 && fh == 0 && !ft) {
for (TaoBaoGoodsBrief bf : result.getTaoBaoGoodsBriefs()) {
re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));
--
Gitblit v1.8.0