|
|
@@ -1,7 +1,10 @@
|
|
1
|
1
|
package com.community.huiju.service.impl;
|
|
2
|
2
|
|
|
3
|
3
|
import com.community.commom.constant.Constant;
|
|
|
4
|
+import com.community.huiju.dao.TpBillInvoiceMapper;
|
|
|
5
|
+import com.community.huiju.dao.TpBillMapper;
|
|
4
|
6
|
import com.community.huiju.dao.TpMessageMapper;
|
|
|
7
|
+import com.community.huiju.model.TpBill;
|
|
5
|
8
|
import com.community.huiju.model.TpMessage;
|
|
6
|
9
|
import com.community.huiju.service.MessageServiceI;
|
|
7
|
10
|
import com.github.pagehelper.Page;
|
|
|
@@ -24,6 +27,9 @@ public class MessageServiceImpl implements MessageServiceI {
|
|
24
|
27
|
@Autowired
|
|
25
|
28
|
private TpMessageMapper tpMessageMapper;
|
|
26
|
29
|
|
|
|
30
|
+ @Autowired
|
|
|
31
|
+ private TpBillMapper tpBillMapper;
|
|
|
32
|
+
|
|
27
|
33
|
/**
|
|
28
|
34
|
* 获取消息数量
|
|
29
|
35
|
* @param communityId
|
|
|
@@ -49,6 +55,13 @@ public class MessageServiceImpl implements MessageServiceI {
|
|
49
|
55
|
// 获取数据
|
|
50
|
56
|
List<TpMessage> messageList = tpMessageMapper.getMessages(userId,communityId, modelType);
|
|
51
|
57
|
messageList.stream().forEach(tpMessage -> {
|
|
|
58
|
+ //缴费相关信息
|
|
|
59
|
+ if (tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_BILL)){
|
|
|
60
|
+ TpBill tpBill = tpBillMapper.selectByPrimaryKey(tpMessage.getBillId());
|
|
|
61
|
+ if (null != tpBill){
|
|
|
62
|
+ tpMessage.setContent(tpBill.getBillExplain());
|
|
|
63
|
+ }
|
|
|
64
|
+ }
|
|
52
|
65
|
if (!StringUtils.isEmpty(tpMessage.getMessageDetailUrl())){
|
|
53
|
66
|
Integer id = getMessageIdByType(tpMessage);
|
|
54
|
67
|
tpMessage.setMessageDetailUrl(tpMessage.getMessageDetailUrl() + "&id=" + id);
|
