From e1fcabf3946b7a5a6b76931657413a29735d0762 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 一月 2019 17:37:45 +0800
Subject: [PATCH] 新版消息通知
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 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 b570426..9672395 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
@@ -112,7 +112,7 @@
switch (type) {
case MSG_TYPE_ORDER:
- msgOrderDetailService.readMsgByUid(uid);
+ userMsgReadStateService.readOrderMsg(uid);
List<MsgOrderDetail> detailList = msgOrderDetailService.listMsgOrderDetail(uid, page);
count = msgOrderDetailService.countMsgOrderDetail(uid);
if (detailList != null)
@@ -120,7 +120,7 @@
list.add(UserMsgVOFactory.create(detail));
break;
case MSG_TYPE_MONEY:
- msgMoneyDetailService.readMsgByUid(uid);
+ userMsgReadStateService.readMoneyMsg(uid);
List<MsgMoneyDetail> detailList1 = msgMoneyDetailService.listMsgMoneyDetail(uid, page);
count = msgMoneyDetailService.countMsgMoneyDetail(uid);
if (detailList1 != null)
@@ -128,7 +128,7 @@
list.add(UserMsgVOFactory.create(detail));
break;
case MSG_TYPE_ACCOUNT:
- msgAccountDetailService.readMsgByUid(uid);
+ userMsgReadStateService.readAccountMsg(uid);
List<MsgAccountDetail> detailList2 = msgAccountDetailService.listMsgAccountDetail(uid, page);
count = msgAccountDetailService.countMsgAccountDetail(uid);
if (detailList2 != null)
@@ -136,7 +136,7 @@
list.add(UserMsgVOFactory.create(detail));
break;
case MSG_TYPE_INVITE:
- msgInviteDetailService.readMsgByUid(uid);
+ userMsgReadStateService.readInviteMsg(uid);
List<MsgInviteDetail> detailList3 = msgInviteDetailService.listMsgInviteDetail(uid, page);
count = msgInviteDetailService.countMsgInviteDetail(uid);
if (detailList3 != null)
@@ -170,10 +170,7 @@
JSONObject data = JSONObject.fromObject(JsonUtil.getApiCommonGson().toJson(num));
data.put("totalCount", num.getTypeAccount() + num.getTypeInvite() + num.getTypeMoney() + num.getTypeOrder()
+ num.getTypeScore() + num.getTypeSystem());
- JSONObject root = new JSONObject();
- root.put("data", data);
- root.put("count", 1);
- out.print(JsonUtil.loadTrueResult(root));
+ out.print(JsonUtil.loadTrueResult(data));
}
private String getTimeDesc(Date nowDate, Date targetDate) {
@@ -264,10 +261,12 @@
}
vo.setGoodsList(goodsList);
+ vo.setTitle("鐚滀綘鍠滄");
+ vo.setIcon("http://img.flqapp.com/resource/msg/icon_msg_guess_like.png");
volist.add(vo);
}
- if (volist.size() < Constant.PAGE_SIZE) {
+ if (volist.size() > 0 && volist.size() < Constant.PAGE_SIZE) {
// 娣诲姞娆㈣繋璇�
UserHomeMsgVO vo = new UserHomeMsgVO();
vo.setContent("鎭枩浣狅紝鎴愪负杩斿埄鍒哥殑鐢ㄦ埛\n鐙浼樻儬鍒稿府浣犵渷閽憋紱\n鍙備笌濂栭噾娲诲姩甯綘璧氶挶锛沑n璁╄繑鍒╁埜鎴愪负浣犵殑鐪侀挶鍔╂墜鍚э紒");
@@ -280,12 +279,15 @@
JSONObject root = new JSONObject();
root.put("msgList", new Gson().toJson(volist));
if (page == 1) {
+ 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.getContent(),
- usm.getTimeTag() == 1 ? "http://img.flqapp.com/resource/msg/icon_emergent.png" : "",
- Constant.systemCommonConfig.getDefaultPortrait(), getTimeDesc(now, usm.getCreateTime())));
+ root.put("systemMsg",
+ new UserSystemMsgVO(usm.getId(), usm.getType().name(), usm.getSolved(), usm.getTitle(),
+ usm.getContent(),
+ usm.getTimeTag() == 1 ? "http://img.flqapp.com/resource/msg/icon_emergent.png" : "",
+ Constant.systemCommonConfig.getDefaultPortrait(), getTimeDesc(now, usm.getCreateTime()),
+ num.getTypeSystem()));
}
root.put("count", count);
out.print(JsonUtil.loadTrueResult(root));
@@ -313,11 +315,11 @@
voList.add(new UserSystemMsgVO(usm.getId(), usm.getType().name(), usm.getSolved(), usm.getTitle(),
usm.getContent(),
usm.getTimeTag() == 1 ? "http://img.flqapp.com/resource/msg/icon_emergent.png" : "", null,
- usm.getCreateTime().getTime() + ""));
+ usm.getCreateTime().getTime() + "", 0));
}
long count = userSystemMsgService.countUserSystemMsg(uid);
- userSystemMsgService.readMsgByUid(uid);
+ userMsgReadStateService.readUserSystemMsg(uid);
JSONObject root = new JSONObject();
root.put("data", voList);
--
Gitblit v1.8.0