From 534a87e48dfbaff65605995ec2a29211e0a8f45a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 十一月 2019 16:06:51 +0800
Subject: [PATCH] 红包功能改为2.1版本后再放开
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 103 ++++++++++++++++++++++++++++++---------------------
1 files changed, 61 insertions(+), 42 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 84c167f..1caf016 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;
@@ -79,8 +80,7 @@
@Resource
private RedPackWinNewUserService redPackWinNewUserService;
-
-
+
/**
* 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());
@@ -145,7 +145,6 @@
out.print(JsonUtil.loadTrueResult(data));
}
-
/**
* s 棣栭〉閰嶇疆淇℃伅
*
@@ -156,42 +155,62 @@
public void getHomeConfigNew(AcceptData acceptData, Long uid, PrintWriter out) {
if (uid != null && uid == 0L)
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());
- 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));
-
+
// 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
String couponHelp = configService.get("taobao_coupon_help");
data.put("couponHelpUrl", couponHelp);
+
+ // 鍒ゆ柇鏂拌�佺敤鎴� 鏄剧ず鐑棬鍔熻兘鎸夐挳婊戝姩
+ UserActiveLog da = null;
+ if (uid != null)
+ da = userActiveLogService.getFirstActiveInfo(uid);
+ // 鏂颁汉
+ if (da == null || (System.currentTimeMillis() - da.getCreateTime().getTime()) <= 1000 * 60 * 60 * 24 * 15L) {
+ data.put("userTimeType", 0);
+ } else {// 鑰佷汉
+ data.put("userTimeType", 1);
+ }
// 鏄惁鏄剧ず鐑棬鍔熻兘鎸夐挳
String platform = acceptData.getPlatform();
@@ -199,8 +218,7 @@
configService.getByVersion("hot_function_url", platform, Integer.parseInt(acceptData.getVersion())));
out.print(JsonUtil.loadTrueResult(data));
}
-
-
+
/**
* 娑堟伅涓績寮规
*
@@ -303,14 +321,15 @@
data.put("baichuan", false);// 涓嶉渶瑕侀噰鐢ㄩ樋閲岀櫨宸濈殑鏂瑰紡鍔犺浇webview
data.put("goodsDetail", false);// 涓嶉渶瑕佹嫤鎴晢鍝佽鎯�
}
-//TODO 鍓嶇闇�瑕佸鐞�
-// if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
-// JSONObject js = new JSONObject();
-// String jsStr = configService.get("url_extract_id");
-// String md5 = StringUtil.Md5(jsStr);
-// js.put("md5", md5);
-// data.put("js", js);
-// }
+ // TODO 鍓嶇闇�瑕佸鐞�
+ // if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(),
+ // acceptData.getVersion())) {
+ // JSONObject js = new JSONObject();
+ // String jsStr = configService.get("url_extract_id");
+ // String md5 = StringUtil.Md5(jsStr);
+ // js.put("md5", md5);
+ // data.put("js", js);
+ // }
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0