From 1340beb67a9b6d777821d0139bcc7c9b0896ed4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 九月 2020 10:59:26 +0800
Subject: [PATCH] 拼多多比价修改
---
fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java
index d402333..320cdcd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java
@@ -3,10 +3,7 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
import javax.annotation.Resource;
@@ -20,13 +17,9 @@
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
-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.fanli.entity.taobao.TaoBaoSearchNav;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.service.inter.config.CustomerContentService;
import com.yeshi.fanli.service.inter.config.SuperHotSearchService;
@@ -132,7 +125,7 @@
StringUtil.isNullOrEmpty(endprice) ? null : Double.parseDouble(endprice),
StringUtil.isNullOrEmpty(rate) ? null : Double.parseDouble(rate), null, 1);
- BigDecimal proportion = manageService.getFanLiRate();
+ BigDecimal proportion = manageService.getFanLiRate(acceptData.getSystem());
/* 閬嶅巻鍒楄〃鏁版嵁 */
if (listQuery != null && listQuery.size() > 0) {
for (QualityFactory selectionGoods : listQuery) {
@@ -167,13 +160,13 @@
StringUtil.isNullOrEmpty(rate) ? null : Double.parseDouble(rate), null);
} else {
- TaoBaoSearchResult result = TaoBaoUtil.search(sf);
+ TaoBaoSearchResult result = TaoBaoUtil.search(sf,null,null);
if (result != null) {
List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();
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) {
if (taoBaoGoodsBriefs != null)
for (TaoBaoGoodsBrief bf : taoBaoGoodsBriefs) {
--
Gitblit v1.8.0