From bf5c02aaecb3f7a42daa4fa356c62a2e6bca0db5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 28 十月 2019 09:55:59 +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 | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 e8a3497..5a84757 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,8 @@
String imei = acceptData.getImei();
result = guessLikeDeviceTB(idfa, imei, page);
} else {
- result = commonTemplateContentService.getContentList(type, cid, page, Constant.PAGE_SIZE);
+ // 澶ф窐瀹㈤〉鐮佸彧鑳戒负10,50,100,200
+ result = commonTemplateContentService.getContentList(type, cid, page, 10);
}
JSONObject root = new JSONObject();
@@ -156,7 +157,7 @@
List<SwiperPicture> bannerList = new ArrayList<>();
root.put("bannerList", new Gson().toJson(bannerList));
}
-
+
JSONArray array = new JSONArray();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
List<TaoBaoGoodsBrief> goodsList = result.getGoodsList();
@@ -270,10 +271,10 @@
data.put("count", count);
out.print(JsonUtil.loadTrueResult(data));
}
-
-
+
/**
* 鐚滀綘鍠滄-娣樺疂璁惧鎺ㄨ崘
+ *
* @param acceptData
* @param page
* @return
@@ -281,7 +282,7 @@
@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);
- if (searchResult != null && searchResult.getTaoBaoGoodsBriefs() != null
+ if (searchResult != null && searchResult.getTaoBaoGoodsBriefs() != null
&& searchResult.getTaoBaoGoodsBriefs().size() > 0) {
CommonContentResult result = new CommonContentResult();
result.setCount(searchResult.getPageEntity().getTotalCount());
--
Gitblit v1.8.0