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

yujian

2019-11-25 59bfbce44674e52aefbe883233ffaea93d750a8f

 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java

@@ -741,6 +741,7 @@


         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;

@@ -751,6 +752,7 @@
            return null;



         contentList = new ArrayList<>();



         contentList.add(new ClientTextStyleVO(dto.getReason() + "", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("原因", COLOR_TITLE), contentList));



@@ -761,7 +763,6 @@
         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(),

@@ -805,7 +806,8 @@
         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;



@@ -860,19 +862,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("人工审核["+ 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<>();

@@ -913,14 +918,15 @@


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

         }