From 395cd4c4caf01e1b3ad134834e5c1db284b59074 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 11 四月 2020 18:18:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java |  292 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 226 insertions(+), 66 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java
index 6557a24..ff81ede 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java
@@ -8,9 +8,9 @@
 import com.yeshi.fanli.dto.msg.MsgInviteContentDTO;
 import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;
 import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail.MsgTypeInviteTypeEnum;
-import com.yeshi.fanli.entity.bus.user.ThreeSale;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
 import com.yeshi.fanli.vo.msg.CommonMsgItemVO;
 import com.yeshi.fanli.vo.msg.CommonMsgItemVOFactory;
@@ -18,108 +18,268 @@
 public class MsgInviteDetailFactory {
 
 	/**
-	 * 閭�璇锋垚鍔�
-	 * 
-	 * @param threeSale
+	 * 鐩存帴绮変笣閭�璇锋彁閱�
 	 * @param uid
+	 * @param nickName
+	 * @param portrait
+	 * @param time
 	 * @return
 	 */
-	public static MsgInviteDetail createInviteSuccess(ThreeSale threeSale, Long uid, String beiZhu) {
-		if (threeSale == null || uid == null)
+	public static MsgInviteDetail directInviteSuccess(Long uid, String nickName, String portrait, Date time) {
+		if (nickName == null || uid == null || portrait == null || time == null)
 			return null;
-
-		
-		
-		
+		List<CommonMsgItemVO> listMsg = new ArrayList<>();
+		List<ClientTextStyleVO> contentList = new ArrayList<>();
+		contentList.add(new ClientTextStyleVO("鎭枩浣狅紒鍥㈤槦澧炲姞鐩存帴绮変笣锛�", ClientTextStyleVO.COLOR_CONTENT));
+		contentList.add(new ClientTextStyleVO("",ClientTextStyleVO.COLOR_CONTENT, portrait));
+		contentList.add(new ClientTextStyleVO("銆�" + nickName, ClientTextStyleVO.COLOR_CONTENT));
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鐩存帴绮変笣", ClientTextStyleVO.COLOR_TITLE),contentList));
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍔犲叆鏃堕棿", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO(TimeUtil.formatDate(time), ClientTextStyleVO.COLOR_CONTENT)));
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO("鏃�", ClientTextStyleVO.COLOR_CONTENT)));
 		
 		MsgInviteDetail detail = new MsgInviteDetail();
-		if (StringUtil.isNullOrEmpty(beiZhu))
-			detail.setBeiZhu("鏃�");
-		else
-			detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
-		detail.setDesc("鎭枩浣狅紝鎴愬姛閭�璇蜂竴涓矇涓�");
-		detail.setInviteUser(threeSale);
-		detail.setMsgType(MsgTypeInviteTypeEnum.invite);
-		detail.setRead(false);
-		detail.setUser(new UserInfo(uid));
-
-		return detail;
-	}
-	/**
-	 *   閭�璇锋垚鍔�
-	 * 
-	 * @param threeSale
-	 * @param uid
-	 * @return
-	 */
-	public static MsgInviteDetail createInviteSuccess2_1(Long uid, ThreeSale threeSale) {
-		if (threeSale == null || uid == null)
-			return null;
-		MsgInviteDetail detail = new MsgInviteDetail();
-		detail.setRead(false);
-		detail.setUser(new UserInfo(uid));
-		detail.setInviteUser(threeSale);
 		detail.setMsgType(MsgTypeInviteTypeEnum.inviteSucceed);
-		detail.setDesc("绮変笣锛堝ソ鍙嬶級鐔熺粌浣跨敤App鍙幏寰楃孩鍖�");
-		detail.setBeiZhu("婊¤冻鑾峰緱绾㈠寘鏉′欢鍚庣郴缁熷皢鑷姩涓嬪彂鍒扳�滄垜鐨�-绾㈠寘鈥濅腑");
-		detail.setCreateTime(new Date());
-		detail.setUpdateTime(new Date());
+		detail.setRead(false);
+		detail.setUser(new UserInfo(uid));
+		detail.setExtraInfo(new Gson().toJson(listMsg));
 		return detail;
 	}
 	
 	/**
-	 * 鎵弿閭�璇蜂簩缁寸爜鎴愬姛锛屼絾鏄湭鐧诲綍
-	 * 
-	 * @param threeSale
+	 * 闂存帴閭�璇�
 	 * @param uid
+	 * @param inviteName
+	 * @param nickName
+	 * @param portrait
+	 * @param time
 	 * @return
 	 */
