bug

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java

@@ -1,7 +1,10 @@
 package com.community.huiju.service.impl;
 
 import com.community.commom.constant.Constant;
+import com.community.huiju.dao.TpBillInvoiceMapper;
+import com.community.huiju.dao.TpBillMapper;
 import com.community.huiju.dao.TpMessageMapper;
+import com.community.huiju.model.TpBill;
 import com.community.huiju.model.TpMessage;
 import com.community.huiju.service.MessageServiceI;
 import com.github.pagehelper.Page;
@@ -24,6 +27,9 @@ public class MessageServiceImpl implements MessageServiceI {
 	@Autowired
 	private TpMessageMapper tpMessageMapper;
 	
+	@Autowired
+	private TpBillMapper tpBillMapper;
+	
 	/**
 	 * 获取消息数量
 	 * @param communityId
@@ -49,6 +55,13 @@ public class MessageServiceImpl implements MessageServiceI {
 		// 获取数据
 		List<TpMessage> messageList = tpMessageMapper.getMessages(userId,communityId, modelType);
 		messageList.stream().forEach(tpMessage -> {
+			//缴费相关信息
+			if (tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_BILL)){
+				TpBill tpBill = tpBillMapper.selectByPrimaryKey(tpMessage.getBillId());
+				if (null != tpBill){
+					tpMessage.setContent(tpBill.getBillExplain());
+				}
+			}
 			if (!StringUtils.isEmpty(tpMessage.getMessageDetailUrl())){
 				Integer id = getMessageIdByType(tpMessage);
 				tpMessage.setMessageDetailUrl(tpMessage.getMessageDetailUrl() + "&id=" + id);

CODE/smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml

@@ -318,6 +318,9 @@
         t.create_date,
         t.update_user,
         t.update_date,
+        t.bill_id,
+        t.activity_id,
+        t.announcement_id,
         k.status,
         r.content,
         d.name as ticket_status,