From d92226ce9f81c44fd0e159662d928767ce423b83 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 四月 2019 08:57:02 +0800
Subject: [PATCH] 淘宝用于自购的渠道ID存储

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java |  196 +++++++++++++++++++++++++-----------------------
 1 files changed, 102 insertions(+), 94 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 87e31fa..31d7d0b 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
@@ -40,9 +40,9 @@
 import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
 import com.yeshi.fanli.entity.bus.msg.UserMsgUnReadNum;
 import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;
+import com.yeshi.fanli.entity.common.JumpDetailV2;
 import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.entity.goods.RecommendUserGoods;
-import com.yeshi.fanli.entity.system.BusinessSystem;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
 import com.yeshi.fanli.exception.goods.CommonGoodsException;
@@ -122,10 +122,9 @@
 
 	@Resource
 	private RedisManager redisManager;
-	
+
 	@Resource
 	private SpecialService specialService;
-	
 
 	// 娑堟伅鐨勭被鍨�
 	final static String MSG_TYPE_ORDER = "order";
@@ -398,7 +397,8 @@
 	 */
 	@RequestMapping(value = "getHomeMsgList", method = RequestMethod.POST)
 	public void getHomeMsgList(AcceptData acceptData, Long uid, int page, HttpSession session, PrintWriter out) {
-
+		if (uid != null && uid == 0)
+			uid = null;
 		String device = acceptData.getDevice();
 		if (device == null || device.trim().length() == 0) {
 			out.print(JsonUtil.loadFalseResult("璁惧鍙蜂笉鑳戒负绌�"));
@@ -522,8 +522,7 @@
 		root.put("count", count);
 		out.print(JsonUtil.loadTrueResult(root));
 	}
-	
-	
+
 	/**
 	 * 鑾峰彇娑堟伅鍒楄〃
 	 * 
@@ -535,121 +534,131 @@
 	 */
 	@RequestMapping(value = "getHomeMsgListNew", method = RequestMethod.POST)
 	public void getHomeMsgListNew(AcceptData acceptData, Long uid, PrintWriter out) {
+		if (uid != null && uid == 0)
+			uid = null;
 
-		if (uid == null) {
-			out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
-			return;
-		}
-		
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
-				acceptData.getPackages());
-		if (system == null) {
-			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
-			return;
-		}
-		
-		int page = 1;
-		List<UserMsgVO> list = new ArrayList<>();
-		List<MsgOrderDetail> detailList = msgOrderDetailService.listMsgOrderDetail(uid, page);
-		if (detailList != null && detailList.size() > 0) {
-			for (MsgOrderDetail detail : detailList) {
-				list.add(UserMsgVOFactory.create(detail));
-			}
-		}
-
-		List<MsgMoneyDetail> detailList1 = msgMoneyDetailService.listMsgMoneyDetail(uid, page);
-		if (detailList1 != null && detailList1.size() > 0) {
-			for (MsgMoneyDetail detail : detailList1) {
-				list.add(UserMsgVOFactory.create(detail));
-			}
-		}
-
-		List<MsgAccountDetail> detailList2 = msgAccountDetailService.listMsgAccountDetail(uid, page);
-		if (detailList2 != null && detailList2.size() > 0) {
-			for (MsgAccountDetail detail : detailList2) {
-				list.add(UserMsgVOFactory.create(detail));
-			}
-		}
-
-		List<MsgInviteDetail> detailList3 = msgInviteDetailService.listMsgInviteDetail(uid, page);
-		if (detailList3 != null && detailList3.size() > 0) {
-			for (MsgInviteDetail detail : detailList3) {
-				UserMsgVO vo = UserMsgVOFactory.create(detail);
-				if (vo != null) {
-					list.add(vo);
-				}
-			}
-		}
-
-		List<MsgOtherDetail> detailList4 = msgOtherDetailService.listMsgOtherDetail(uid, page);
-		if (detailList4 != null && detailList4.size() > 0) {
-			for (MsgOtherDetail detail : detailList4) {
-				UserMsgVO vo = UserMsgVOFactory.create(detail);
-				if (vo != null) {
-					list.add(vo);
-				}
-			}
-		}
-		
 		List<UserMsgCenter> listCenter = new ArrayList<>();
-		
-		List<Special> listSpecial = specialService.listBySystemAndCard("", system.getId());
+
+		// 1銆佹椿鍔ㄥ尯鍩�
+		List<Special> listSpecial = specialService.listByPlaceKey("msg_activities");
 		if (listSpecial != null && listSpecial.size() > 0) {
-			for (Special special: listSpecial) {
+			for (Special special : listSpecial) {
+
+				boolean needLogin = special.isJumpLogin();
+				JumpDetailV2 jumpDetail = special.getJumpDetail();
+				if (jumpDetail != null) {
+					jumpDetail.setNeedLogin(needLogin);
+					special.setJumpDetail(jumpDetail);
+				}
+
 				UserMsgCenter msgCenter = new UserMsgCenter();
 				msgCenter.setSpecial(special);
 				listCenter.add(msgCenter);
 			}
 		}
-		
-		if (list.size() > 0 ) {
-			// 鏃堕棿鎺掑簭
-			listSort(list);
-			
-			if (list.size() <= 20 ) {
-				
-			} else {
-				list = list.subList(0, 19);
+
+		// 2銆佹秷鎭尯鍩�
+		if (uid != null && uid > 0) {
+			int page = 1;
+			List<UserMsgVO> list = new ArrayList<>();
+			List<MsgOrderDetail> detailList = msgOrderDetailService.listMsgOrderDetail(uid, page);
+			if (detailList != null && detailList.size() > 0) {
+				for (MsgOrderDetail detail : detailList) {
+					UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+					userMsgVO.setType(MSG_TYPE_ORDER);
+					list.add(userMsgVO);
+				}
 			}
-			
-			for (UserMsgVO userMsgVO: list) {
-				UserMsgCenter userMsgCenter = new UserMsgCenter();
-				userMsgCenter.setUserMsg(userMsgVO);
-				listCenter.add(userMsgCenter);
+
+			List<MsgMoneyDetail> detailList1 = msgMoneyDetailService.listMsgMoneyDetail(uid, page);
+			if (detailList1 != null && detailList1.size() > 0) {
+				for (MsgMoneyDetail detail : detailList1) {
+					UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+					userMsgVO.setType(MSG_TYPE_MONEY);
+					list.add(userMsgVO);
+				}
+			}
+
+			List<MsgAccountDetail> detailList2 = msgAccountDetailService.listMsgAccountDetail(uid, page);
+			if (detailList2 != null && detailList2.size() > 0) {
+				for (MsgAccountDetail detail : detailList2) {
+					UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+					userMsgVO.setType(MSG_TYPE_ACCOUNT);
+					list.add(userMsgVO);
+				}
+			}
+
+			List<MsgInviteDetail> detailList3 = msgInviteDetailService.listMsgInviteDetail(uid, page);
+			if (detailList3 != null && detailList3.size() > 0) {
+				for (MsgInviteDetail detail : detailList3) {
+					UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+					if (userMsgVO != null) {
+						userMsgVO.setType(MSG_TYPE_INVITE);
+						list.add(userMsgVO);
+					}
+				}
+			}
+
+			List<MsgOtherDetail> detailList4 = msgOtherDetailService.listMsgOtherDetail(uid, page);
+			if (detailList4 != null && detailList4.size() > 0) {
+				for (MsgOtherDetail detail : detailList4) {
+					UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+					if (userMsgVO != null) {
+						userMsgVO.setType(MSG_TYPE_OTHER);
+						list.add(userMsgVO);
+					}
+				}
+			}
+
+			if (list.size() > 0) {
+				// 鏃堕棿鎺掑簭
+				listSort(list);
+
+				if (list.size() >= 20) {
+					list = list.subList(0, 19);
+				}
+
+				for (UserMsgVO userMsgVO : list) {
+					UserMsgCenter userMsgCenter = new UserMsgCenter();
+					userMsgCenter.setUserMsg(userMsgVO);
+					listCenter.add(userMsgCenter);
+				}
 			}
 		}
-		
-		
-		// 娣诲姞娆㈣繋璇�
+
+		// 3銆佹坊鍔犳杩庤
 		Long time = (uid == null ? System.currentTimeMillis() : userInfoService.selectByPKey(uid).getCreatetime());
 		// 鍒涘缓鏃堕棿鍦�28鍙峰悗鐨勬墠鏈夋柊浜烘杩�
 		if ((time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd") || uid == null)) {
 			Map<String, Object> map = new HashMap<String, Object>();
 			map.put("title", "鏂颁汉娆㈣繋");
 			map.put("content", "鎭枩浣狅紝鎴愪负杩斿埄鍒哥殑鐢ㄦ埛\n鐙浼樻儬鍒稿府浣犵渷閽憋紱\n鍙備笌濂栭噾娲诲姩甯綘璧氶挶锛沑n璁╄繑鍒╁埜鎴愪负浣犵殑鐪侀挶鍔╂墜鍚э紒");
-			map.put("createTime",new Date(time));
+			map.put("createTime", new Date(time));
 			UserMsgCenter msgCenternre = new UserMsgCenter();
 			msgCenternre.setWelcomeMsg(map);
 			listCenter.add(msgCenternre);
 		}
-		
+
 		GsonBuilder builder = new GsonBuilder();
 		builder = getTimeDescJsonBuilder(builder);
-		
 		JSONObject root = new JSONObject();
-		
-		UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
-		UserSystemMsg usm = userSystemMsgService.getLatestUserSystemMsg(uid);
-		if (usm != null) {
-			root.put("systemMsg", new UserSystemMsgVO(usm.getId(), usm.getType().name(), usm.getSolved(), "绯荤粺娑堟伅", usm.getTitle(),
-				usm.getTimeTag() == 1 ? "http://img.flqapp.com/resource/msg/icon_emergent.png" : "", "http://img.flqapp.com/resource/msg/icon_msg_system.png",getTimeDesc(new Date(), usm.getCreateTime()), num.getTypeSystem()));
+
+		if (uid != null && uid > 0) {
+			UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
+			UserSystemMsg usm = userSystemMsgService.getLatestUserSystemMsg(uid);
+			if (usm != null) {
+				root.put("systemMsg",
+						new UserSystemMsgVO(usm.getId(), usm.getType().name(), usm.getSolved(), "绯荤粺娑堟伅", usm.getTitle(),
+								usm.getTimeTag() == 1 ? "http://img.flqapp.com/resource/msg/icon_emergent.png" : "",
+								"http://img.flqapp.com/resource/msg/icon_msg_system.png",
+								getTimeDesc(new Date(), usm.getCreateTime()), num.getTypeSystem()));
+			}
 		}
-		
+
 		root.put("list", builder.create().toJson(listCenter));
 		root.put("count", listCenter.size());
 		out.print(JsonUtil.loadTrueResult(root));
 	}
-
 
 	public static void listSort(List<UserMsgVO> list) {
 		Collections.sort(list, new Comparator<UserMsgVO>() {
@@ -665,8 +674,7 @@
 			}
 		});
 	}
-	
-	
+
 	/**
 	 * 鑾峰彇绯荤粺娑堟伅鍒楄〃
 	 * 

--
Gitblit v1.8.0