From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java | 61 ++++++++++++++++++------------
1 files changed, 36 insertions(+), 25 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 7172b1e..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
@@ -5,12 +5,9 @@
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;
@@ -31,10 +28,11 @@
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));
+ 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),
@@ -63,11 +61,11 @@
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));
-
+ 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));
@@ -86,31 +84,44 @@
detail.setExtraInfo(new Gson().toJson(listMsg));
return detail;
}
-
+
/**
- * 棰嗗彇淇℃伅婵�娲婚個璇峰叧绯�
- *
- * @param threeSale
+ * 绮変笣鍗囩骇
* @param uid
+ * @param rankName
+ * @param nickName
+ * @param item
+ * @param time
* @return
*/
- public static MsgInviteDetail receiveGift(Long uid, String beiZhu, MsgInviteContentDTO content) {
- if (content == null || uid == null)
+ 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;
-
- 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));
+ 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.setUpdateTime(new Date());
- detail.setDesc(new Gson().toJson(content));
- detail.setMsgType(MsgTypeInviteTypeEnum.receiveGift);
+ detail.setMsgType(MsgTypeInviteTypeEnum.fansUpgrade);
detail.setRead(false);
detail.setUser(new UserInfo(uid));
+ detail.setExtraInfo(new Gson().toJson(listMsg));
return detail;
}
+
}
--
Gitblit v1.8.0