From 3f76ec837b343e5a8538f2ce50010714d16cdeef Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 07 十一月 2019 12:24:40 +0800
Subject: [PATCH] 红包领取
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 79 ++++++++++++++++++++++-----------------
1 files changed, 45 insertions(+), 34 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 ce48b9e..ad04862 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
@@ -1,6 +1,8 @@
package com.yeshi.fanli.controller.client.v2;
import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
import javax.annotation.Resource;
@@ -14,12 +16,14 @@
import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
+import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.config.AppHomeFloatImg;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
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.msg.MsgDeviceReadStateService;
+import com.yeshi.fanli.service.inter.redpack.RedPackWinNewUserService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.user.TBPidService;
@@ -32,6 +36,7 @@
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.jd.JDUtil;
+import com.yeshi.fanli.vo.homemodule.FloatImgDetailVO;
import net.sf.json.JSONObject;
@@ -72,6 +77,10 @@
@Resource
private UserActiveLogService userActiveLogService;
+ @Resource
+ private RedPackWinNewUserService redPackWinNewUserService;
+
+
/**
* s 棣栭〉閰嶇疆淇℃伅
*
@@ -147,46 +156,45 @@
public void getHomeConfigNew(AcceptData acceptData, Long uid, PrintWriter out) {
if (uid != null && uid == 0L)
uid = null;
-
- AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg();
- if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST) {
- appHomeFloatImg = null;
+
+ // 娲诲姩寮规
+ List<FloatAD> listAD = null;
+ if (redPackWinNewUserService.verifyHasReward(uid)) {
+ listAD = floatADService.getValidByPosition(FloatAD.POSITION_INDEX);
+ } else {
+ listAD = floatADService.getValidCommonByPosition(FloatAD.POSITION_INDEX);
}
-
+
+ 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());
+ listVO.add(floatImgVO);
+ }
+ }
+
JSONObject data = new JSONObject();
- if (appHomeFloatImg != null) {
- data.put("floatImg", appHomeFloatImg);
- }
-
- String notifyImg = configService.getAppHomeFloatNotifyImg();
- if (!StringUtil.isNullOrEmpty(notifyImg)) {
- data.put("floatNotifyImg", notifyImg);
- }
-
- // 鏃犳柊浜哄脊妗� 鍒欐煡璇㈤粯璁�
- FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);
-
- if (floatAD != null) {
- JSONObject detail = new JSONObject();
- detail.put("img", floatAD.getPicture());
- detail.put("jumpDetail", floatAD.getJumpDetail());
- detail.put("params", floatAD.getParams());
- detail.put("showTime", floatAD.getShowMode());
- detail.put("accountLogin", floatAD.isJumpNeedLogin());
- data.put("floatImgDetail", detail);
- }
-
+ data.put("listAD", JsonUtil.getApiCommonGson().toJson(listVO));
+
// 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
String couponHelp = configService.get("taobao_coupon_help");
data.put("couponHelpUrl", couponHelp);
- // 搴曢儴缃戦〉閾炬帴
- String platform = acceptData.getPlatform();
- if ("android".equalsIgnoreCase(platform)) {
- data.put("htmlLink", configService.get("index_html_link_android"));
- }
-
- // 鍒ゆ柇鏂拌�佺敤鎴�
+
+ // 鍒ゆ柇鏂拌�佺敤鎴� 鏄剧ず鐑棬鍔熻兘鎸夐挳婊戝姩
UserActiveLog da = null;
if (uid != null)
da = userActiveLogService.getFirstActiveInfo(uid);
@@ -196,6 +204,9 @@
} else {// 鑰佷汉
data.put("userTimeType", 1);
}
+
+ // 鏄惁鏄剧ず鐑棬鍔熻兘鎸夐挳
+ String platform = acceptData.getPlatform();
data.put("hotFuctionLink",
configService.getByVersion("hot_function_url", platform, Integer.parseInt(acceptData.getVersion())));
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0