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 | 780 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 776 insertions(+), 4 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 b27a53c..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 @@ -1,31 +1,803 @@ package com.yeshi.fanli.util.factory.msg; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import com.google.gson.Gson; +import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO; +import com.yeshi.fanli.dto.msg.MsgOtherExchangeContentDTO; +import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO; +import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO; 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; import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail; +import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum; import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail; +import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum; +import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail; +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.common.JumpDetailV2; +import com.yeshi.fanli.log.LogHelper; +import com.yeshi.fanli.util.Constant; +import com.yeshi.fanli.util.StringUtil; +import com.yeshi.fanli.util.TimeUtil; +import com.yeshi.fanli.util.account.UserUtil; +import com.yeshi.fanli.vo.msg.ClientTextStyleVO; +import com.yeshi.fanli.vo.msg.CommonMsgItemVO; import com.yeshi.fanli.vo.msg.UserMsgVO; + +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; public class UserMsgVOFactory { - public static UserMsgVO create(MsgOrderDetail msg) { + private final static String COLOR_TITLE = "#888888"; + private final static String COLOR_CONTENT = "#000000"; + private final static String COLOR_HIGHLIGHT_CONTENT = "#E5005C"; - return null; + private static BigDecimal filterMoney(BigDecimal money) { + if (money == null) + return null; + else + return money.setScale(2); } + /** + * 璁㈠崟娑堟伅 + * + * @param msg + * @return + */ + public static UserMsgVO create(MsgOrderDetail msg, JumpDetailV2 jumpDetail, JSONObject params) { + + UserMsgVO vo = new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_order.png", "璁㈠崟娑堟伅", + msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), null); + + 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)); + + 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( + TimeUtil.getGernalTime(msg.getHappendDate().getTime(), "yyyy.MM.dd HH:mm"), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愪氦鏃堕棿", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(msg.getState() == 1 ? "璁㈠崟鎵惧洖鎴愬姛" : "璁㈠崟鎵惧洖澶辫触", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵惧洖鐘舵��", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(msg.getState() == 1 ? "楼" + filterMoney(msg.getPayMoney()) : "鏃�", + COLOR_HIGHLIGHT_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵惧洖閲戦", COLOR_TITLE), contentList)); + + } else { + + 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, true)); + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO("鍏�", COLOR_CONTENT)); + 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(msg.getType().getDesc(), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟绫诲瀷", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + if (msg.getState() == MsgOrderDetail.STATE_FK) + contentList.add(new ClientTextStyleVO("宸蹭粯娆�", COLOR_HIGHLIGHT_CONTENT)); + else if (msg.getState() == MsgOrderDetail.STATE_JS) + contentList.add(new ClientTextStyleVO("宸叉敹璐�", COLOR_HIGHLIGHT_CONTENT)); + else if (msg.getState() == MsgOrderDetail.STATE_SX) + contentList.add(new ClientTextStyleVO("鏈粯娆�/宸查��娆�", COLOR_HIGHLIGHT_CONTENT)); + else if (msg.getState() == MsgOrderDetail.STATE_WQ) + 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)); + + if (msg.getType() == MsgTypeOrderTypeEnum.fanli) + items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄閲戦", COLOR_TITLE), contentList)); + else if (msg.getType() == MsgTypeOrderTypeEnum.share) + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍒嗕韩濂栭噾", COLOR_TITLE), contentList)); + else if (msg.getType() == MsgTypeOrderTypeEnum.invite) + items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇峰閲�", COLOR_TITLE), contentList)); + + vo.setJumpDetail(jumpDetail); + if (params != null) + vo.setParams(params.toString()); + } + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(), + COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList)); + + vo.setContentItems(items); + return vo; + } + + /** + * 璧勯噾娑堟伅 + * + * @param msg + * @return + */ public static UserMsgVO create(MsgMoneyDetail msg) { + List<CommonMsgItemVO> items = new ArrayList<>(); + + List<ClientTextStyleVO> contentList = new ArrayList<>(); + + // 鎻愮幇 + if (msg.getMsgType() == MsgTypeMoneyTypeEnum.extract) { + + BindingAccount ba = new BindingAccount(); + ba.setAccount(msg.getExtract().getAccount()); + ba.setName(msg.getExtract().getName()); + ba = UserUtil.filterBindingAccount(ba); + + contentList.add(new ClientTextStyleVO("鏀粯瀹濓細" + ba.getName() + " " + ba.getAccount(), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇璐﹀彿", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + contentList.add( + new ClientTextStyleVO("楼" + filterMoney(msg.getExtract().getMoney()), COLOR_HIGHLIGHT_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + if (msg.getExtract().getState() == Extract.STATE_NOT_PROCESS + || msg.getExtract().getState() == Extract.STATE_PROCESSING) + contentList.add(new ClientTextStyleVO("浜哄伐瀹℃牳涓�", COLOR_HIGHLIGHT_CONTENT)); + else if (msg.getExtract().getState() == Extract.STATE_PASS) + contentList.add(new ClientTextStyleVO("宸查�氳繃", COLOR_HIGHLIGHT_CONTENT)); + else if (msg.getExtract().getState() == Extract.STATE_REJECT) + contentList.add(new ClientTextStyleVO("鎻愮幇琚嫆缁�", COLOR_HIGHLIGHT_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇鐘舵��", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + if (msg.getExtract().getState() == Extract.STATE_NOT_PROCESS + || msg.getExtract().getState() == Extract.STATE_PROCESSING) + contentList.add(new ClientTextStyleVO("鏃�", COLOR_CONTENT)); + else if (msg.getExtract().getState() == Extract.STATE_PASS) + contentList.add(new ClientTextStyleVO("鏃�", COLOR_CONTENT)); + else if (msg.getExtract().getState() == Extract.STATE_REJECT) + contentList.add(new ClientTextStyleVO(msg.getExtract().getReason(), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵�佽鏄�", COLOR_TITLE), contentList)); + + if (msg.getExtract().getState() != Extract.STATE_REJECT) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(TimeUtil.getGernalTime( + msg.getExtract().getExtractTime() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd HH:mm"), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰勮鍒拌处", COLOR_TITLE), contentList)); + } + if (msg.getExtract().getState() == Extract.STATE_PASS) {// + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO( + TimeUtil.getGernalTime(msg.getExtract().getReceiveTime().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)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList)); + return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_extract.png", "鎻愮幇", + msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items); + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.extractValid) { + BindingAccount ba = new BindingAccount(); + ba.setAccount(msg.getAlipayAccountValid().getAccount()); + ba.setName(msg.getAlipayAccountValid().getName()); + ba = UserUtil.filterBindingAccount(ba); + + // 鏀粯瀹濋獙璇� + contentList.add(new ClientTextStyleVO("鏀粯瀹濓細" + ba.getName() + " " + ba.getAccount(), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇璐﹀彿", COLOR_CONTENT), 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("楠岃瘉鎴愬姛", COLOR_HIGHLIGHT_CONTENT)); + 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)); + + 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_extract.png", "鎻愮幇璐﹀彿楠岃瘉", + msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items); + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.fanli) { + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), 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("鍏�", COLOR_CONTENT)); + 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.invite || msg.getMsgType() == MsgTypeMoneyTypeEnum.share) { + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + + // 閭�璇峰閲�,鍒嗕韩濂栭噾 + + contentList.add(new ClientTextStyleVO(msg.getOrderCount() + "", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鏁伴噺", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO("鍏�", COLOR_CONTENT)); + 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)); + + Calendar ca = Calendar.getInstance(); + ca.setTime(msg.getCreateTime()); + ca.add(Calendar.MONTH, -1); + String date = ca.get(Calendar.YEAR) + "骞�" + (ca.get(Calendar.MONTH) + 1) + "鏈�"; + + if (msg.getMsgType() == MsgTypeMoneyTypeEnum.share) + return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_share_money.png", + date + msg.getMsgType().getDesc(), + msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items); + else + return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite_money.png", + date + msg.getMsgType().getDesc(), + msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items); + + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.fanliWeiQuan) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), 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("璁㈠崟缁存潈", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵i櫎璇存槑", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "", COLOR_HIGHLIGHT_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄鎵i櫎", 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.getMsgType().getDesc(), + msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items); + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.shareWeiQuan) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), 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("璁㈠崟缁存潈", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵i櫎璇存槑", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "", COLOR_HIGHLIGHT_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("濂栭噾鎵i櫎", 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_share_money.png", + msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), + items); + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.inviteWeiQuan) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), 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("璁㈠崟缁存潈", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵i櫎璇存槑", COLOR_TITLE), contentList)); + + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "", COLOR_HIGHLIGHT_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("濂栭噾鎵i櫎", 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_invite_money.png", + msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), + items); + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.orderReward) {// 濂栧姳璁㈠崟 + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), 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)); + 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_order_reward.png", + msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), + items); + } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.systemEqualize) {// 绯荤粺琛ュ伩 + 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.getOrderId() + "", COLOR_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/money_detail/icon_system.png", + msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), + items); + } + return null; } + /** + * 璐﹀彿娑堟伅 + * + * @param msg + * @return + */ public static UserMsgVO create(MsgAccountDetail msg) { + List<CommonMsgItemVO> items = new ArrayList<>(); + List<ClientTextStyleVO> contentList = new ArrayList<>(); - return null; + contentList.add(new ClientTextStyleVO(msg.getTitle() + "", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("浜嬮」", COLOR_TITLE), contentList)); + + // 鐘舵�佷慨鏀� + contentList = new ArrayList<>(); + + int fromIndex = 0; + int toIndex = 0; + String stateDesc = msg.getContent(); + if (msg.getType() == MsgTypeAccountTypeEnum.taoBaoAuthFail) {// 娣樺疂鎺堟潈澶辫触 + JSONArray array = JSONArray.fromObject(stateDesc); + for (int i = 0; i < array.size(); i++) { + String name = array.optJSONObject(i).optString("name"); + String content = array.optJSONObject(i).optString("content"); + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(content, i > 0 ? COLOR_HIGHLIGHT_CONTENT : COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO(name, COLOR_TITLE), contentList)); + } + + } else { + while (stateDesc.indexOf("<highlight>") > -1) { + fromIndex = stateDesc.indexOf("<highlight>"); + toIndex = stateDesc.indexOf("</highlight>"); + String content1 = stateDesc.substring(0, fromIndex); + String content2 = stateDesc.substring(fromIndex + "<highlight>".length(), toIndex); + stateDesc = stateDesc.substring(toIndex + "</highlight>".length(), stateDesc.length()); + + if (!StringUtil.isNullOrEmpty(content1)) { + contentList.add(new ClientTextStyleVO(content1, COLOR_CONTENT)); + } + if (!StringUtil.isNullOrEmpty(content2)) { + contentList.add(new ClientTextStyleVO(content2, COLOR_HIGHLIGHT_CONTENT)); + } + } + if (!StringUtil.isNullOrEmpty(stateDesc)) { + contentList.add(new ClientTextStyleVO(stateDesc, 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_account.png", msg.getType().getDesc(), + msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items); } + /** + * 閭�璇锋秷鎭� + * + * @param msg + * @return + */ public static UserMsgVO create(MsgInviteDetail msg) { + if (msg.getInviteUser() == null || msg.getInviteUser().getWorker() == null) + return null; + List<CommonMsgItemVO> items = new ArrayList<>(); + List<ClientTextStyleVO> contentList = new ArrayList<>(); + LogHelper.test("閭�璇锋秷鎭�:" + new Gson().toJson(msg)); + contentList.add(new ClientTextStyleVO(msg.getInviteUser().getWorker().getNickName() + "", COLOR_CONTENT, + msg.getInviteUser().getWorker().getPortrait())); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("琚個璇蜂汉", COLOR_TITLE), contentList)); - return null; + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(msg.getDesc() + "", 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_invite.png", msg.getMsgType().getDesc(), + msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items); + } + + /** + * 鍏朵粬娑堟伅 + * + * @param msg + * @return + */ + public static UserMsgVO create(MsgOtherDetail msg) { + List<CommonMsgItemVO> items = new ArrayList<>(); + + String icon = null; + + if (msg.getType() == MsgTypeOtherTypeEnum.couponMianDan + || msg.getType() == MsgTypeOtherTypeEnum.couponWelfareMianDan + || msg.getType() == MsgTypeOtherTypeEnum.couponReward) { + + if (StringUtil.isNullOrEmpty(msg.getContent())) + return null; + MsgOtherCouponContentDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherCouponContentDTO.class); + if (dto == null) + return null; + + icon = "http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"; + + List<ClientTextStyleVO> contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getState(), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵��", COLOR_TITLE), contentList)); + + if (!StringUtil.isNullOrEmpty(dto.getOrderId())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getOrderId() + "", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList)); + } + + if (dto.getFanLiMoney() != null) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO("楼" + filterMoney(dto.getFanLiMoney()), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰勪及杩斿埄", COLOR_TITLE), contentList)); + } + + if (dto.getOrderFanLiMoney() != null) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO("楼" + filterMoney(dto.getOrderFanLiMoney()), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟杩斿埄", COLOR_TITLE), contentList)); + } + + if (dto.getRewardMoney() != null) { + contentList = new ArrayList<>(); + contentList + .add(new ClientTextStyleVO("楼" + filterMoney(dto.getRewardMoney()), COLOR_HIGHLIGHT_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)); + } + + if (!StringUtil.isNullOrEmpty(dto.getStartTime()) && !StringUtil.isNullOrEmpty(dto.getEndTime())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getStartTime() + "-" + dto.getEndTime(), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鏈夋晥鏈�", COLOR_TITLE), contentList)); + } + + if (dto.getLeftDay() != null) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getLeftDay() + "", COLOR_HIGHLIGHT_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)); + } + + if (!StringUtil.isNullOrEmpty(dto.getDesc())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.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(), + COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList)); + + } else if (msg.getType() == MsgTypeOtherTypeEnum.taoLiJin) { + if (StringUtil.isNullOrEmpty(msg.getContent())) + return null; + + MsgOtherTaoLiJinContentDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherTaoLiJinContentDTO.class); + if (dto == null) + return null; + + icon = "http://img.flqapp.com/resource/msg/icon_msg_other_tlj.png"; + + List<ClientTextStyleVO> contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getState(), 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)); + } + + if (!StringUtil.isNullOrEmpty(dto.getTimeDesc())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getTimeDesc() + "", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鏃堕棿", COLOR_TITLE), contentList)); + } + + if (dto.getMoney() != null) { + contentList = new ArrayList<>(); + contentList.add( + new ClientTextStyleVO("楼" + filterMoney(dto.getMoney().setScale(2)), COLOR_HIGHLIGHT_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("闈㈤", COLOR_TITLE), contentList)); + } + + if (!StringUtil.isNullOrEmpty(dto.getReason())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getReason() + "", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍘熷洜", COLOR_TITLE), contentList)); + } + + if (!StringUtil.isNullOrEmpty(dto.getResult())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getResult() + "", 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)); + + } else if (msg.getType() == MsgTypeOtherTypeEnum.give) { + if (StringUtil.isNullOrEmpty(msg.getContent())) + return null; + + MsgOtherGiveContentDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherGiveContentDTO.class); + if (dto == null) + return null; + + String type = dto.getType(); + if (type == null) + return null; + + if (MsgOtherGiveContentDTO.TYEP_COUPON.equalsIgnoreCase(type)) { + icon = "http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"; + } else { + icon = "http://img.flqapp.com/resource/msg/icon_msg_other_tlj.png"; + } + + + List<ClientTextStyleVO> contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getGiveType(), COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犻�佺被鍒�", COLOR_TITLE), contentList)); + + if (!StringUtil.isNullOrEmpty(dto.getReceiveInfo())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getReceiveInfo() + "", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰嗗彇鐢ㄦ埛", COLOR_TITLE), contentList)); + } + + if (!StringUtil.isNullOrEmpty(dto.getGiveTime())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getGiveTime() + "", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犻�佹椂闂�", COLOR_TITLE), contentList)); + } + + + if (!StringUtil.isNullOrEmpty(dto.getReceiveTime())) { + contentList = new ArrayList<>(); + 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(), + 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; + } else if (msg.getType() == MsgTypeOtherTypeEnum.exchange) { + if (StringUtil.isNullOrEmpty(msg.getContent())) + return null; + + MsgOtherExchangeContentDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherExchangeContentDTO.class); + if (dto == null) + return null; + + 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)); + + if (!StringUtil.isNullOrEmpty(dto.getExpend())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getExpend() + "", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("娑堣��", COLOR_TITLE), contentList)); + } + + if (!StringUtil.isNullOrEmpty(dto.getTotalGold())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getTotalGold() + "", COLOR_CONTENT)); + items.add(new CommonMsgItemVO(new ClientTextStyleVO("閲戝竵鎬绘暟", COLOR_TITLE), contentList)); + } + + if (!StringUtil.isNullOrEmpty(dto.getThing())) { + contentList = new ArrayList<>(); + contentList.add(new ClientTextStyleVO(dto.getThing() + "", 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(icon, msg.getType().getDesc(), + msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items); } } -- Gitblit v1.8.0