From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 79 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
index c3c4910..a407466 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
@@ -22,6 +22,7 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
import com.yeshi.fanli.entity.bus.clazz.GoodsSecondClass;
import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;
+import com.yeshi.fanli.entity.bus.clazz.TaoBaoClass;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.system.BusinessSystem;
@@ -420,6 +421,84 @@
goodsSubClassService.countClick(acceptData, goodsSubClass);
}
+ SearchFilter sf = new SearchFilter();
+ String catesId = "";
+ // 鏌ヨ鏄惁鏈夋窐瀹濆垎绫籌D
+ List<TaoBaoClass> tbClassList = taoBaoClassService.listBySystemSubCid(0, 10, goodsSubClass.getId());
+ if (tbClassList != null && tbClassList.size() > 0)
+ for (TaoBaoClass tbc : tbClassList) {
+ catesId += tbc.getCategoryId() + ",";
+ }
+ if (catesId.endsWith(","))
+ catesId = catesId.substring(0, catesId.length() - 1);
+ sf.setCateIds(catesId);
+ if (!StringUtil.isNullOrEmpty(catesId))// 鎸夊垎绫诲悕绉版悳绱�
+ {
+ String searchParam = goodsSubClass.getSearchJson();
+ Gson gs = new Gson();
+ SearchFilter searchfilter = gs.fromJson(searchParam, SearchFilter.class);
+ searchfilter.setCateIds(catesId);
+ searchfilter.setPage(page);
+ searchfilter.setPageSize(20);
+ if (Integer.parseInt(order) == 0)
+ searchfilter.setMaterialId("6707");
+ taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,
+ totalSales);
+ TaoBaoSearchResult searchResult = TaoKeApiUtil.searchWuLiao(searchfilter);
+ long count = searchResult.getPageEntity().getTotalCount();
+
+ JSONObject result = new JSONObject();
+
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
+
+ List<TaoBaoGoodsBrief> resultGoodsList = searchResult.getTaoBaoGoodsBriefs();
+ // 鏌ヨ鏄惁瓒呰繃浜嗘渶澶х殑鍟嗗搧鏁�
+ if ((resultGoodsList == null || resultGoodsList.size() < 20)
+ && !StringUtil.isNullOrEmpty(goodsSubClass.getKey())) {
+ if (resultGoodsList == null)
+ resultGoodsList = new ArrayList<>();
+
+ // 闇�瑕佹牴鎹叧閿瓧鏌ヨ
+ searchfilter.setCateIds(null);
+ searchfilter.setPage((int) (count % 20 == 0 ? count / 20 - 1 : count / 20));
+ searchfilter.setPageSize(20);
+ searchfilter.setKey(goodsSubClass.getKey());
+ TaoBaoSearchResult searchResult2 = TaoKeApiUtil.searchWuLiao(searchfilter);
+ if (searchResult2 != null) {
+ List<TaoBaoGoodsBrief> resultListTemp = searchResult2.getTaoBaoGoodsBriefs();
+ if (resultListTemp != null)
+ resultGoodsList.addAll(resultListTemp);
+ }
+ }
+ JSONArray array = new JSONArray();
+ Gson gson2 = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().create();
+ if (resultGoodsList != null)
+ for (TaoBaoGoodsBrief goods : resultGoodsList) {
+ array.add(gson2.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, rate + "", null)));
+ }
+ result.put("result", array);
+ result.put("count", result.optLong("count") + count);
+ out.print(JsonUtil.loadTrueResult(result));
+ return;
+ } else {
+ String searchParam = goodsSubClass.getSearchJson();
+ Gson gs = new Gson();
+ SearchFilter searchfilter = gs.fromJson(searchParam, SearchFilter.class);
+ searchfilter.setCateIds(catesId);
+ searchfilter.setPage(page);
+ searchfilter.setPageSize(20);
+ if (Integer.parseInt(order) == 0)
+ searchfilter.setMaterialId("6707");
+ searchfilter.setKey(goodsSubClass.getKey());
+ taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,
+ totalSales);
+ JSONObject result = taoKeGoodsService.searchWuLiao(searchfilter);
+ if (1 > 0) {
+ out.print(JsonUtil.loadTrueResult(result));
+ return;
+ }
+ }
/* 鎼滅储鍏抽敭璇� */
String searchKey = goodsSubClass.getName();
String key = goodsSubClass.getKey();
--
Gitblit v1.8.0