From 52ae4f687bd246d6b200ed8605ddcb4631f83b84 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 14:47:35 +0800
Subject: [PATCH] 推荐测试信息修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
index c3f5d5a..4969151 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
@@ -167,8 +167,13 @@
List<MsgInviteDetail> detailList3 = msgInviteDetailService.listMsgInviteDetail(uid, page);
count = msgInviteDetailService.countMsgInviteDetail(uid);
if (detailList3 != null)
- for (MsgInviteDetail detail : detailList3)
- list.add(UserMsgVOFactory.create(detail));
+ for (MsgInviteDetail detail : detailList3) {
+ UserMsgVO vo = UserMsgVOFactory.create(detail);
+ if (vo != null)
+ list.add(vo);
+ else
+ count--;
+ }
break;
}
@@ -356,13 +361,21 @@
}
String key = "recommend-goods-user-" + uid;
- if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
- redisManager.cacheCommonString(key, "1", 20);
+ if (Constant.IS_OUTNET) {
+ if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
+ if (Constant.IS_OUTNET)
+ redisManager.cacheCommonString(key, "1", 20);
+ if (hour < 12)
+ addRecommendGoods(uid);
+ else
+ addRecommendGoods(uid, acceptData.getImei(), acceptData.getIdfa());
+ session.removeAttribute("recommendgoods");
+ }
+ } else {
if (hour < 12)
addRecommendGoods(uid);
else
addRecommendGoods(uid, acceptData.getImei(), acceptData.getIdfa());
- session.removeAttribute("recommendgoods");
}
}
@@ -411,7 +424,7 @@
volist.add(vo);
}
- Long time = userInfoService.getUserById(uid).getCreatetime();
+ Long time = userInfoService.selectByPKey(uid).getCreatetime();
if (time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd"))
count++;// 璁＄畻娆㈣繋璇殑鏁伴噺
--
Gitblit v1.8.0