From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期六, 07 十二月 2019 15:33:00 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 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 b0922a5..2df56e4 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 @@ -24,7 +24,7 @@ import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.homemodule.FloatADService; import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService; -import com.yeshi.fanli.service.inter.redpack.RedPackWinNewUserService; +import com.yeshi.fanli.service.inter.redpack.UserTaoLiJinNewbiesService; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService; import com.yeshi.fanli.service.inter.user.TBPidService; @@ -79,7 +79,7 @@ private UserActiveLogService userActiveLogService; @Resource - private RedPackWinNewUserService redPackWinNewUserService; + private UserTaoLiJinNewbiesService userTaoLiJinNewbiesService; /** * s 棣栭〉閰嶇疆淇℃伅 @@ -110,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()); @@ -167,19 +167,10 @@ for (int i = 0; i < listAD.size(); i++) { FloatAD floatAD = listAD.get(i); FloatADTypeEnum typeEnum = floatAD.getTypeEnum(); - - if (typeEnum == FloatADTypeEnum.newUserRedPack) { - if (!VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) { - listAD.remove(i); - i--; - continue; - } - - if (!redPackWinNewUserService.verifyHasReward(uid)) { - listAD.remove(i); - i--; - continue; - } + if (typeEnum == FloatADTypeEnum.newUserRedPack && !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice())) { + listAD.remove(i); + i--; + continue; } JumpDetailV2 jumpDetail = floatAD.getJumpDetail(); @@ -205,6 +196,7 @@ 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