From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsClassControllerV2.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsClassControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsClassControllerV2.java
index a476de9..b412053 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsClassControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsClassControllerV2.java
@@ -1,13 +1,11 @@
package com.yeshi.fanli.controller.client.v2;
import java.io.PrintWriter;
-import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
-import org.hibernate.id.enhanced.AccessCallback;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,7 +21,7 @@
import com.yeshi.fanli.entity.bus.clazz.TaoBaoClass;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.taobao.SearchFilter;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.clazz.GoodsSubClassLabelService;
@@ -33,11 +31,10 @@
import com.yeshi.fanli.service.inter.lable.LabelClassService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
-import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -72,7 +69,7 @@
private TaoBaoClassService taoBaoClassService;
@Resource
- private HongBaoManageService hongBaoManageService;
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
@Resource
private LabelClassService labelClassService;
@@ -102,7 +99,6 @@
* 浜岀骇鍒嗙被銆佹爣绛�
*
* @param acceptData
- * @param gcid
* @param out
*/
@RequestMapping(value = "listSubMap", method = RequestMethod.POST)
@@ -170,7 +166,7 @@
filter.setPageSize(pageSize);
filter.setCateIds(taoBaoCatIds);
- JSONObject result = taoKeGoodsService.searchWuLiaoV2(filter,acceptData.getPlatform(),acceptData.getVersion());
+ JSONObject result = taoKeGoodsService.searchWuLiaoV2(filter,acceptData.getPlatform(),acceptData.getVersion(), acceptData.getSystem());
out.print(JsonUtil.loadTrueResult(result));
return;
}
@@ -178,8 +174,8 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion(),acceptData.getSystem());
// 绮鹃�夊簱鏁版嵁
JSONArray array = new JSONArray();
@@ -266,7 +262,7 @@
searchfilter.setMaterialId("6707");
taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,
totalSales);
- TaoBaoSearchResult searchResult = TaoKeApiUtil.searchWuLiao(searchfilter);
+ TaoBaoSearchResult searchResult = TaoKeApiUtil.searchWuLiao(searchfilter,null,null);
long count = searchResult.getPageEntity().getTotalCount();
List<TaoBaoGoodsBrief> resultGoodsList = searchResult.getTaoBaoGoodsBriefs();
@@ -281,7 +277,7 @@
searchfilter.setPage((int) (count % 20 == 0 ? count / 20 - 1 : count / 20));
searchfilter.setPageSize(20);
searchfilter.setKey(goodsSubClass.getKey());
- TaoBaoSearchResult searchResult2 = TaoKeApiUtil.searchWuLiao(searchfilter);
+ TaoBaoSearchResult searchResult2 = TaoKeApiUtil.searchWuLiao(searchfilter,null,null);
if (searchResult2 != null) {
List<TaoBaoGoodsBrief> resultListTemp = searchResult2.getTaoBaoGoodsBriefs();
if (resultListTemp != null)
@@ -294,8 +290,8 @@
JSONArray array = new JSONArray();
if (resultGoodsList != null) {
- ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion(),acceptData.getSystem());
for (TaoBaoGoodsBrief goods : resultGoodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
array.add(gson2.toJson(goodsDetailVO));
@@ -319,7 +315,7 @@
taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,
totalSales);
- JSONObject result = taoKeGoodsService.searchWuLiaoV2(searchfilter,acceptData.getPlatform(),acceptData.getVersion());
+ JSONObject result = taoKeGoodsService.searchWuLiaoV2(searchfilter,acceptData.getPlatform(),acceptData.getVersion(),acceptData.getSystem());
out.print(JsonUtil.loadTrueResult(result));
return;
}
--
Gitblit v1.8.0