合并

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

@@ -1,5 +1,6 @@
 package com.community.huiju.service.impl;
 
+import com.community.commom.constant.Constant;
 import com.community.huiju.dao.TpMessageMapper;
 import com.community.huiju.model.TpMessage;
 import com.community.huiju.service.MessageServiceI;
@@ -49,7 +50,8 @@ public class MessageServiceImpl implements MessageServiceI {
 		List<TpMessage> messageList = tpMessageMapper.getMessages(userId,communityId, modelType);
 		messageList.stream().forEach(tpMessage -> {
 			if (!StringUtils.isEmpty(tpMessage.getMessageDetailUrl())){
-				tpMessage.setMessageDetailUrl(tpMessage.getMessageDetailUrl() + "&id=" + tpMessage.getTicketId());
+				Integer id = getMessageIdByType(tpMessage);
+				tpMessage.setMessageDetailUrl(tpMessage.getMessageDetailUrl() + "&id=" + id);
 			}
 		});
 		Map<String,Object> map = new HashMap<>();
@@ -57,7 +59,32 @@ public class MessageServiceImpl implements MessageServiceI {
 		map.put("total",page.getTotal());
 		return map;
 	}
-
+	
+	/**
+	 * 根据不同的类型取不同的id
+	 * @param tpMessage
+	 */
+	private Integer getMessageIdByType(TpMessage tpMessage) {
+		Integer id = tpMessage.getTicketId();
+		switch (tpMessage.getMessageType()){
+			case Constant.MESSAGE_TYPE_VISITOR:
+				break;
+			case Constant.MESSAGE_TYPE_ANNOUNCEMENT:
+				id = tpMessage.getAnnouncementId();
+				break;
+			case Constant.MESSAGE_TYPE_SYS:
+				break;
+			case Constant.MESSAGE_TYPE_BILL:
+				id = tpMessage.getBillId();
+				break;
+			case Constant.MESSAGE_TYPE_ACTIVITY:
+				id = tpMessage.getActivityId();
+				break;
+		}
+		
+		return id;
+	}
+	
 	/**
 	 * 消息全部已读
 	 */

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -125,6 +125,9 @@ public class Constant {
 	
     public static final String SUCCESS = "success";
     
+    /**
+     * 直辖市
+     */
 	public static final Integer Beijing = 2;
 	
 	public static final Integer Tianjin = 19;
@@ -132,4 +135,29 @@ public class Constant {
 	public static final Integer Shanghai = 857;
 	
 	public static final Integer Chongqing = 2459;
+    
+    /**
+     * 访客消息
+     */
+    public static final String MESSAGE_TYPE_VISITOR = "4";
+    
+    /**
+     * 公告
+     */
+    public static final String MESSAGE_TYPE_ANNOUNCEMENT = "5";
+    
+    /**
+     * 系统通知
+     */
+    public static final String MESSAGE_TYPE_SYS = "6";
+    
+    /**
+     * 收费单
+     */
+    public static final String MESSAGE_TYPE_BILL = "7";
+    
+    /**
+     * 收费单
+     */
+    public static final String MESSAGE_TYPE_ACTIVITY = "8";
 }