From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:26:57 +0800
Subject: [PATCH] 冲突信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 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 f7d1de6..bfc0434 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
@@ -17,6 +17,7 @@
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.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.config.AppHomeFloatImg;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
@@ -30,13 +31,16 @@
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.jd.JDUtil;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.homemodule.FloatImgDetailVO;
import net.sf.json.JSONObject;
@@ -80,6 +84,12 @@
@Resource
private UserTaoLiJinNewbiesService userTaoLiJinNewbiesService;
+
+ @Resource
+ private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+
+ @Resource
+ private RedisManager redisManager;
/**
* s 棣栭〉閰嶇疆淇℃伅
@@ -159,22 +169,23 @@
// 娲诲姩寮规
List<FloatAD> listAD = new ArrayList<FloatAD>();
List<FloatImgDetailVO> listVO = new ArrayList<FloatImgDetailVO>();
-
+
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 &&
- (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())
- || !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice()))) {
+ if (typeEnum == FloatADTypeEnum.newUserRedPack
+ && (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())
+ || !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice()))) {
+
listAD.remove(i);
i--;
continue;
}
-
+
JumpDetailV2 jumpDetail = floatAD.getJumpDetail();
if (jumpDetail != null) {
jumpDetail = jumpDetailV2Service.selectByPrimaryKey(jumpDetail.getId());
@@ -480,9 +491,30 @@
*/
@RequestMapping(value = "getElemeLink")
public void getElemeLink(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
+
+ UserExtraTaoBaoInfo userInfoExtra = userExtraTaoBaoInfoService.getByUid(uid);
+ if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getRelationId())) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1001, "璇风粦瀹氭窐瀹�")));
+ return;
+ }
+ String elmeLink = redisManager.getCommonString("elme-link-" + uid);
+ if (StringUtil.isNullOrEmpty(elmeLink)) {
+ elmeLink = TaoKeApiUtil.officialActivityConvert(TaoBaoConstant.TAOBAO_ELEME_PID.split("_")[3],
+ "1571715733668", userInfoExtra.getRelationId());
+ if (!StringUtil.isNullOrEmpty(elmeLink)) {
+ redisManager.cacheCommonString("elme-link-" + uid, elmeLink, 60 * 60);// 缂撳瓨1涓皬鏃�
+ }
+ }
+
JSONObject data = new JSONObject();
- data.put("hongBao", configService.get("eleme_hongbao_link").replace("{鐢ㄦ埛ID}", uid + ""));
- data.put("goods", configService.get("eleme_goods_link").replace("{鐢ㄦ埛ID}", uid + ""));
+
+ // data.put("hongBao",
+ // configService.get("eleme_hongbao_link").replace("{鐢ㄦ埛ID}", uid + ""));
+ // data.put("goods",
+ // configService.get("eleme_goods_link").replace("{鐢ㄦ埛ID}", uid + ""));
+
+ data.put("hongBao", elmeLink);
+ data.put("goods", elmeLink);
ClientTBPid clientTBPid1 = new ClientTBPid(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_ELEME_PID,
null, TaoBaoConstant.TAOBAO_ELEME_PID.split("_")[3]);
--
Gitblit v1.8.0