From 03afbcf4b9e9b55433e914d861d643b7a23d69f9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 二月 2019 15:37:27 +0800
Subject: [PATCH] 返利奖励图标更改

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 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 ff7fb65..363f51c 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
@@ -54,6 +54,7 @@
 import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.factory.CommonGoodsFactory;
@@ -102,6 +103,9 @@
 
 	@Resource
 	private UserCustomSettingsService userCustomSettingsService;
+
+	@Resource
+	private RedisManager redisManager;
 
 	// 娑堟伅鐨勭被鍨�
 	final static String MSG_TYPE_ORDER = "order";
@@ -163,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;
 		}
 
@@ -351,8 +360,9 @@
 				}
 			}
 
-			if (canAdd && session.getAttribute("recommendgoods") == null) {
-				session.setAttribute("recommendgoods", 1);
+			String key = "recommend-goods-user-" + uid;
+			if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
+				redisManager.cacheCommonString(key, "1", 20);
 				if (hour < 12)
 					addRecommendGoods(uid);
 				else
@@ -406,7 +416,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