商城后台编辑

yujian

2019-11-11 3ce9e928e082ff8abf697dba560cbfbb412e89f8

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

@@ -683,7 +683,7 @@
            return null;

         

         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO(MsgTypeMoneyTypeEnum.redPackExchangePass.getDesc() + "", COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO(msg.getMsgType().getDesc() + "", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("类别", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

@@ -719,7 +719,7 @@
            return null;

         

         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO(MsgTypeMoneyTypeEnum.redPackExchangePass.getDesc() + "", COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO(msg.getMsgType().getDesc() + "", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("类别", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

@@ -763,7 +763,7 @@


         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO(dto.getMoney() + "", COLOR_HIGHLIGHT_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("金额", COLOR_TITLE), contentList));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("金        额", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO(dto.getBalance() + "", COLOR_HIGHLIGHT_CONTENT));

@@ -1297,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(),