From efa2645b74ebfadc43ebe448370adb22aecc1ad7 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:14:09 +0800
Subject: [PATCH] Merge branch 'div_10'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 12 ++----------
1 files changed, 2 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 2e9f90c..542d64b 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
@@ -578,16 +578,8 @@
Date createTime = deviceActive.getCreateTime();
List<PushGoods> list = pushGoodsService.listHistoryByPushTime(0, 1, uid, createTime);
if (list != null && list.size() > 0) {
- MsgDeviceReadState state = msgDeviceReadStateService.getByDeviceAndPlatformAndType(
- UserCommonMsgVO.TYPE_ZHUSHOU, acceptData.getDevice(),
- acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2);
- boolean read=false;
- if (state != null && state.getReadTime() != null
- && list.get(0).getCreateTime().getTime() < state.getReadTime().getTime())
- read = true;
-
commonMsgList.add(new UserCommonMsgVO("http://img.flqapp.com/resource/msg/icon_recommend.png", "鎺ㄨ崘璁板綍",
- list.get(0).getCreateTime(), UserCommonMsgVO.TYPE_RECOMMEND, list.get(0).getContent(), read,
+ list.get(0).getCreateTime(), UserCommonMsgVO.TYPE_RECOMMEND, list.get(0).getContent(), false,
jumpDetailV2Service.getByTypeCache("recommend_list"), null));
}
}
@@ -894,7 +886,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_ZHUSHOU, acceptData.getDevice(),
+ msgDeviceReadStateService.setDeviceMsgRead(UserCommonMsgVO.TYPE_RECOMMEND, acceptData.getDevice(),
(acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2));
}
out.print(JsonUtil.loadTrueResult(""));
--
Gitblit v1.8.0