From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 65 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
index eb734af..32e30e8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
@@ -14,6 +14,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
+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.common.JumpDetailV2;
@@ -109,7 +110,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());
@@ -156,40 +157,46 @@
uid = null;
// 娲诲姩寮规
- List<FloatAD> listAD = null;
- if (redPackWinNewUserService.verifyHasReward(uid)) {
- listAD = floatADService.getValidByPosition(FloatAD.POSITION_INDEX);
- } else {
- listAD = floatADService.getValidCommonByPosition(FloatAD.POSITION_INDEX);
- }
-
+ List<FloatAD> listAD = new ArrayList<FloatAD>();
List<FloatImgDetailVO> listVO = new ArrayList<FloatImgDetailVO>();
- if (listAD != null && !listAD.isEmpty()) {
- for (FloatAD floatAD : listAD) {
- JumpDetailV2 jumpDetail = floatAD.getJumpDetail();
- if (jumpDetail != null) {
- jumpDetail = jumpDetailV2Service.selectByPrimaryKey(jumpDetail.getId());
- if (jumpDetail != null) {
- jumpDetail.setNeedLogin(floatAD.isJumpNeedLogin());
- }
- }
- FloatImgDetailVO floatImgVO = new FloatImgDetailVO();
- floatImgVO.setId(floatAD.getId().toString());
- floatImgVO.setImg(floatAD.getPicture());
- floatImgVO.setParams(floatAD.getParams());
- floatImgVO.setJumpDetail(jumpDetail);
- floatImgVO.setShowTime(floatAD.getShowMode());
- floatImgVO.setAccountLogin(floatAD.isJumpNeedLogin());
- if (floatAD.getPlaySound() != null)
- floatImgVO.setPlaySound(floatAD.getPlaySound());// 榛樿閮芥挱鏀鹃煶鏁�
- else
- floatImgVO.setPlaySound(false);
- listVO.add(floatImgVO);
+
+ List<FloatAD> list = floatADService.getValidByPosition(FloatAD.POSITION_INDEX);
+ if (list != null && !list.isEmpty())
+ listAD.addAll(list);
+
+ for (int i = 0; i < listAD.size(); i++) {
+ FloatAD floatAD = listAD.get(i);
+ FloatADTypeEnum typeEnum = floatAD.getTypeEnum();
+ if (typeEnum == FloatADTypeEnum.newUserRedPack && !redPackWinNewUserService.verifyHasReward(uid, acceptData.getDevice())) {
+ listAD.remove(i);
+ i--;
+ continue;
}
+
+ JumpDetailV2 jumpDetail = floatAD.getJumpDetail();
+ if (jumpDetail != null) {
+ jumpDetail = jumpDetailV2Service.selectByPrimaryKey(jumpDetail.getId());
+ if (jumpDetail != null) {
+ jumpDetail.setNeedLogin(floatAD.isJumpNeedLogin());
+ }
+ }
+ FloatImgDetailVO floatImgVO = new FloatImgDetailVO();
+ floatImgVO.setId(floatAD.getId().toString());
+ floatImgVO.setImg(floatAD.getPicture());
+ floatImgVO.setParams(floatAD.getParams());
+ floatImgVO.setJumpDetail(jumpDetail);
+ floatImgVO.setShowTime(floatAD.getShowMode());
+ floatImgVO.setAccountLogin(floatAD.isJumpNeedLogin());
+ if (floatAD.getPlaySound() != null)
+ floatImgVO.setPlaySound(floatAD.getPlaySound());// 榛樿閮芥挱鏀鹃煶鏁�
+ else
+ floatImgVO.setPlaySound(false);
+ listVO.add(floatImgVO);
}
JSONObject data = new JSONObject();
data.put("listAD", JsonUtil.getApiCommonGson().toJson(listVO));
+ data.put("protocol", configService.get("user_protocol_home_data"));
// 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
String couponHelp = configService.get("taobao_coupon_help");
--
Gitblit v1.8.0