From cd637932a970e7935b17d41568fe89c92775bccc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 十二月 2019 17:18:27 +0800
Subject: [PATCH] 双12活动添加,邀请码发布修改，爬单新规则添加
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
index 45dde3c..5aed4ba 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
@@ -741,6 +741,7 @@
return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png", dto.getTitle(),
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+
} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackForbid) { // 绾㈠寘灏佺娑堟伅
if (StringUtil.isNullOrEmpty(msg.getContent()))
return null;
@@ -751,6 +752,7 @@
return null;
contentList = new ArrayList<>();
+
contentList.add(new ClientTextStyleVO(dto.getReason() + "", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍘熷洜", COLOR_TITLE), contentList));
@@ -761,7 +763,6 @@
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getHandle(), COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶勭悊", COLOR_TITLE), contentList));
-
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
@@ -805,14 +806,15 @@
if (StringUtil.isNullOrEmpty(msg.getContent()))
return null;
- MsgRedPackTeamRewardContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackTeamRewardContentDTO.class);
+ MsgRedPackTeamRewardContentDTO dto = new Gson().fromJson(msg.getContent(),
+ MsgRedPackTeamRewardContentDTO.class);
if (dto == null)
return null;
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(dto.getNickName() + "", COLOR_CONTENT,dto.getPortrait()));
+ contentList.add(new ClientTextStyleVO(dto.getNickName() + "", COLOR_CONTENT, dto.getPortrait()));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("琚個璇蜂汉", COLOR_TITLE), contentList));
-
+
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(msg.getStateDesc(), COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("绾㈠寘杩涚▼", COLOR_TITLE), contentList));
@@ -860,21 +862,24 @@
if (hongBaoPay) {
contentList = new ArrayList<>();
- contentList
- .add(new ClientTextStyleVO("楼"+dto.getHongBao().setScale(2).toString(), COLOR_HIGHLIGHT_CONTENT));
+ contentList.add(
+ new ClientTextStyleVO("楼" + dto.getHongBao().setScale(2).toString(), COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("娑堣�楃孩鍖�", COLOR_TITLE), contentList));
}
if (moneyPay) {
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼"+dto.getMoney().setScale(2).toString(), COLOR_HIGHLIGHT_CONTENT));
+ contentList.add(
+ new ClientTextStyleVO("楼" + dto.getMoney().setScale(2).toString(), COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("娑堣�楃幇閲�", COLOR_TITLE), contentList));
}
-
+
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("浜哄伐瀹℃牳["+ TimeUtil.getGernalTime(dto.getTime().getTime(),"yyyy.MM.dd HH:mm")+"]", COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO(
+ "浜哄伐瀹℃牳[" + TimeUtil.getGernalTime(dto.getTime().getTime(), "yyyy.MM.dd HH:mm") + "]",
+ COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("瀹℃牳鏂瑰紡", COLOR_TITLE), contentList));
-
+
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
COLOR_CONTENT));
@@ -913,21 +918,22 @@
if (hongBaoPay) {
contentList = new ArrayList<>();
- contentList
- .add(new ClientTextStyleVO("楼"+dto.getHongBao().setScale(2).toString(), COLOR_HIGHLIGHT_CONTENT));
+ contentList.add(
+ new ClientTextStyleVO("楼" + dto.getHongBao().setScale(2).toString(), COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("娑堣�楃孩鍖�", COLOR_TITLE), contentList));
}
if (moneyPay) {
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼"+dto.getMoney().setScale(2).toString()+"[宸插師璺��鍥瀅", COLOR_HIGHLIGHT_CONTENT));
+ contentList.add(new ClientTextStyleVO("楼" + dto.getMoney().setScale(2).toString() + "[宸插師璺��鍥瀅",
+ COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("娑堣�楃幇閲�", COLOR_TITLE), contentList));
}
-
+
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getReason(), COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍘熷洜", COLOR_TITLE), contentList));
-
+
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
COLOR_CONTENT));
@@ -1049,13 +1055,13 @@
} else if (msgType == MsgTypeInviteTypeEnum.inviteSucceed) {
if (msg.getInviteUser() == null || msg.getInviteUser().getWorker() == null)
return null;
-
+
List<CommonMsgItemVO> items = new ArrayList<>();
List<ClientTextStyleVO> contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(msg.getInviteUser().getWorker().getNickName() + "", COLOR_CONTENT,
msg.getInviteUser().getWorker().getPortrait()));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("琚個璇蜂汉", COLOR_TITLE), contentList));
-
+
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("閭�璇烽槦鍛樻垚鍔�", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇风姸鎬�", COLOR_TITLE), contentList));
--
Gitblit v1.8.0