From 17e98d7bcc27072f97976d24eb504abb02914891 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 11 四月 2020 09:20:14 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java | 126 +++++++++++++++--------------------------
1 files changed, 46 insertions(+), 80 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..7172b1e 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
@@ -11,6 +11,7 @@
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,109 +19,74 @@
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 threeSale
- * @param uid
- * @return
- */
- public static MsgInviteDetail createInviteFail(ThreeSale threeSale, Long uid, String beiZhu) {
- if (threeSale == null || uid == null)
- return null;
-
- 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.setRead(false);
- detail.setUser(new UserInfo(uid));
- return detail;
- }
-
/**
* 棰嗗彇淇℃伅婵�娲婚個璇峰叧绯�
--
Gitblit v1.8.0