From ee1d39f11b9483b64a88029f1755a6e7166fea15 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 26 四月 2020 16:49:21 +0800
Subject: [PATCH] 等级显示问题
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java | 203 ++++++++++++++++++++++----------------------------
1 files changed, 91 insertions(+), 112 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 bfc6dae..0ed5939 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
@@ -1,148 +1,127 @@
package com.yeshi.fanli.util.factory.msg;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import com.google.gson.Gson;
-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;
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;
-
- 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_0_2(Long uid, ThreeSale threeSale) {
- if (threeSale == null || uid == null)
- return null;
-
- MsgInviteContentDTO content = new MsgInviteContentDTO();
- content.setMode("蹇呰鏉′欢+閫夋嫨鏉′欢锛堜笁閫変竴锛� ");
- content.setCode("闃熷憳缁戝畾鐢佃瘽鍙风爜+鎺堟潈娣樺疂 ");
- content.setState("鎴愬姛閭�璇蜂竴涓槦鍛橈紝闃熷憳鐔熺粌浣跨敤App杩樺彲鑾峰緱绾㈠寘 ");
- content.setInviter("1.浜х敓绱鈮�200閲戝竵/2.浠绘剰璁㈠崟/3.鎴愬姛閭�璇蜂竴涓槦鍛�");
+ List<CommonMsgItemVO> listMsg = new ArrayList<>();
+ List<ClientTextStyleVO> contentList = new ArrayList<>();
+ 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("鐩存帴绮変笣", ClientTextStyleVO.COLOR_CONTENT)));
+ 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();
- detail.setBeiZhu("婊¤冻鑾峰緱绾㈠寘鏉′欢鍚庣郴缁熷皢鑷姩涓嬪彂鍒扳�滄垜鐨�-绾㈠寘鈥濅腑");
- detail.setInviteUser(threeSale);
detail.setCreateTime(new Date());
- detail.setUpdateTime(new Date());
- detail.setDesc(new Gson().toJson(content));
- detail.setMsgType(MsgTypeInviteTypeEnum.inviteNew);
+ detail.setMsgType(MsgTypeInviteTypeEnum.inviteSucceed);
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;
-
- 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;
- }
-
-
-
-
- /**
- * 閭�璇峰け璐�
- *
- * @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;
- }
-
-
- /**
- * 棰嗗彇淇℃伅婵�娲婚個璇峰叧绯�
- *
- * @param threeSale
- * @param uid
- * @return
- */
- public static MsgInviteDetail receiveGift(Long uid, String beiZhu, MsgInviteContentDTO content) {
- if (content == null || uid == null)
- return null;
-
- MsgInviteDetail detail = new MsgInviteDetail();
- if (StringUtil.isNullOrEmpty(beiZhu))
- detail.setBeiZhu("鏃�");
- else
- detail.setBeiZhu(beiZhu);
+ List<CommonMsgItemVO> listMsg = new ArrayList<>();
+ List<ClientTextStyleVO> contentList = new ArrayList<>();
+ 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("闂存帴绮変笣", ClientTextStyleVO.COLOR_CONTENT)));
+ 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();
detail.setCreateTime(new Date());
- detail.setUpdateTime(new Date());
- detail.setDesc(new Gson().toJson(content));
- detail.setMsgType(MsgTypeInviteTypeEnum.receiveGift);
+ 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 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(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;
+ }
+
}
--
Gitblit v1.8.0