邀请对应奖励红包加入版本区分

yujian

2019-06-26 020d940ae4e16f55f69cef3dd4c8dc0b9764af07

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

@@ -1,11 +1,13 @@
package com.yeshi.fanli.util.factory.msg;



import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.List;



import com.google.gson.Gson;

import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;

import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;

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

import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;

import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;

@@ -17,7 +19,6 @@
import com.yeshi.fanli.entity.bus.user.BindingAccount;

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

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.account.UserUtil;

@@ -30,6 +31,13 @@
   private final static String COLOR_TITLE = "#888888";

   private final static String COLOR_CONTENT = "#000000";

   private final static String COLOR_HIGHLIGHT_CONTENT = "#E5005C";



   private static BigDecimal filterMoney(BigDecimal money) {

      if (money == null)

         return null;

      else

      return   money.setScale(2);

   }



   /**

    * 订单消息

@@ -50,7 +58,8 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("订单号", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO(TimeUtil.getGernalTime(msg.getHappendDate().getTime(),"yyyy.MM.dd HH:mm"), COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO(

               TimeUtil.getGernalTime(msg.getHappendDate().getTime(), "yyyy.MM.dd HH:mm"), COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("提交时间", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

@@ -58,7 +67,8 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("找回状态", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO(msg.getState() == 1 ? "¥" + msg.getPayMoney() : "无", COLOR_HIGHLIGHT_CONTENT));

         contentList.add(new ClientTextStyleVO(msg.getState() == 1 ? "¥" +filterMoney( msg.getPayMoney()) : "无",

               COLOR_HIGHLIGHT_CONTENT));

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



      } else {

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



         contentList = new ArrayList<>();

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

         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("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getHongBaoMoney()),

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

               COLOR_HIGHLIGHT_CONTENT));



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

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



         contentList = new ArrayList<>();

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

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

               COLOR_HIGHLIGHT_CONTENT));

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



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



         contentList = new ArrayList<>();

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

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

               COLOR_HIGHLIGHT_CONTENT));

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



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



         contentList = new ArrayList<>();

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

         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("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",

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

               COLOR_CONTENT));

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



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



         contentList = new ArrayList<>();

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

         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("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",

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

               COLOR_CONTENT));

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



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



         contentList = new ArrayList<>();

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

         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("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",

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

               COLOR_CONTENT));

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



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



         contentList = new ArrayList<>();

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

         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("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",

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

               COLOR_CONTENT));

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



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



         contentList = new ArrayList<>();

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

         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("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",

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

               COLOR_CONTENT));

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



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



         contentList = new ArrayList<>();

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

         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("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",

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

               COLOR_CONTENT));

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



@@ -468,6 +478,9 @@
    */

   public static UserMsgVO create(MsgOtherDetail msg) {

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

		
      String icon = null;

		
      if (msg.getType() == MsgTypeOtherTypeEnum.couponMianDan

            || msg.getType() == MsgTypeOtherTypeEnum.couponWelfareMianDan

            || msg.getType() == MsgTypeOtherTypeEnum.couponReward) {

@@ -477,7 +490,9 @@
         MsgOtherCouponContentDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherCouponContentDTO.class);

         if (dto == null)

            return null;



			
         icon = "http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png";

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

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

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("状态", COLOR_TITLE), contentList));

@@ -490,21 +505,21 @@


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

            contentList = new ArrayList<>();

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

            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("¥" + MoneyBigDecimalUtil.getWithNoZera(dto.getOrderFanLiMoney()),

            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("¥" + MoneyBigDecimalUtil.getWithNoZera(dto.getRewardMoney()),

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

                  COLOR_HIGHLIGHT_CONTENT));

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

         }

@@ -538,10 +553,42 @@
         contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "无" : msg.getBeiZhu(),

               COLOR_CONTENT));

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

			
      } else if (msg.getType() == MsgTypeOtherTypeEnum.taoLiJin) {

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

            return null;

			
         MsgOtherTaoLiJinContentDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherTaoLiJinContentDTO.class);

         if (dto == null)

            return null;

			
         icon = "http://img.flqapp.com/resource/msg/icon_msg_other_tlj.png";

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

         contentList.add(new ClientTextStyleVO(dto.getState(), 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));

         }

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

            contentList = new ArrayList<>();

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

                  COLOR_HIGHLIGHT_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/resource/msg/icon_msg_other_coupon.png", 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);

   }



}