-	public static MsgInviteDetail createInviteScanSuccess(ThreeSale threeSale, Long uid, String beiZhu) {
-		if (threeSale == null || uid == null)
+	public static MsgInviteDetail indirectInviteSuccess(Long uid, String inviteName, String nickName, String portrait, Date time) {
+		if (nickName == null || uid == null || portrait == null || time == null)
 			return null;
-
+		List<CommonMsgItemVO> listMsg = new ArrayList<>();
+		List<ClientTextStyleVO> contentList = new ArrayList<>();
+		contentList.add(new ClientTextStyleVO("鎭枩浣狅紒鍥㈤槦澧炲姞鐩存帴绮変笣锛�", ClientTextStyleVO.COLOR_CONTENT));
+		contentList.add(new ClientTextStyleVO("",ClientTextStyleVO.COLOR_CONTENT, portrait));
+		contentList.add(new ClientTextStyleVO("銆�" + nickName, ClientTextStyleVO.COLOR_CONTENT));
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("闂存帴绮変笣", ClientTextStyleVO.COLOR_TITLE),contentList));
+	
+		List<ClientTextStyleVO> contentList2 = new ArrayList<>();
+		contentList2.add(new ClientTextStyleVO("鐢辩洿鎺ョ矇涓�", ClientTextStyleVO.COLOR_CONTENT));
+		contentList2.add(new ClientTextStyleVO(inviteName,ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+		contentList2.add(new ClientTextStyleVO("閭�璇�", ClientTextStyleVO.COLOR_CONTENT));
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("閭�璇蜂汉", ClientTextStyleVO.COLOR_TITLE),contentList2));
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍔犲叆鏃堕棿", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO(TimeUtil.formatDate(time), ClientTextStyleVO.COLOR_CONTENT)));
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO("鏃�", ClientTextStyleVO.COLOR_CONTENT)));
+		
 		MsgInviteDetail detail = new MsgInviteDetail();
-		if (StringUtil.isNullOrEmpty(beiZhu))
-			detail.setBeiZhu("鏃�");
-		else
-			detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
-		detail.setDesc("鎭枩浣狅紝鏈夋柊绮変笣鍔犲叆浣犵殑闃熷垪锛岃嫢瀵规柟60澶╁唴鏈縺娲诲皢浼氫笌浣犺劚绂婚個璇峰叧绯�");
-		detail.setInviteUser(threeSale);
-		detail.setMsgType(MsgTypeInviteTypeEnum.invite);
+		detail.setMsgType(MsgTypeInviteTypeEnum.inviteSucceed);
 		detail.setRead(false);
 		detail.setUser(new UserInfo(uid));
+		detail.setExtraInfo(new Gson().toJson(listMsg));
 		return detail;
 	}
 	
 	
