From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
index 368e08d..2b010dd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -1,6 +1,8 @@
package com.yeshi.fanli.controller.client.v1;
import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
import javax.annotation.Resource;
@@ -12,6 +14,8 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
+import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
+import com.yeshi.fanli.entity.bus.homemodule.FloatAD.FloatADTypeEnum;
import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.entity.config.AppHomeFloatImg;
@@ -19,6 +23,7 @@
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.homemodule.FloatADService;
+import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
@@ -28,6 +33,7 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.VersionUtil;
import net.sf.json.JSONObject;
@@ -67,6 +73,10 @@
@Resource
private UserActiveLogService userActiveLogService;
+
+ @Resource
+ private SwiperPictureService swiperPictureService;
+
/**
* s 棣栭〉閰嶇疆淇℃伅
@@ -97,8 +107,7 @@
// 鏃犳柊浜哄脊妗� 鍒欐煡璇㈤粯璁�
FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);
-
- if (floatAD != null) {
+ if (floatAD != null && floatAD.getTypeEnum() != FloatADTypeEnum.newUserRedPack) {
JSONObject detail = new JSONObject();
detail.put("img", floatAD.getPicture());
detail.put("jumpDetail", floatAD.getJumpDetail());
@@ -242,6 +251,14 @@
JSONObject source = JSONObject.fromObject(configService.getByVersion("taobao_cart_jump_detail",
acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion())));
data.put("taoBaoCart", source);
+
+ if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ // 鎴戠殑鐣岄潰banner
+ List<SwiperPicture> banner = swiperPictureService.getByBannerCard("my_interface_banner");
+ if (banner == null)
+ banner = new ArrayList<SwiperPicture>();
+ data.put("banner", JsonUtil.getApiCommonGson().toJson(banner));
+ }
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
--
Gitblit v1.8.0