From 0e5c33fc0bc6c3b70ccf649f14ca1ac3fa4431d6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 22 六月 2020 17:57:49 +0800
Subject: [PATCH] 云发单匹配群 bug
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index ba4b9b5..c8fde66 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -24,6 +24,7 @@
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
import com.yeshi.fanli.dto.pdd.PDDSearchFilter;
+import com.yeshi.fanli.dto.suning.SuningCommodityInfo;
import com.yeshi.fanli.dto.suning.SuningGoodsInfo;
import com.yeshi.fanli.dto.suning.SuningQueryModel;
import com.yeshi.fanli.dto.vip.VIPSearchFilter;
@@ -1015,7 +1016,7 @@
SuningQueryModel searchFilter = new SuningQueryModel();
searchFilter.setKeyword(key);
searchFilter.setPageIndex(page);
- searchFilter.setSize(Constant.PAGE_SIZE);
+ searchFilter.setSize(10);
if (order != null) {
if (order == 1) { // 閿�閲忛珮鍒颁綆
@@ -1067,16 +1068,23 @@
}
}
- int count = 0;
JSONObject data = new JSONObject();
JSONArray array = new JSONArray();
- List<SuningGoodsInfo> resultList = SuningApiUtil.searchGoods(searchFilter);
+ List<SuningGoodsInfo> resultList = null;
+ List<SuningGoodsInfo> list = SuningApiUtil.searchGoodsOld(searchFilter);
+ if (list != null && list.size() > 0) {
+ List<String> listId = new ArrayList<>();
+ for (SuningGoodsInfo goodsInfo: list) {
+ SuningCommodityInfo info = goodsInfo.getCommodityInfo();
+ if (info != null) {
+ listId.add(info.getCommodityCode() + "-" + info.getSupplierCode());
+ }
+ }
+ resultList = SuningApiUtil.getGoodsDetailList(listId);
+ }
+
if (resultList != null) {
- if (resultList.size() == 0)
- count = 0;
- else
- count = resultList.size() + 1;
Gson gson = JsonUtil.getApiCommonGson();
if (resultList != null && resultList.size() > 0) {
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
@@ -1090,7 +1098,7 @@
}
data.put("result", array);
- data.put("count", count);
+ data.put("count", 1000);
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0