From 4fb3f5e033c38afda6e7db013c53389732591efd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 20 八月 2019 17:19:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
index c463af8..b49717a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
@@ -129,10 +129,16 @@
JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);
// 2銆侀《閮ㄨ疆鎾浘
- List<SwiperPicture> topPicList = swiperPictureService.getByBannerCard("index_top");
- if (topPicList == null) {
- topPicList = new ArrayList<SwiperPicture>();
+ List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("index_top");
+ List<SwiperPicture> topPicList = new ArrayList<>();
+ if (oldtopPicList != null && oldtopPicList.size() > 0)
+ topPicList.addAll(oldtopPicList);
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
+ SwiperPicture notifyReName = swiperPictureService.selectByPrimaryKey(162L);
+ if (notifyReName != null)
+ topPicList.add(0, notifyReName);
}
+
root.put("topPicList", JsonUtil.getApiCommonGson().toJson(topPicList));
// 3銆侀個璇锋湁濂�
@@ -326,7 +332,7 @@
params.put("url", configService.get("spike_goods_link"));
root.put("params", params);
- root.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web",
+ root.put("jumpDetail", jumpDetailV2Service.getByTypeCache("integralExchange",
Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())));
root.put("name", "閲戝竵鍏戞崲");
--
Gitblit v1.8.0