From cdcbed9af813b2a02cdc01eefa24db8bec6b51a9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 三月 2019 12:17:33 +0800
Subject: [PATCH] 主分类 + 子分类 DAO改造
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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..e5a316c 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,20 +476,19 @@
volist.add(vo);
}
- Long time = System.currentTimeMillis();//userInfoService.selectByPKey(uid).getCreatetime();
- if (time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd"))
- count++;// 璁＄畻娆㈣繋璇殑鏁伴噺
+ Long time = (uid == null ? System.currentTimeMillis() : userInfoService.selectByPKey(uid).getCreatetime());
if (volist.size() > 0 && volist.size() < Constant.PAGE_SIZE) {
// 娣诲姞娆㈣繋璇�
// 鍒涘缓鏃堕棿鍦�28鍙峰悗鐨勬墠鏈夋柊浜烘杩�
- if (time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd")) {
+ if ((time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd") || uid == null)) {
UserHomeMsgVO vo = new UserHomeMsgVO();
vo.setContent("鎭枩浣狅紝鎴愪负杩斿埄鍒哥殑鐢ㄦ埛\n鐙浼樻儬鍒稿府浣犵渷閽憋紱\n鍙備笌濂栭噾娲诲姩甯綘璧氶挶锛沑n璁╄繑鍒╁埜鎴愪负浣犵殑鐪侀挶鍔╂墜鍚э紒");
vo.setTitle("鏂颁汉娆㈣繋");
vo.setCreateTime(getTimeDesc(now, new Date(time)));
vo.setType(UserHomeMsgVO.TYPE_WELCOME);
volist.add(vo);
+ count++;
}
}
--
Gitblit v1.8.0