From 2dc52e3ba49433a54368c3b64ba3539b4bb051ae Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 五月 2019 16:15:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 737caff..85a8e20 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
@@ -655,7 +655,7 @@
List<PushGoods> list = pushGoodsService.listHistoryByPushTime(0, 1, uid, createTime);
if (list != null && list.size() > 0) {
MsgDeviceReadState state = msgDeviceReadStateService.getByDeviceAndPlatformAndType(
- UserCommonMsgVO.TYPE_ZHUSHOU, acceptData.getDevice(),
+ UserCommonMsgVO.TYPE_RECOMMEND, acceptData.getDevice(),
acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2);
boolean read = false;
if (state != null && state.getReadTime() != null
@@ -876,6 +876,8 @@
@RequestMapping(value = "setAllMsgRead", method = RequestMethod.POST)
public void setAllMsgRead(AcceptData acceptData, Long uid, PrintWriter out) {
+ msgDeviceReadStateService.setAllMsgRead(acceptData.getDevice(),
+ "android".equalsIgnoreCase(acceptData.getPlatform()) ? 1 : 2);
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
@@ -929,7 +931,7 @@
msgDeviceReadStateService.setDeviceMsgRead(UserCommonMsgVO.TYPE_RECOMMEND, acceptData.getDevice(),
(acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2));
} else if (type.equalsIgnoreCase(UserCommonMsgVO.TYPE_ZHUSHOU)) {
- msgDeviceReadStateService.setDeviceMsgRead(UserCommonMsgVO.TYPE_RECOMMEND, acceptData.getDevice(),
+ msgDeviceReadStateService.setDeviceMsgRead(UserCommonMsgVO.TYPE_ZHUSHOU, acceptData.getDevice(),
(acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2));
}
out.print(JsonUtil.loadTrueResult(""));
--
Gitblit v1.8.0