From 50e074067ab1406a52023300239189165d9cdca7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 05 六月 2019 15:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java | 82 ++++++++++++++++++++++++++--------------
1 files changed, 53 insertions(+), 29 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
index 9ad6c4b..cb831d6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
@@ -3,9 +3,9 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
@@ -33,6 +33,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SuperHotSearchService;
@@ -41,6 +42,7 @@
import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
import com.yeshi.fanli.service.inter.user.HistorySearchService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.EhcacheUtil;
@@ -88,6 +90,9 @@
@Resource
private TaoBaoShopService taoBaoShopService;
+
+ @Resource
+ private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
@RequestMapping(value = "gethotsearch", method = RequestMethod.POST)
public void getHotSearch(AcceptData acceptData, PrintWriter out) {
@@ -449,6 +454,7 @@
JSONObject data = null;
if (!recommend) {
+
// 娣樺疂鎺ュ彛璇锋眰
data = searchGoods(kw, page, filter, order, startprice, endprice);
} else {
@@ -602,38 +608,44 @@
sf.setParams(params);
}
+ // 鎼滅储澶ф窐瀹�
+ List<DaTaoKeDetail> daTaoKeList = null;
+ if (page == 1)
+ daTaoKeList = daTaoKeGoodsDetailService.listByDtitle(kw);
+
TaoBaoSearchResult result = TaoBaoUtil.search(sf);
if (result == null) {
return null;
}
// 鎼滅储鏄惁鍦ㄨ惀閿�涓诲晢鍝佸簱
if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) {
-// 鏆傛椂鏀惧純鏇存柊鍒拌惀閿�鍟嗗搧搴�
-// String numIds = "";
-// for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {
-// numIds += goods.getAuctionId() + ",";
-// }
-// if (numIds.endsWith(","))
-// numIds = numIds.substring(0, numIds.length() - 1);
-// try {
-// List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getBatchGoodsInfos(numIds);
-// Map<Long, Integer> map = new HashMap<>();
-// for (TaoBaoGoodsBrief g : goodsList)
-// map.put(g.getAuctionId(), g.getMaterialLibType());
-// for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs())
-// goods.setMaterialLibType(map.get(goods.getAuctionId()));
+ // 鏆傛椂鏀惧純鏇存柊鍒拌惀閿�鍟嗗搧搴�
+ // String numIds = "";
+ // for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {
+ // numIds += goods.getAuctionId() + ",";
+ // }
+ // if (numIds.endsWith(","))
+ // numIds = numIds.substring(0, numIds.length() - 1);
+ // try {
+ // List<TaoBaoGoodsBrief> goodsList =
+ // TaoKeApiUtil.getBatchGoodsInfos(numIds);
+ // Map<Long, Integer> map = new HashMap<>();
+ // for (TaoBaoGoodsBrief g : goodsList)
+ // map.put(g.getAuctionId(), g.getMaterialLibType());
+ // for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs())
+ // goods.setMaterialLibType(map.get(goods.getAuctionId()));
- ThreadUtil.run(new Runnable() {
- @Override
- public void run() {
- // 鏇存柊鍒扮珐瀛�
- for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs())
- taoBaoGoodsCacheUtil.saveCommonTaoBaoGoodsInfo(goods);
- }
- });
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ // 鏇存柊鍒扮珐瀛�
+ for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs())
+ taoBaoGoodsCacheUtil.saveCommonTaoBaoGoodsInfo(goods);
+ }
+ });
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // }
}
@@ -645,14 +657,26 @@
data.put("nav", gson.toJson(navList));
List<TaoBaoGoodsBriefExtra> re = new ArrayList<TaoBaoGoodsBriefExtra>();
List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();
+ if (taoBaoGoodsBriefs == null)
+ taoBaoGoodsBriefs = new ArrayList<>();
+
+ try {
+ if (daTaoKeList != null && daTaoKeList.size() > 0) {
+ Collections.reverse(daTaoKeList);
+ for (DaTaoKeDetail detail : daTaoKeList) {
+ taoBaoGoodsBriefs.add(0,TaoBaoUtil.convert(detail));
+ }
+ }
+ } catch (Exception e) {
+ }
+
int fq = sf.getQuan();
int fh = sf.getHongbao();
boolean ft = sf.isTmall();
- Map<String, String> map = manageService.convertMap();
BigDecimal proportion = manageService.getFanLiRate();
if (fq == 0 && fh == 0 && !ft) {
- if (result != null && result.getTaoBaoGoodsBriefs() != null)
- for (TaoBaoGoodsBrief bf : result.getTaoBaoGoodsBriefs()) {
+ if (result != null && taoBaoGoodsBriefs != null)
+ for (TaoBaoGoodsBrief bf : taoBaoGoodsBriefs) {
int count = bf.getBiz30day();
if (count >= 10000) { // 瀵归攢閲忔暟鎹仛澶勭悊 椤甸潰灞曠ず7.3涓�
double sales = count;
--
Gitblit v1.8.0