From 8d84ca36593e33de7e0b604824c471db3587fdb4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 17 一月 2020 16:53:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
index fcb29db..8bc6b7a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
@@ -147,7 +147,7 @@
// 鐚滀綘鍠滄
String idfa = acceptData.getIdfa();
String imei = acceptData.getImei();
- result = guessLikeDeviceTB(idfa, imei, page);
+ result = guessLikeDeviceTB(idfa, imei, acceptData.getUtdid(), page);
} else {
// 澶ф窐瀹㈤〉鐮佸彧鑳戒负10,50,100,200
result = commonTemplateContentService.getContentList(type, cid, page, 10);
@@ -162,7 +162,9 @@
JSONArray array = new JSONArray();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
- List<TaoBaoGoodsBrief> goodsList = result.getGoodsList();
+ List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+ if (result != null)
+ goodsList = result.getGoodsList();
ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion());
@@ -178,7 +180,7 @@
}
root.put("list", array);
- root.put("count", result.getCount());
+ root.put("count", result != null ? result.getCount() : 0);
out.print(JsonUtil.loadTrueResult(root));
}
@@ -215,7 +217,7 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion());
-
+
for (JDGoods goods : goodsList) {
array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO)));
}
@@ -242,7 +244,8 @@
// 2銆侀《閮ㄨ疆鎾浘
List<SwiperPicture> bannerList = null;
if (Constant.IS_TEST) {
- bannerList = swiperPictureService.getByBannerCardAndVersion("index_top",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
+ bannerList = swiperPictureService.getByBannerCardAndVersion("index_top", acceptData.getPlatform(),
+ Integer.parseInt(acceptData.getVersion()));
}
if (bannerList == null) {
@@ -263,9 +266,9 @@
if (goodsList != null && goodsList.size() > 0) {
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion());
-
+
for (PDDGoodsDetail goods : goodsList) {
array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO)));
}
@@ -285,8 +288,8 @@
* @return
*/
@Cacheable(value = "commonContentCache", key = "#idfa+'-'+#imei+'-'+#page")
- private CommonContentResult guessLikeDeviceTB(String idfa, String imei, Integer page) {
- TaoBaoSearchResult searchResult = TaoKeApiUtil.guessDeviceLike(page, Constant.PAGE_SIZE, imei, idfa);
+ private CommonContentResult guessLikeDeviceTB(String idfa, String imei, String utdid, Integer page) {
+ TaoBaoSearchResult searchResult = TaoKeApiUtil.guessDeviceLike(page, Constant.PAGE_SIZE, imei, idfa, utdid);
if (searchResult != null && searchResult.getTaoBaoGoodsBriefs() != null
&& searchResult.getTaoBaoGoodsBriefs().size() > 0) {
CommonContentResult result = new CommonContentResult();
--
Gitblit v1.8.0