From 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 11 七月 2019 16:34:13 +0800
Subject: [PATCH] 订单bug，分享爆款自购修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 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 9f7e407..9f474eb 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
@@ -3,6 +3,7 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -173,7 +174,8 @@
picList = new ArrayList<SwiperPicture>();
}
- List<GoodsSubClass> goodsSubClassList = goodsSubClassService.getSubClassCache(gcid, 1);
+ List<GoodsSubClass> goodsSubClassList = goodsSubClassService.getSubClassCache(gcid, 1,
+ Calendar.getInstance().get(Calendar.MONTH) + 1);
if (goodsSubClassList == null) {
goodsSubClassList = new ArrayList<GoodsSubClass>();
}
@@ -444,22 +446,41 @@
searchfilter.setMaterialId("6707");
taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,
totalSales);
- JSONObject result = taoKeGoodsService.searchWuLiao(searchfilter);
- long count = result.optLong("count");
- JSONArray resultArray = result.getJSONArray("result");
+ TaoBaoSearchResult searchResult = TaoKeApiUtil.searchWuLiao(searchfilter);
+ long count = searchResult.getPageEntity().getTotalCount();
+
+ JSONObject result = new JSONObject();
+
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
+
+ List<TaoBaoGoodsBrief> resultGoodsList = searchResult.getTaoBaoGoodsBriefs();
// 鏌ヨ鏄惁瓒呰繃浜嗘渶澶х殑鍟嗗搧鏁�
- if (resultArray == null || resultArray.size() < 20) {
+ 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());
- result = taoKeGoodsService.searchWuLiao(searchfilter);
- if (resultArray != null)
- result.optJSONArray("result").addAll(0, resultArray);
- result.put("count", result.optLong("count") + count);
+ 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 {
@@ -645,6 +666,7 @@
GoodsClass goodsClass = goodsClassService.getGoodsClassCache(gcid);
if (goodsClass == null) {
out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鍒嗙被"));
+ return;
}
if (page < 1)
--
Gitblit v1.8.0