From f630649ea79b7b41490dda4c6eb4f1c048ba42db Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 14 五月 2019 15:05:26 +0800
Subject: [PATCH] 有券字段
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 85 +++++++++++++++++++++++++-----------------
1 files changed, 51 insertions(+), 34 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 542d64b..f726cf6 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
@@ -565,26 +565,34 @@
List<UserMsgCenter> listCenter = new ArrayList<>();
// 鍗曟潯娑堟伅
- List<UserCommonMsgVO> commonMsgList = new ArrayList<>();
-
- commonMsgList.add(new UserCommonMsgVO("http://img.flqapp.com/resource/msg/icon_kefu.png", "浜哄伐瀹㈡湇", new Date(),
- UserCommonMsgVO.TYPE_KEFU, "", false, null, null));
-
- // 鎺ㄨ崘璁板綍
- DeviceActive deviceActive = deviceActiveService.getDeviceByDeviceAndPlatform(acceptData.getDevice(),
- acceptData.getDevice(), acceptData.getPlatform());
- if (deviceActive != null) {
- // 璁惧娉ㄥ唽鏃堕棿
- Date createTime = deviceActive.getCreateTime();
- List<PushGoods> list = pushGoodsService.listHistoryByPushTime(0, 1, uid, createTime);
- if (list != null && list.size() > 0) {
- commonMsgList.add(new UserCommonMsgVO("http://img.flqapp.com/resource/msg/icon_recommend.png", "鎺ㄨ崘璁板綍",
- list.get(0).getCreateTime(), UserCommonMsgVO.TYPE_RECOMMEND, list.get(0).getContent(), false,
- jumpDetailV2Service.getByTypeCache("recommend_list"), null));
- }
- }
+ List<UserCommonMsgVO> commonMsgList = new ArrayList<>();
long currentTime = System.currentTimeMillis();
+
+
+ // 瀹樺浠诲姟
+ if (uid != null) {
+ MsgCommonDTO guanXuanMsg = msgConfigService.getGuanXuanMsg();
+ if (guanXuanMsg != null) {
+ boolean read = false;
+ UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
+ if (num != null && (num.getGuanXuanReadTime() != null
+ && guanXuanMsg.getUpdateTime().getTime() < num.getGuanXuanReadTime().getTime()))
+ read = true;
+ // 鏌ヨ鏄惁宸茶
+ if ((guanXuanMsg.getStartTime() != null && currentTime < guanXuanMsg.getStartTime().getTime())
+ || (guanXuanMsg.getEndTime() != null && currentTime > guanXuanMsg.getEndTime().getTime())) {
+ // 涓嶆樉绀�
+ } else
+ commonMsgList.add(new UserCommonMsgVO(guanXuanMsg.getIcon(), guanXuanMsg.getTitle(),
+ guanXuanMsg.getUpdateTime(), UserCommonMsgVO.TYPE_GUANXUAN, guanXuanMsg.getContent(), read,
+ guanXuanMsg.getJumpDetail(), guanXuanMsg.getParams()));
+ }
+ }
+
+
+
+
// 杩斿埄鍒稿皬鍔╂墜
MsgCommonDTO zhuShouMsg = msgConfigService.getZhuShouMsg();
if (zhuShouMsg != null) {
@@ -607,24 +615,30 @@
zhuShouMsg.getUpdateTime(), UserCommonMsgVO.TYPE_ZHUSHOU, zhuShouMsg.getContent(), read,
zhuShouMsg.getJumpDetail(), zhuShouMsg.getParams()));
}
-
- // 瀹樺浠诲姟
- if (uid != null) {
- MsgCommonDTO guanXuanMsg = msgConfigService.getGuanXuanMsg();
- if (guanXuanMsg != null) {
+
+ //浜哄伐瀹㈡湇
+ commonMsgList.add(new UserCommonMsgVO("http://img.flqapp.com/resource/msg/icon_kefu.png", "浜哄伐瀹㈡湇", new Date(),
+ UserCommonMsgVO.TYPE_KEFU, "", false, null, null));
+
+ // 鎺ㄨ崘璁板綍
+ DeviceActive deviceActive = deviceActiveService.getDeviceByDeviceAndPlatform(acceptData.getDevice(),
+ acceptData.getDevice(), acceptData.getPlatform());
+ if (deviceActive != null) {
+ // 璁惧娉ㄥ唽鏃堕棿
+ 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;
- UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
- if (num != null && (num.getGuanXuanReadTime() != null
- && guanXuanMsg.getUpdateTime().getTime() < num.getGuanXuanReadTime().getTime()))
+ if (state != null && state.getReadTime() != null
+ && list.get(0).getCreateTime().getTime() < state.getReadTime().getTime())
read = true;
- // 鏌ヨ鏄惁宸茶
- if ((guanXuanMsg.getStartTime() != null && currentTime < guanXuanMsg.getStartTime().getTime())
- || (guanXuanMsg.getEndTime() != null && currentTime > guanXuanMsg.getEndTime().getTime())) {
- // 涓嶆樉绀�
- } else
- commonMsgList.add(new UserCommonMsgVO(guanXuanMsg.getIcon(), guanXuanMsg.getTitle(),
- guanXuanMsg.getUpdateTime(), UserCommonMsgVO.TYPE_GUANXUAN, guanXuanMsg.getContent(), read,
- guanXuanMsg.getJumpDetail(), guanXuanMsg.getParams()));
+
+ 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,
+ jumpDetailV2Service.getByTypeCache("recommend_list"), null));
}
}
@@ -740,6 +754,9 @@
UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
UserSystemMsg usm = userSystemMsgService.getLatestUserSystemMsg(uid);
if (usm != null) {
+ // commonMsgList.add(0,new UserCommonMsgVO(icon, "绯荤粺娑堟伅", time,
+ // type, latestMsg, ,
+ // jumpDetailV2Service.getByTypeCache("system_msg"), params));
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" : "",
--
Gitblit v1.8.0