双12活动添加,邀请码发布修改，爬单新规则添加

admin

2019-12-06 cd637932a970e7935b17d41568fe89c92775bccc

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

@@ -741,7 +741,37 @@


         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;



         MsgRedPackExchangeContentDTO dto = new Gson().fromJson(msg.getContent(),

               MsgRedPackExchangeContentDTO.class);

         if (dto == null)

            return null;



         contentList = new ArrayList<>();



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

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



         contentList = new ArrayList<>();

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

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("封禁时间", COLOR_TITLE), contentList));



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

               COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("备注", COLOR_TITLE), contentList));



         return new UserMsgVO("http://img.flqapp.com/img/tlj/icon_tlj.png", msg.getMsgType().getDesc(),

               msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);

      } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackDeduct) { // 红包扣除消息

         if (StringUtil.isNullOrEmpty(msg.getContent()))

            return null;



@@ -755,12 +785,12 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("原因", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

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

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("封禁时间", COLOR_TITLE), contentList));

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

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



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO(dto.getHandle(), COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("处理", COLOR_TITLE), contentList));

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

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("红包余额", COLOR_TITLE), contentList));

         



         contentList = new ArrayList<>();

@@ -776,14 +806,15 @@
         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;



         contentList = new ArrayList<>();

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

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

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

@@ -831,21 +862,24 @@


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

         contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "无" : msg.getBeiZhu(),

               COLOR_CONTENT));

@@ -884,21 +918,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(dto.getReason(), 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));

@@ -1020,13 +1055,13 @@
      } else if (msgType == MsgTypeInviteTypeEnum.inviteSucceed) {

         if (msg.getInviteUser() == null || msg.getInviteUser().getWorker() == null)

            return null;

			


         List<CommonMsgItemVO> items = new ArrayList<>();

         List<ClientTextStyleVO> contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO(msg.getInviteUser().getWorker().getNickName() + "", COLOR_CONTENT,

               msg.getInviteUser().getWorker().getPortrait()));

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