+	/**
+	 * 绮変笣鍗囩骇
+	 * @param uid
+	 * @param rankName
+	 * @param nickName
+	 * @param item
+	 * @param time
+	 * @return
+	 */
+	public static MsgInviteDetail fansUpgrade(Long uid, String relation, String rankName, String nickName, String item,   Date time) {
+		if (nickName == null || uid == null || item == null || time == null)
+			return null;
+		List<CommonMsgItemVO> listMsg = new ArrayList<>();
+		List<ClientTextStyleVO> contentList = new ArrayList<>();
+		contentList.add(new ClientTextStyleVO("鎭枩浣狅紒浣犵殑" + relation + ":", ClientTextStyleVO.COLOR_CONTENT));
+		contentList.add(new ClientTextStyleVO(nickName ,ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+		contentList.add(new ClientTextStyleVO("宸插崌绾т负", ClientTextStyleVO.COLOR_CONTENT));
+		contentList.add(new ClientTextStyleVO(rankName, ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍗囩骇璇存槑", ClientTextStyleVO.COLOR_TITLE),contentList));
 	
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍗囩骇鏃堕棿", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO(TimeUtil.formatDate(time), ClientTextStyleVO.COLOR_CONTENT)));
+		
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍗囩骇鏂瑰紡", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO(String.format("婊¤冻%s鏉′欢鍚庡畬鎴愮殑鍗囩骇", item), ClientTextStyleVO.COLOR_CONTENT)));
+		
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO("濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�", ClientTextStyleVO.COLOR_CONTENT)));
+		
+		MsgInviteDetail detail = new MsgInviteDetail();
+		detail.setCreateTime(new Date());
+		detail.setMsgType(MsgTypeInviteTypeEnum.fansUpgrade);
+		detail.setRead(false);
+		detail.setUser(new UserInfo(uid));
+		detail.setExtraInfo(new Gson().toJson(listMsg));
+		return detail;
+	}
+	
+	
+	/**
+	 * 鐩存帴绮変笣鑴辩-寮�濮嬭劚绂绘彁閱�
+	 * @param uid
+	 * @param rankName
+	 * @param nickName
+	 * @param item
+	 * @param time
+	 * @return
+	 */
+	public static MsgInviteDetail fansPreDivorced(Long uid, String rankName, String nickName, String item, Date time) {
+		if (nickName == null || uid == null || item == null || time == null)
+			return null;
+		List<CommonMsgItemVO> listMsg = new ArrayList<>();
+		List<ClientTextStyleVO> contentList = new ArrayList<>();
+		contentList.add(new ClientTextStyleVO("寰堟姳姝夛紒浣犵殑鐩存帴绮変笣:", ClientTextStyleVO.COLOR_CONTENT));
+		contentList.add(new ClientTextStyleVO(nickName ,ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+		contentList.add(new ClientTextStyleVO("宸插崌绾т负", ClientTextStyleVO.COLOR_CONTENT));
+		contentList.add(new ClientTextStyleVO(rankName, ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鑴辩绮変笣", ClientTextStyleVO.COLOR_TITLE),contentList));
+	
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍗囩骇鏃堕棿", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO(TimeUtil.formatDate(time), ClientTextStyleVO.COLOR_CONTENT)));
+		
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鑴辩鍘熷洜", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO("浣犺繕涓嶆槸浼氬憳锛屽嵆鏃ヨ捣浣犻渶瑕佸湪60澶╁唴鍗囩骇涓轰换鎰忎細鍛�", ClientTextStyleVO.COLOR_CONTENT)));
+		
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO("鍙湪銆怽"鎴戠殑-鎴戠殑绮変笣\"銆戜腑鏌ョ湅鑴辩鍓╀綑鏃堕棿", ClientTextStyleVO.COLOR_CONTENT)));
+		
+		MsgInviteDetail detail = new MsgInviteDetail();
+		detail.setCreateTime(new Date());
+		detail.setMsgType(MsgTypeInviteTypeEnum.fansDivorced);
+		detail.setRead(false);
+		detail.setUser(new UserInfo(uid));
+		detail.setExtraInfo(new Gson().toJson(listMsg));
+		return detail;
+	}
+	
+	/**
+	 * 闂存帴绮変笣鑴辩-寮�濮嬭劚绂绘彁閱�
+	 * @param uid
+	 * @param rankName
+	 * @param nickName
+	 * @param fansName
+	 * @param item
+	 * @param time
+	 * @return
+	 */
+	public static MsgInviteDetail fansPredivorcedIndirect(Long uid, String rankName, String nickName, String fansName,
+			String item, Date time) {
+		if (nickName == null || uid == null || item == null || time == null)
+			return null;
+		
+		List<CommonMsgItemVO> listMsg = new ArrayList<>();
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鑴辩绮変笣", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO(String.format("寰堟姳姝夛紒浣犵殑闂存帴绮変笣:%s宸插崌绾т负%s", nickName, rankName), ClientTextStyleVO.COLOR_CONTENT)));
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍗囩骇鏃堕棿", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO(TimeUtil.formatDate(time), ClientTextStyleVO.COLOR_CONTENT)));
+		
+		List<ClientTextStyleVO> contentList = new ArrayList<>();
+		contentList.add(new ClientTextStyleVO("浣犵殑鐩存帴绮変笣", ClientTextStyleVO.COLOR_CONTENT));
+		contentList.add(new ClientTextStyleVO(fansName,ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+		contentList.add(new ClientTextStyleVO("杩樹笉鏄細鍛橈紝鍗虫棩璧蜂綘闇�瑕佸湪60澶╁唴鍔╁姏浠栨垚闀夸负浠绘剰浼氬憳", ClientTextStyleVO.COLOR_CONTENT));
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鑴辩鍘熷洜", ClientTextStyleVO.COLOR_TITLE),contentList));
+		
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO("鍙湪銆怽"鎴戠殑-鎴戠殑绮変笣\"銆戜腑鏌ョ湅鑴辩鍓╀綑鏃堕棿", ClientTextStyleVO.COLOR_CONTENT)));
+		
+		MsgInviteDetail detail = new MsgInviteDetail();
+		detail.setCreateTime(new Date());
+		detail.setMsgType(MsgTypeInviteTypeEnum.fansDivorced);
+		detail.setRead(false);
+		detail.setUser(new UserInfo(uid));
+		detail.setExtraInfo(new Gson().toJson(listMsg));
+		return detail;
+	}
 
 	/**
-	 * 閭�璇峰け璐�
-	 * 
-	 * @param threeSale
+	 * 鐩存帴绮変笣鑴辩-宸茬粡鑴辩鎻愰啋
 	 * @param uid
+	 * @param rankName
+	 * @param nickName
+	 * @param item
+	 * @param time
 	 * @return
 	 */
-	public static MsgInviteDetail createInviteFail(ThreeSale threeSale, Long uid, String beiZhu) {
-		if (threeSale == null || uid == null)
+	public static MsgInviteDetail fansDivorced(Long uid, String nickName, Date time) {
+		if (nickName == null || uid == null || time == null)
 			return null;
-
+		List<CommonMsgItemVO> listMsg = new ArrayList<>();
+		List<ClientTextStyleVO> contentList = new ArrayList<>();
+		contentList.add(new ClientTextStyleVO("寰堟姳姝夛紒浣犵殑鐩存帴绮変笣:", ClientTextStyleVO.COLOR_CONTENT));
+		contentList.add(new ClientTextStyleVO(nickName ,ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+		contentList.add(new ClientTextStyleVO("宸茬粡鑴辩浜嗕綘", ClientTextStyleVO.COLOR_CONTENT));
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鑴辩绮変笣", ClientTextStyleVO.COLOR_TITLE),contentList));
+	
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鑴辩鏃堕棿", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO(TimeUtil.formatDate(time), ClientTextStyleVO.COLOR_CONTENT)));
+		
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鑴辩鍘熷洜", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO("浣犳湭鑳藉湪60澶╁唴鍗囩骇涓轰换鎰忎細鍛�", ClientTextStyleVO.COLOR_CONTENT)));
+		
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO("濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�", ClientTextStyleVO.COLOR_CONTENT)));
+		
 		MsgInviteDetail detail = new MsgInviteDetail();
-		if (StringUtil.isNullOrEmpty(beiZhu))
-			detail.setBeiZhu("鏃�");
-		else
-			detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
-		detail.setDesc("鎶辨瓑锛岃绮変笣鍥�60澶╁唴鏈縺娲伙紝宸茶劚绂讳簡浣犵殑闃熷垪锛屽彲浠ヨ瘯鐫�閲嶆柊閭�璇�");
-		detail.setInviteUser(threeSale);
-		detail.setMsgType(MsgTypeInviteTypeEnum.invite);
+		detail.setMsgType(MsgTypeInviteTypeEnum.fansDivorced);
 		detail.setRead(false);
 		detail.setUser(new UserInfo(uid));
+		detail.setExtraInfo(new Gson().toJson(listMsg));
 		return detail;
 	}
+
+
+	/**
+	 * 鐩存帴绮変笣鑴辩-宸茬粡鑴辩鎻愰啋
+	 * @param uid
+	 * @param rankName
+	 * @param nickName
+	 * @param item
+	 * @param time
+	 * @return
+	 */
+	public static MsgInviteDetail fansDivorcedIndirect(Long uid, String nickName, String fansName, Date time) {
+		if (nickName == null || uid == null || time == null)
+			return null;
+		List<CommonMsgItemVO> listMsg = new ArrayList<>();
+		List<ClientTextStyleVO> contentList = new ArrayList<>();
+		contentList.add(new ClientTextStyleVO("寰堟姳姝夛紒浣犵殑闂存帴绮変笣:", ClientTextStyleVO.COLOR_CONTENT));
+		contentList.add(new ClientTextStyleVO(nickName ,ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+		contentList.add(new ClientTextStyleVO("宸茬粡鑴辩浜嗕綘", ClientTextStyleVO.COLOR_CONTENT));
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鑴辩绮変笣", ClientTextStyleVO.COLOR_TITLE),contentList));
+	
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鑴辩鏃堕棿", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO(TimeUtil.formatDate(time), ClientTextStyleVO.COLOR_CONTENT)));
+		
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鑴辩鍘熷洜", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO(String.format("浣犵殑鐩存帴绮変笣%s鏈兘鍦�60澶╁唴鍗囩骇涓轰换鎰忎細鍛�", fansName), ClientTextStyleVO.COLOR_CONTENT)));
+		
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO("濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�", ClientTextStyleVO.COLOR_CONTENT)));
+		
+		MsgInviteDetail detail = new MsgInviteDetail();
+		detail.setCreateTime(new Date());
+		detail.setMsgType(MsgTypeInviteTypeEnum.fansDivorced);
+		detail.setRead(false);
+		detail.setUser(new UserInfo(uid));
+		detail.setExtraInfo(new Gson().toJson(listMsg));
+		return detail;
+	}
+	
+
+	
 	
 	
 	/**

--
Gitblit v1.8.0