2.1需求

yujian

2020-05-09 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64

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

@@ -8,7 +8,6 @@
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;

import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail.MsgTypeAccountTypeEnum;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.msg.CommonMsgItemVO;

@@ -119,7 +118,7 @@
      

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

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("绑定详情", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO("恭喜你！" + info +"-"+ way, ClientTextStyleVO.COLOR_CONTENT)));

            new ClientTextStyleVO("很抱歉！" + info +"-"+ way, ClientTextStyleVO.COLOR_CONTENT)));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("绑定账号", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO(typeName, ClientTextStyleVO.COLOR_CONTENT)));

      if (!StringUtil.isNullOrEmpty(reason)) {

@@ -156,7 +155,7 @@
            new ClientTextStyleVO("邀请码修改", ClientTextStyleVO.COLOR_CONTENT)));

      

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

      contentList2.add(new ClientTextStyleVO(String.format("你原邀请码:%s已经成功修改为新邀请码:", oldCode), ClientTextStyleVO.COLOR_CONTENT));

      contentList2.add(new ClientTextStyleVO(String.format("你原邀请码:%s 已经成功修改为新邀请码:", oldCode), ClientTextStyleVO.COLOR_CONTENT));

      contentList2.add(new ClientTextStyleVO(newCode, ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("修改详情", ClientTextStyleVO.COLOR_TITLE),contentList2));

      

@@ -200,26 +199,22 @@
    * @param beizu

    * @return

    */

   public static MsgAccountDetail vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, 
          Long targetNum2, Integer type, String beizu) {

   public static MsgAccountDetail vipPreUpgrade(Long uid, String originalName, String upName, int days,  long targetNum1, 
          Long targetNum2, boolean teamPass) {

      if (uid == null || originalName == null || upName == null)

         return null;

      

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

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

      contentList.add(new ClientTextStyleVO("恭喜你！有效", ClientTextStyleVO.COLOR_CONTENT));

      if (type == null) {

      if (teamPass) {

         contentList.add(new ClientTextStyleVO("直接粉丝已达", ClientTextStyleVO.COLOR_CONTENT));

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

         contentList.add(new ClientTextStyleVO("人，有效间接粉丝已达", ClientTextStyleVO.COLOR_CONTENT));

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

         contentList.add(new ClientTextStyleVO("人", ClientTextStyleVO.COLOR_CONTENT));

      } else if (type == Constant.TYPE_REBATE) {

         contentList.add(new ClientTextStyleVO("返利订单已达", ClientTextStyleVO.COLOR_CONTENT));

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

         contentList.add(new ClientTextStyleVO("笔", ClientTextStyleVO.COLOR_CONTENT));

      } else if (type == Constant.TYPE_SHAER) {

         contentList.add(new ClientTextStyleVO("分享订单已达", ClientTextStyleVO.COLOR_CONTENT));

      } else {

         contentList.add(new ClientTextStyleVO("返利+分享订单已达", ClientTextStyleVO.COLOR_CONTENT));

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

         contentList.add(new ClientTextStyleVO("笔", ClientTextStyleVO.COLOR_CONTENT));

      }

@@ -239,10 +234,9 @@
            new ClientTextStyleVO("从收到本消息起，你将获得该账户等级对应的全部权益", ClientTextStyleVO.COLOR_CONTENT)));

      

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("备注", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO(StringUtil.isNullOrEmpty(beizu)?"无":beizu, ClientTextStyleVO.COLOR_CONTENT)));

            new ClientTextStyleVO("无", ClientTextStyleVO.COLOR_CONTENT)));

      

      MsgAccountDetail detail = new MsgAccountDetail();

      detail.setBeiZhu(beizu);

      detail.setTitle("等级成长");

      detail.setType(MsgTypeAccountTypeEnum.vipPgrade);

      detail.setUser(new UserInfo(uid));