From 979cd9c4fbcc037a34ceaf65f6c519b9469f2ac7 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 12 四月 2019 14:16:19 +0800
Subject: [PATCH] 手机登录短信验证
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 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 87e31fa..fc9876c 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
@@ -553,30 +553,37 @@
List<MsgOrderDetail> detailList = msgOrderDetailService.listMsgOrderDetail(uid, page);
if (detailList != null && detailList.size() > 0) {
for (MsgOrderDetail detail : detailList) {
- list.add(UserMsgVOFactory.create(detail));
+ UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+ userMsgVO.setType(MSG_TYPE_ORDER);
+ list.add(userMsgVO);
}
}
List<MsgMoneyDetail> detailList1 = msgMoneyDetailService.listMsgMoneyDetail(uid, page);
if (detailList1 != null && detailList1.size() > 0) {
for (MsgMoneyDetail detail : detailList1) {
- list.add(UserMsgVOFactory.create(detail));
+ UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+ userMsgVO.setType(MSG_TYPE_MONEY);
+ list.add(userMsgVO);
}
}
List<MsgAccountDetail> detailList2 = msgAccountDetailService.listMsgAccountDetail(uid, page);
if (detailList2 != null && detailList2.size() > 0) {
for (MsgAccountDetail detail : detailList2) {
- list.add(UserMsgVOFactory.create(detail));
+ UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+ userMsgVO.setType(MSG_TYPE_ACCOUNT);
+ list.add(userMsgVO);
}
}
List<MsgInviteDetail> detailList3 = msgInviteDetailService.listMsgInviteDetail(uid, page);
if (detailList3 != null && detailList3.size() > 0) {
for (MsgInviteDetail detail : detailList3) {
- UserMsgVO vo = UserMsgVOFactory.create(detail);
- if (vo != null) {
- list.add(vo);
+ UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+ if (userMsgVO != null) {
+ userMsgVO.setType(MSG_TYPE_INVITE);
+ list.add(userMsgVO);
}
}
}
@@ -584,16 +591,17 @@
List<MsgOtherDetail> detailList4 = msgOtherDetailService.listMsgOtherDetail(uid, page);
if (detailList4 != null && detailList4.size() > 0) {
for (MsgOtherDetail detail : detailList4) {
- UserMsgVO vo = UserMsgVOFactory.create(detail);
- if (vo != null) {
- list.add(vo);
+ UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+ if (userMsgVO != null) {
+ userMsgVO.setType(MSG_TYPE_OTHER);
+ list.add(userMsgVO);
}
}
}
List<UserMsgCenter> listCenter = new ArrayList<>();
- List<Special> listSpecial = specialService.listBySystemAndCard("", system.getId());
+ List<Special> listSpecial = specialService.listBySystemAndCard("msg_activities", system.getId());
if (listSpecial != null && listSpecial.size() > 0) {
for (Special special: listSpecial) {
UserMsgCenter msgCenter = new UserMsgCenter();
@@ -606,9 +614,7 @@
// 鏃堕棿鎺掑簭
listSort(list);
- if (list.size() <= 20 ) {
-
- } else {
+ if (list.size() >= 20 ) {
list = list.subList(0, 19);
}
--
Gitblit v1.8.0