From e1401a569dc2be36ae54c2df561292f356be21e1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 六月 2019 10:05:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index 75b4a00..f3f359c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -2479,17 +2479,20 @@
}
try {
+
+ List<Special> list = new ArrayList<Special>();
// 涓撻娲诲姩
String specialCard = "special_activities";
List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
system.getId());
- if (listSpecial == null) {
- listSpecial = new ArrayList<Special>();
+ if (listSpecial != null) {
+ list.addAll(listSpecial);
}
- for (Special special: listSpecial) {
+ for (int i = 0; i < list.size(); i++) {
+ Special special = list.get(i);
JumpDetailV2 jumpDetail = special.getJumpDetail();
if (jumpDetail != null) {
@@ -2503,20 +2506,21 @@
continue;
}
- if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
- continue;
- }
-
// 鏄惁闇�瑕佸脊鍑烘
if (name.equals("璐︽埛绛夌骇鐗规潈")) {
- if (uid != null) {
- special.setElastic(userTaoLiJinOriginService.hasRankHongBao(uid));
+ if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
+ list.remove(i);
+ i--;
+ } else {
+ if (uid != null) {
+ special.setElastic(userTaoLiJinOriginService.hasRankHongBao(uid));
+ }
}
}
}
JSONObject root = new JSONObject();
- root.put("special", JsonUtil.getApiCommonGson().toJson(listSpecial));
+ root.put("special", JsonUtil.getApiCommonGson().toJson(list));
out.print(JsonUtil.loadTrueResult(root));
} catch (Exception e) {
--
Gitblit v1.8.0