From 4b80d2dab78d0cef3d149a0a11240b5e39b581a3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 04 三月 2019 17:26:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 58 +++++++++-------------------------------------------------
1 files changed, 9 insertions(+), 49 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index 6158a8a..a43d7f3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -1636,14 +1636,8 @@
listswiper = swiperPictureService.getByBannerCard(swiperCard);
- if (listswiper != null && listswiper.size() > 0) {
- for (SwiperPicture swiperPicture : listswiper) {
- swiperPicture.setBannerId(null);
- swiperPicture.setCreatetime(null);
- swiperPicture.setUpdatetime(null);
- swiperPicture.setState(null);
- swiperPicture.setRemark(null);
- }
+ if (listswiper == null) {
+ listswiper = new ArrayList<SwiperPicture>();
}
} catch (Exception e) {
@@ -1661,12 +1655,6 @@
if (listSpecial != null && listSpecial.size() > 0) {
for (Special special : listSpecial) {
- special.setCreatetime(null);
- special.setUpdatetime(null);
- special.setState(null);
- special.setRemark(null);
- special.setCard(null);
- special.setCardId(null);
if ("闄愭椂绉掓潃".equals(special.getName())) {
miaoShaSpecial = special;
@@ -1680,6 +1668,7 @@
// 鍏朵粬涓撻
specialList.add(special);
}
+
}
}
@@ -1713,10 +1702,12 @@
}
JSONObject root = new JSONObject();
- root.put("banner", listswiper);
- root.put("honest", honestList);
- root.put("special", specialList);
+
+ root.put("banner", JsonUtil.getApiCommonGson().toJson(listswiper));
+ root.put("honest", JsonUtil.getApiCommonGson().toJson(honestList));
+ root.put("special", JsonUtil.getApiCommonGson().toJson(specialList));
root.put("miaoSha", msJSON);
+
// 澧炲姞閭�璇锋湁濂�
JSONObject invite = new JSONObject();
@@ -2258,43 +2249,12 @@
List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
system.getId());
- if (listSpecial != null && listSpecial.size() > 0) {
- for (Special special : listSpecial) {
- special.setCreatetime(null);
- special.setUpdatetime(null);
- special.setState(null);
- special.setRemark(null);
- special.setCard(null);
- special.setCardId(null);
-
- JumpDetailV2 jumpDetail = special.getJumpDetail();
- if (jumpDetail != null) {
- jumpDetail.setId(null);
- jumpDetail.setName(null);
- }
-
- /* 閭�璇疯烦杞彇娑堣烦杞縺娲绘垚鍔熼〉闈�
- * // 閭�璇风櫥闄嗛獙璇� if(jumpDetail.getType().equals("invite_web") &&
- * jumpDetail.getNeedLogin() && uid != null) {
- *
- * UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid); if
- * (userInfoExtra != null && userInfoExtra.getInviteCode() != null &&
- * userInfoExtra.getInviteCode().trim().length() > 0) {
- *
- * JSONObject params = new JSONObject(); params.put("url",
- * configService.get("invite_activation_success_url"));
- * special.setParams(params.toString()); } }
- */
-
- }
- }
-
if (listSpecial == null) {
listSpecial = new ArrayList<Special>();
}
JSONObject root = new JSONObject();
- root.put("special", listSpecial);
+ root.put("special", JsonUtil.getApiCommonGson().toJson(listSpecial));
out.print(JsonUtil.loadTrueResult(root));
} catch (Exception e) {
--
Gitblit v1.8.0