From cf9f918e7af7481432cfc93eaac38bcb3d4cbfd8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 11 九月 2019 15:23:10 +0800
Subject: [PATCH] 再返金额修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java
index da9a5ab..b8c7545 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java
@@ -492,6 +492,9 @@
 	public void getHomeMsgList(AcceptData acceptData, Long uid, int page, HttpSession session, PrintWriter out) {
 		if (uid != null && uid == 0)
 			uid = null;
+		if (uid != null)
+			userSystemMsgService.syncSystemZNX(uid);
+
 		String device = acceptData.getDevice();
 		if (device == null || device.trim().length() == 0) {
 			out.print(JsonUtil.loadFalseResult("璁惧鍙蜂笉鑳戒负绌�"));
@@ -659,6 +662,9 @@
 	public void getHomeMsgListNew(AcceptData acceptData, Long uid, PrintWriter out) {
 		if (uid != null && uid == 0)
 			uid = null;
+		if (uid != null) {
+			userSystemMsgService.syncSystemZNX(uid);
+		}
 
 		List<UserMsgCenter> listCenter = new ArrayList<>();
 
@@ -738,7 +744,9 @@
 		// list = pushGoodsService.listHistoryByPushTime(0, 1, uid, createTime);
 
 		// 1銆佹椿鍔ㄥ尯鍩�
-		List<Special> listSpecial = specialService.listByPlaceKey("msg_activities");
+		int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
+		
+		List<Special> listSpecial = specialService.listByPlaceKey("msg_activities", platformCode, Integer.parseInt(acceptData.getVersion()));
 		if (listSpecial != null && listSpecial.size() > 0) {
 			for (Special special : listSpecial) {
 

--
Gitblit v1.8.0