From d3db196ed2fe8b6c3905ff111d665d9fc2c951a3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 10 十二月 2019 15:41:58 +0800
Subject: [PATCH] 返利比例与会员比例调整
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 118 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 85 insertions(+), 33 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 74a58a4..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,20 +741,80 @@
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;
+
+ MsgRedPackExchangeContentDTO dto = new Gson().fromJson(msg.getContent(),
+ MsgRedPackExchangeContentDTO.class);
+ if (dto == null)
+ return null;
+
+ 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(dto.getTime() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("灏佺鏃堕棿", COLOR_TITLE), contentList));
+
+ 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(),
+ COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
+
+ return new UserMsgVO("http://img.flqapp.com/img/tlj/icon_tlj.png", msg.getMsgType().getDesc(),
+ msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+ } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackDeduct) { // 绾㈠寘鎵ｉ櫎娑堟伅
+ if (StringUtil.isNullOrEmpty(msg.getContent()))
+ return null;
+
+ MsgRedPackExchangeContentDTO dto = new Gson().fromJson(msg.getContent(),
+ MsgRedPackExchangeContentDTO.class);
+ if (dto == null)
+ return null;
+
+ 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("楼" + dto.getMoney() + "", COLOR_HIGHLIGHT_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎閲戦", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO("楼" + dto.getBalance(), COLOR_HIGHLIGHT_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));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
+
+ return new UserMsgVO("http://img.flqapp.com/img/tlj/icon_tlj.png", msg.getMsgType().getDesc(),
+ msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackOneStageReward
|| msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackTwoStageReward
|| msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackThreeStageReward) { // 绾㈠寘閭�璇疯幏寰�
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));
@@ -766,7 +826,7 @@
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶� 娉�", COLOR_TITLE), contentList));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
return new UserMsgVO("http://img.flqapp.com/img/tlj/icon_tlj.png", "绾㈠寘鎻愰啋",
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
@@ -802,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));
@@ -855,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));
@@ -988,12 +1052,8 @@
return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite.png", dto.getTitle(),
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
- } else if (msgType == MsgTypeInviteTypeEnum.inviteNew) {
- if (StringUtil.isNullOrEmpty(msg.getDesc()))
- return null;
-
- MsgInviteContentDTO dto = new Gson().fromJson(msg.getDesc(), MsgInviteContentDTO.class);
- if (dto == null)
+ } else if (msgType == MsgTypeInviteTypeEnum.inviteSucceed) {
+ if (msg.getInviteUser() == null || msg.getInviteUser().getWorker() == null)
return null;
List<CommonMsgItemVO> items = new ArrayList<>();
@@ -1001,22 +1061,14 @@
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(dto.getState() + "", COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO("閭�璇烽槦鍛樻垚鍔�", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇风姸鎬�", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(dto.getMode() + "", COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐔熺粌浣跨敤", COLOR_TITLE), contentList));
-
- contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(dto.getCode() + "", COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("蹇呰鏉′欢", COLOR_TITLE), contentList));
-
- contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(dto.getInviter() + "", COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("閫夋嫨鏉′欢", COLOR_TITLE), contentList));
+ contentList.add(new ClientTextStyleVO(msg.getDesc() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("绾㈠寘鐩稿叧", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
--
Gitblit v1.8.0