1.5.7版本需求

admin

2019-07-09 531d93708df8017e59830f15b41f3cc42d6126e6

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

@@ -18,6 +18,7 @@
import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;

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

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

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

@@ -25,6 +26,8 @@
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

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

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



import net.sf.json.JSONObject;



public class UserMsgVOFactory {



@@ -45,7 +48,10 @@
    * @param msg

    * @return

    */

   public static UserMsgVO create(MsgOrderDetail msg) {

   public static UserMsgVO create(MsgOrderDetail msg, JumpDetailV2 jumpDetail, JSONObject params) {



      UserMsgVO vo = new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_order.png", "订单消息",

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



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

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

@@ -73,7 +79,7 @@


      } else {

         contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("订单号", COLOR_TITLE), contentList));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("订单号", COLOR_TITLE), contentList,true));



         contentList = new ArrayList<>();

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

@@ -98,13 +104,11 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("订单状态", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" +filterMoney(msg.getPayMoney()),

               COLOR_HIGHLIGHT_CONTENT));

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getPayMoney()), COLOR_HIGHLIGHT_CONTENT));

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



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getHongBaoMoney()),

               COLOR_HIGHLIGHT_CONTENT));

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getHongBaoMoney()), COLOR_HIGHLIGHT_CONTENT));



         if (msg.getType() == MsgTypeOrderTypeEnum.fanli)

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

@@ -112,14 +116,18 @@
            items.add(new CommonMsgItemVO(new ClientTextStyleVO("分享奖金", COLOR_TITLE), contentList));

         else if (msg.getType() == MsgTypeOrderTypeEnum.invite)

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("邀请奖金", COLOR_TITLE), contentList));



         vo.setJumpDetail(jumpDetail);

         if (params != null)

            vo.setParams(params.toString());

      }

      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/resource/msg/icon_msg_order.png", "订单消息",

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

      vo.setContentItems(items);

      return vo;

   }



   /**

@@ -146,8 +154,8 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("提现账号", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" +filterMoney(msg.getExtract().getMoney()),

               COLOR_HIGHLIGHT_CONTENT));

         contentList.add(

               new ClientTextStyleVO("¥" + filterMoney(msg.getExtract().getMoney()), COLOR_HIGHLIGHT_CONTENT));

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



         contentList = new ArrayList<>();

@@ -201,8 +209,7 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("提现账号", COLOR_CONTENT), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()),

               COLOR_HIGHLIGHT_CONTENT));

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

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



         contentList = new ArrayList<>();

@@ -232,13 +239,11 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("商品数量", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()) + "",

               COLOR_HIGHLIGHT_CONTENT));

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

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



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "",

               COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("账号余额", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

@@ -263,13 +268,11 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("奖金商品", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()) + "",

               COLOR_HIGHLIGHT_CONTENT));

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

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



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "",

               COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("账号余额", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

@@ -300,13 +303,11 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("扣除说明", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()) + "",

               COLOR_HIGHLIGHT_CONTENT));

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

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("返利扣除", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "",

               COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("账号余额", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

@@ -325,13 +326,11 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("扣除说明", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()) + "",

               COLOR_HIGHLIGHT_CONTENT));

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

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



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "",

               COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("账号余额", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

@@ -351,13 +350,11 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("扣除说明", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()) + "",

               COLOR_HIGHLIGHT_CONTENT));

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

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



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "",

               COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("账号余额", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

@@ -373,13 +370,11 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("奖励订单", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()) + "",

               COLOR_HIGHLIGHT_CONTENT));

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

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



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "",

               COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("账号余额", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

@@ -505,22 +500,20 @@


         if (dto.getFanLiMoney() != null) {

            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO("¥" + filterMoney(dto.getFanLiMoney()),

                  COLOR_CONTENT));

            contentList.add(new ClientTextStyleVO("¥" + filterMoney(dto.getFanLiMoney()), COLOR_CONTENT));

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("预估返利", COLOR_TITLE), contentList));

         }



         if (dto.getOrderFanLiMoney() != null) {

            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO("¥" + filterMoney(dto.getOrderFanLiMoney()),

                  COLOR_CONTENT));

            contentList.add(new ClientTextStyleVO("¥" + filterMoney(dto.getOrderFanLiMoney()), COLOR_CONTENT));

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("订单返利", COLOR_TITLE), contentList));

         }



         if (dto.getRewardMoney() != null) {

            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO("¥" + filterMoney(dto.getRewardMoney()),

                  COLOR_HIGHLIGHT_CONTENT));

            contentList

                  .add(new ClientTextStyleVO("¥" + filterMoney(dto.getRewardMoney()), COLOR_HIGHLIGHT_CONTENT));

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

         }



@@ -576,8 +569,8 @@
         

         if (dto.getMoney() != null) {

            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO("¥" + filterMoney(dto.getMoney().setScale(2)),

                  COLOR_HIGHLIGHT_CONTENT));

            contentList.add(

                  new ClientTextStyleVO("¥" + filterMoney(dto.getMoney().setScale(2)), COLOR_HIGHLIGHT_CONTENT));

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

         }

         

@@ -588,7 +581,8 @@
         

      }



      return new UserMsgVO(icon, msg.getType().getDesc(),   msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);

      return new UserMsgVO(icon, msg.getType().getDesc(),

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

   }



}