From 6b8ab82d1d7fb9d44d85eeb1dfd2e36d3c28c9cf Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 10 六月 2019 11:30:21 +0800
Subject: [PATCH] 客服消息修改，新版大淘客数据添加
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 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 4b37c91..5f45a5a 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
@@ -4,10 +4,8 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
@@ -17,10 +15,12 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.taobao.TaoBaoAuthUtil;
import org.yeshi.utils.taobao.TbImgUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.bus.recommend.Honest;
@@ -36,6 +36,7 @@
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.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SuperHotSearchService;
@@ -50,6 +51,7 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
+import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
import com.yeshi.fanli.util.taobao.SearchFilterUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -456,7 +458,9 @@
data = searchGoods(kw, page, filter, order, startprice, endprice);
} else {
// 鎺ㄨ崘锛氱簿閫夊簱
- data = searchQualityGoods(kw, page, filter, order, startprice, endprice);
+ // data = searchQualityGoods(kw, page, filter, order, startprice,
+ // endprice);
+ data = searchDaTaoKeGoods(kw, page, filter, order, startprice, endprice);
}
// 鑾峰彇鎺ㄨ崘璇�
@@ -661,7 +665,7 @@
if (daTaoKeList != null && daTaoKeList.size() > 0) {
Collections.reverse(daTaoKeList);
for (DaTaoKeDetail detail : daTaoKeList) {
- taoBaoGoodsBriefs.add(0,TaoBaoUtil.convert(detail));
+ taoBaoGoodsBriefs.add(0, TaoBaoUtil.convert(detail));
}
}
} catch (Exception e) {
@@ -930,6 +934,43 @@
return data;
}
+ private JSONObject searchDaTaoKeGoods(String key, int page, String filter, String order, String startprice,
+ String endprice) {
+ page=page+1;
+ int sort = DaTaoKeApiUtil.SORT_DEFAULT;
+ if ("5".equalsIgnoreCase(order)) {
+ sort = DaTaoKeApiUtil.SORT_COMMISSION;
+ } else if ("1".equalsIgnoreCase(order)) {
+ sort = DaTaoKeApiUtil.SORT_SALES;
+ } else if ("2".equalsIgnoreCase(order)) {
+ sort = DaTaoKeApiUtil.SORT_PRICE_HIGH_TO_LOW;
+ } else if ("3".equalsIgnoreCase(order)) {
+ sort = DaTaoKeApiUtil.SORT_PRICE_LOW_TO_HIGH;
+ }
+
+ List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
+ BigDecimal proportion = manageService.getFanLiRate();
+
+ DaTaoKeGoodsResult result = DaTaoKeApiUtil.search(key, null, page, 20, sort);
+ if (result != null && result.getGoodsList() != null)
+ for (DaTaoKeDetailV2 goods : result.getGoodsList()) {
+ listExtra.add(
+ TaoBaoUtil.getTaoBaoGoodsBriefExtra(TaoBaoUtil.convert(goods), proportion.toString(), null));
+ }
+
+ List<TaoBaoSearchNav> navList = new ArrayList<>();
+ Gson gson = new GsonBuilder().create();
+ Gson gson2 = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().create();
+
+ JSONObject data = new JSONObject();
+ data.put("nav", gson.toJson(navList));
+ data.put("result", gson2.toJson(listExtra));
+ data.put("count", result.getTotalCount());
+
+ return data;
+ }
+
/**
* 璁剧疆鏌ヨ浣ｉ噾姣斾緥鑼冨洿
*
--
Gitblit v1.8.0