From b7eec597af221cbf5d79ba13f440ccb4f63f1bc8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 三月 2019 18:38:06 +0800
Subject: [PATCH] bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 b42231e..b346eaf 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
@@ -383,18 +383,21 @@
*/
@RequestMapping(value = "getHomeMsgList", method = RequestMethod.POST)
public void getHomeMsgList(AcceptData acceptData, Long uid, int page, HttpSession session, PrintWriter out) {
-
+
String device = acceptData.getDevice();
if (device == null || device.trim().length() == 0) {
out.print(JsonUtil.loadFalseResult("璁惧鍙蜂笉鑳戒负绌�"));
return;
}
-
+
if (page == 1) {
+ if (uid != null)
+ recommendUserGoodsService.syncDeviceAndUid(uid, acceptData.getDevice());
+
boolean canAdd = false;
int hour = Calendar.getInstance().get(Calendar.HOUR);
RecommendUserGoods goods = recommendUserGoodsService.getLatestRecommendUserGoodsByDevice(device);
-
+
if (goods == null) {
canAdd = true;
} else {
@@ -404,7 +407,7 @@
}
}
- //String key = "recommend-goods-user-" + uid;
+ // String key = "recommend-goods-user-" + uid;
String key = "recommend-goods-user-" + device;
if (Constant.IS_OUTNET) {
if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
@@ -427,8 +430,9 @@
}
List<UserHomeMsgVO> volist = new ArrayList<>();
-
- List<RecommendUserGoods> list = recommendUserGoodsService.listRecommendGoodsByDevice(device, page, Constant.PAGE_SIZE);
+
+ List<RecommendUserGoods> list = recommendUserGoodsService.listRecommendGoodsByDevice(device, page,
+ Constant.PAGE_SIZE);
long count = recommendUserGoodsService.countRecommendGoodsByDevice(device);
Date now = new Date();
@@ -472,7 +476,7 @@
volist.add(vo);
}
- Long time = System.currentTimeMillis();//userInfoService.selectByPKey(uid).getCreatetime();
+ Long time = System.currentTimeMillis();// userInfoService.selectByPKey(uid).getCreatetime();
if (time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd"))
count++;// 璁＄畻娆㈣繋璇殑鏁伴噺
--
Gitblit v1.8.0