Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 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));

@@ -768,7 +781,7 @@
         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));

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("剩余", COLOR_TITLE), contentList));

         }



         if (!StringUtil.isNullOrEmpty(dto.getThing())) {