From 39c683421f75449c7a85280fa499bae3a2f5241b Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 26 八月 2019 09:27:49 +0800 Subject: [PATCH] 金币领取 --- fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 19 ++++++++++++++++--- 1 files changed, 16 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 b58202e..f2df404 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 @@ -626,7 +626,15 @@ if (dto.getLeftDay() != null) { contentList = new ArrayList<>(); contentList.add(new ClientTextStyleVO(dto.getLeftDay() + "", COLOR_HIGHLIGHT_CONTENT)); - contentList.add(new ClientTextStyleVO("澶�", COLOR_CONTENT)); + + if (msg.getType() == MsgTypeOtherTypeEnum.couponReward) { + contentList.add(new ClientTextStyleVO("澶╋紙鏈娇鐢ㄥ皢浼氳繃鏈燂級", COLOR_CONTENT)); + } else if (msg.getType() == MsgTypeOtherTypeEnum.couponMianDan) { + contentList.add(new ClientTextStyleVO("澶╋紙鏈娇鐢ㄥ皢浼氳繃鏈燂級", COLOR_CONTENT)); + } else { + contentList.add(new ClientTextStyleVO("澶�", COLOR_CONTENT)); + } + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍓╀綑澶╂暟", COLOR_TITLE), contentList)); } @@ -732,6 +740,12 @@ contentList.add(new ClientTextStyleVO(dto.getReceiveTime() + "", COLOR_CONTENT)); items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰嗗彇鏃堕棿", COLOR_TITLE), contentList)); } + + if (!StringUtil.isNullOrEmpty(dto.getReturnTime())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getReturnTime() + "", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("閫�鍥炴椂闂�", COLOR_TITLE), contentList)); + } contentList = new ArrayList<>(); contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(), @@ -752,9 +766,8 @@ if (dto == null) return null; - icon = "http://img.flqapp.com/resource/msg/icon_msg_other_tlj.png"; + icon = "http://img.flqapp.com/resource/msg/icon_msg_other_integral.png"; - List<ClientTextStyleVO> contentList = new ArrayList<>(); contentList.add(new ClientTextStyleVO(dto.getState(), COLOR_CONTENT)); items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵��", COLOR_TITLE), contentList)); -- Gitblit v1.8.0