From 3ce9e928e082ff8abf697dba560cbfbb412e89f8 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 11 十一月 2019 15:45:02 +0800 Subject: [PATCH] 商城后台编辑 --- fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 335 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 332 insertions(+), 3 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 dd69b1d..44c4f3f 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 @@ -14,6 +14,9 @@ import com.yeshi.fanli.dto.msg.MsgOtherRewardIntegralDTO; import com.yeshi.fanli.dto.msg.MsgOtherSystemGiveDTO; import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO; +import com.yeshi.fanli.dto.msg.MsgRedPackAddContentDTO; +import com.yeshi.fanli.dto.msg.MsgRedPackExchangeContentDTO; +import com.yeshi.fanli.dto.msg.MsgRedPackGiveContentDTO; import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail; import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail.MsgTypeAccountTypeEnum; import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail; @@ -26,6 +29,7 @@ import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum; import com.yeshi.fanli.entity.bus.user.BindingAccount; import com.yeshi.fanli.entity.bus.user.Extract; +import com.yeshi.fanli.entity.bus.user.HongBaoV2; import com.yeshi.fanli.entity.common.JumpDetailV2; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.util.Constant; @@ -66,7 +70,6 @@ List<CommonMsgItemVO> items = new ArrayList<>(); List<ClientTextStyleVO> contentList = new ArrayList<>(); if (msg.getType() == MsgTypeOrderTypeEnum.found) { - contentList = new ArrayList<>(); contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT)); items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList)); @@ -93,8 +96,43 @@ COLOR_HIGHLIGHT_CONTENT)); items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵惧洖閲戦", COLOR_TITLE), contentList)); - } else { + } else if (msg.getType() == MsgTypeOrderTypeEnum.elme) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList)); + String orderId = msg.getOrderId(); + MsgTypeOrderTypeEnum type = msg.getType(); + if (type == MsgTypeOrderTypeEnum.invite || type == MsgTypeOrderTypeEnum.share) { + orderId = UserUtil.filterOrderId(orderId); + } + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(orderId, COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList, false)); + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(msg.getType().getDesc(), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟绫诲瀷", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + if (msg.getState() == HongBaoV2.STATE_BUKELINGQU||msg.getState() == HongBaoV2.STATE_KELINGQU) + contentList.add(new ClientTextStyleVO("宸蹭粯娆�", COLOR_HIGHLIGHT_CONTENT)); + else if (msg.getState() == HongBaoV2.STATE_SHIXIAO) + contentList.add(new ClientTextStyleVO("鏈粯娆�/宸查��娆�", COLOR_HIGHLIGHT_CONTENT)); + + items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鐘舵��", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getPayMoney()), COLOR_HIGHLIGHT_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("浠樻閲戦", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getHongBaoMoney()), COLOR_HIGHLIGHT_CONTENT)); + + items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄閲戦", COLOR_TITLE), contentList)); + if (params != null) + vo.setParams(params.toString()); + } else { contentList = new ArrayList<>(); contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT)); items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList)); @@ -270,6 +308,33 @@ contentList.add(new ClientTextStyleVO(msg.getGoodsCount() + "", COLOR_HIGHLIGHT_CONTENT)); contentList.add(new ClientTextStyleVO("浠跺晢鍝�", COLOR_CONTENT)); items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍟嗗搧鏁伴噺", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "", COLOR_HIGHLIGHT_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄閲戦", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "", 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/resource/msg/icon_msg_fanli.png", "杩斿埄鍒拌处", + msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items); + + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.fanliElme) { + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO("楗夸簡涔�", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + // 杩斿埄鍒拌处 + contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList)); contentList = new ArrayList<>(); contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "", COLOR_HIGHLIGHT_CONTENT)); @@ -494,8 +559,225 @@ return new UserMsgVO("http://img.flqapp.com/resource/money_detail/icon_system.png", msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items); - } + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.subSidy) { // 棰濆琛ヨ创 + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(msg.getStateDesc(), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("绫诲埆", COLOR_TITLE), contentList)); + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()), COLOR_HIGHLIGHT_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("閲戦", COLOR_TITLE), contentList)); + + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(msg.getDesc(), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鏉ユ簮", COLOR_TITLE), contentList)); + + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.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/resource/msg/icon_msg_subsidy.png", + msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), + items); + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackReceiveOff) { // 绾㈠寘鎴愬姛棰嗗彇 + if (StringUtil.isNullOrEmpty(msg.getContent())) + return null; + + MsgRedPackGiveContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackGiveContentDTO.class); + if (dto == null) + return null; + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getUserInfo() + "", 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.getMoney() + "", 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/resource/msg/icon_hongbao_give.png", + dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), + items); + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackGiveOff) { // 绾㈠寘琚垚鍔熼鍙� + if (StringUtil.isNullOrEmpty(msg.getContent())) + return null; + + MsgRedPackGiveContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackGiveContentDTO.class); + if (dto == null) + return null; + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getUserInfo() + "", 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.getMoney() + "", 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/resource/msg/icon_hongbao_give.png", + dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), + items); + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackGiveBack) { // 绾㈠寘鏈棰嗗彇閫�鍥� + if (StringUtil.isNullOrEmpty(msg.getContent())) + return null; + + MsgRedPackGiveContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackGiveContentDTO.class); + if (dto == null) + return null; + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getTitle() + "", 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.getGiveTime() + "", 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(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(), + COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList)); + + return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_hongbao_give.png", + MsgTypeMoneyTypeEnum.redPackGiveBack.getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), + items); + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackExchangePass) { // 绾㈠寘鎻愮幇鎴愬姛 + 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(msg.getMsgType().getDesc() + "", 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(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/resource/msg/icon_hongbao_tixian.png", + dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), + items); + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackExchangeReject) { // 绾㈠寘鎻愮幇鎷掔粷 + 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(msg.getMsgType().getDesc() + "", 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.getReason() + "", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶辫触鍘熷洜", COLOR_TITLE), contentList)); + + String handle = dto.getHandle(); + if (StringUtil.isNullOrEmpty(handle)) + handle = "鏃�"; + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(handle, 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/resource/msg/icon_hongbao_tixian.png", + dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), + items); + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackNewUserReward + || msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackInviteSucceed + || msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackFirstSharedOrder + || msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackMonthSharedOrder) { // 绾㈠寘閭�璇疯幏寰� + if (StringUtil.isNullOrEmpty(msg.getContent())) + return null; + + MsgRedPackAddContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackAddContentDTO.class); + if (dto == null) + return null; + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(msg.getMsgType().getDesc() + "", 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", + dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), + items); + } return null; } @@ -1015,6 +1297,53 @@ userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime()); userMsgVO.setContentItems(items); return userMsgVO; + } else if (msg.getType() == MsgTypeOtherTypeEnum.taoLiJinExchange) { + if (StringUtil.isNullOrEmpty(msg.getContent())) + return null; + + MsgOtherRewardIntegralDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherRewardIntegralDTO.class); + if (dto == null) + return null; + + icon = "http://img.flqapp.com/resource/msg/icon_msg_other_system_give.png"; + + List<ClientTextStyleVO> contentList = new ArrayList<>(); + + if (!StringUtil.isNullOrEmpty(dto.getExplain())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getExplain() + "", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍘熷洜", COLOR_TITLE), contentList)); + } + + if (dto.getTotal() != null) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getTotal(), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍙垯绠楅", COLOR_TITLE), contentList)); + } + + if (!StringUtil.isNullOrEmpty(dto.getNum())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getNum() + "", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎶樼畻閲戝竵", COLOR_TITLE), contentList)); + } + + if (!StringUtil.isNullOrEmpty(dto.getSource())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getSource(), 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)); + + UserMsgVO userMsgVO = new UserMsgVO(); + userMsgVO.setIcon(icon); + userMsgVO.setTitle(dto.getTitle()); + userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime()); + userMsgVO.setContentItems(items); + return userMsgVO; } return new UserMsgVO(icon, msg.getType().getDesc(), -- Gitblit v1.8.0