订单统计测试中的相关代码的bug修改

admin

2020-04-14 036fc28606e5fcb2203cbc7c4736c99512a522f7

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

@@ -11,15 +11,11 @@
import com.google.gson.Gson;

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

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

import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.TimeUtil;

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

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

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

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

@@ -48,7 +44,7 @@
      List<ClientTextStyleVO> contentList = new ArrayList<>();

      contentList.add(new ClientTextStyleVO("¥" + extract.getMoney().setScale(2), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

      if (!StringUtil.isNullOrEmpty(alipayNo)) {

         contentList.add(new ClientTextStyleVO(String.format("&支付宝订单号： %s", "*" + alipayNo.substring(alipayNo.length() - 10)), ClientTextStyleVO.COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO(String.format("&支付宝订单号: %s", "*" + alipayNo.substring(alipayNo.length() - 10)), ClientTextStyleVO.COLOR_CONTENT));

      }

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("提现金额", ClientTextStyleVO.COLOR_TITLE),contentList));

      

@@ -86,7 +82,7 @@
    * @return

    */

   public static MsgMoneyDetail createAlipayAccountValidMsg(AlipayAccountValidNormalHistory valid, Long uid,

         String appName, BigDecimal money, int limitDay, boolean change) {

         String appName, BigDecimal money, String limitDay, boolean change) {

      if (valid == null || uid == null || appName == null)

         return null;

      

@@ -109,7 +105,7 @@
      List<ClientTextStyleVO> contentList = new ArrayList<>();

      contentList.add(new ClientTextStyleVO(String.format("成功%s的提现账号", changeWay), ClientTextStyleVO.COLOR_CONTENT));

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

      contentList.add(new ClientTextStyleVO("天内无法修改", ClientTextStyleVO.COLOR_CONTENT));

      contentList.add(new ClientTextStyleVO("内无法修改", ClientTextStyleVO.COLOR_CONTENT));

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

      

      

@@ -201,7 +197,7 @@
         sourceName += "-返利订单";

         typeEnum = MsgTypeMoneyTypeEnum.fanli;

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

         fanliName = "分享奖金：";

         fanliName = "分享奖金:";

         sourceName += "-分享订单";

         typeEnum = MsgTypeMoneyTypeEnum.share;

      } 

@@ -217,8 +213,8 @@
            new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));



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

      contentList.add(new ClientTextStyleVO("下单时间：" + TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT));

      contentList.add(new ClientTextStyleVO("-商品数量：共", ClientTextStyleVO.COLOR_CONTENT));

      contentList.add(new ClientTextStyleVO("下单时间:" + TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT));

      contentList.add(new ClientTextStyleVO("-商品数量:共", ClientTextStyleVO.COLOR_CONTENT));

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

      contentList.add(new ClientTextStyleVO("件商品", ClientTextStyleVO.COLOR_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("订单相关", ClientTextStyleVO.COLOR_TITLE), contentList));

@@ -285,8 +281,8 @@
            new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));



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

      contentList.add(new ClientTextStyleVO("下单时间：" + TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT));

      contentList.add(new ClientTextStyleVO("-商品数量：共", ClientTextStyleVO.COLOR_CONTENT));

      contentList.add(new ClientTextStyleVO("下单时间:" + TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT));

      contentList.add(new ClientTextStyleVO("-商品数量:共", ClientTextStyleVO.COLOR_CONTENT));

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

      contentList.add(new ClientTextStyleVO("件商品", ClientTextStyleVO.COLOR_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("订单相关", ClientTextStyleVO.COLOR_TITLE), contentList));

@@ -359,215 +355,185 @@
      return detail;

   }



   /**

    * 邀请赚维权

    * 
    * @param uid

    * @param orderId

    * @param money

    * @param balance

    * @param beiZhu

    * @return

    */

   public static MsgMoneyDetail createInviteWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,

         BigDecimal balance, String beiZhu) {

      if (money == null || orderId == null || money == null || uid == null)

         return null;

//   /**

//    * 邀请赚维权

//    * 
//    * @param uid

//    * @param orderId

//    * @param money

//    * @param balance

//    * @param beiZhu

//    * @return

//    */

//   public static MsgMoneyDetail createInviteWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,

//         BigDecimal balance, String beiZhu) {

//      if (money == null || orderId == null || money == null || uid == null)

//         return null;

//

//      MsgMoneyDetail detail = new MsgMoneyDetail();

//      detail.setBalance(balance);

//      detail.setBeiZhu(beiZhu);

//      detail.setCreateTime(new Date());

//      detail.setMoney(money);

//      detail.setMsgType(MsgTypeMoneyTypeEnum.inviteWeiQuan);

//      detail.setOrderId(orderId);

//      detail.setRead(false);

//      detail.setUser(new UserInfo(uid));

//      detail.setOrderType(orderType);

//

//      return detail;

//   }

//

//   /**

//    * 分享赚到账

//    * 
//    * @param money

//    * @param balance

//    * @param orderCount

//    * @param goodsCount

//    * @param uid

//    * @param beiZhu

//    * @return

//    */

//   public static MsgMoneyDetail createShareMsg(BigDecimal money, BigDecimal balance, int orderType, int orderCount,

//         int goodsCount, Long uid, String beiZhu) {

//      if (money == null || balance == null || uid == null)

//         return null;

//

//      MsgMoneyDetail detail = new MsgMoneyDetail();

//      detail.setBalance(balance);

//      detail.setBeiZhu(beiZhu);

//      detail.setCreateTime(new Date());

//      detail.setGoodsCount(goodsCount);

//      detail.setOrderType(orderType);

//      detail.setMoney(money);

//      detail.setMsgType(MsgTypeMoneyTypeEnum.share);

//      detail.setOrderCount(orderCount);

//      detail.setRead(false);

//      detail.setUser(new UserInfo(uid));

//

//      return detail;

//   }

//

//   /**

//    * 分享赚维权

//    * 
//    * @param uid

//    * @param orderId

//    * @param money

//    * @param balance

//    * @param beiZhu

//    * @return

//    */

//   public static MsgMoneyDetail createShareWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,

//         BigDecimal balance, String beiZhu) {

//      if (money == null || orderId == null || money == null || uid == null)

//         return null;

//      MsgMoneyDetail detail = new MsgMoneyDetail();

//      detail.setBalance(balance);

//      detail.setBeiZhu(beiZhu);

//      detail.setCreateTime(new Date());

//      detail.setMoney(money);

//      detail.setMsgType(MsgTypeMoneyTypeEnum.shareWeiQuan);

//      detail.setOrderId(orderId);

//      detail.setRead(false);

//      detail.setUser(new UserInfo(uid));

//      detail.setOrderType(orderType);

//      return detail;

//   }

//

//   public static MsgMoneyDetail createOrderRewardMsg(Long uid, String orderId, int orderType, BigDecimal money,

//         BigDecimal balance, String beiZhu) {

//      if (money == null || orderId == null || money == null || uid == null)

//         return null;

//

//      MsgMoneyDetail detail = new MsgMoneyDetail();

//      detail.setBalance(balance);

//      detail.setBeiZhu(beiZhu);

//      detail.setCreateTime(new Date());

//      detail.setMoney(money);

//      detail.setMsgType(MsgTypeMoneyTypeEnum.orderReward);

//      detail.setOrderId(orderId);

//      detail.setRead(false);

//      detail.setOrderType(orderType);

//      detail.setUser(new UserInfo(uid));

//      return detail;

//   }

//

//   public static MsgMoneyDetail createSystemEqualizeMsg(Long uid, String reason, BigDecimal money, BigDecimal balance,

//         String beiZhu) {

//      if (money == null || money == null || uid == null)

//         return null;

//

//      MsgMoneyDetail detail = new MsgMoneyDetail();

//      detail.setBalance(balance);

//      detail.setBeiZhu(beiZhu);

//      detail.setCreateTime(new Date());

//      detail.setMoney(money);

//      detail.setMsgType(MsgTypeMoneyTypeEnum.systemEqualize);

//      detail.setOrderId(reason);

//      detail.setRead(false);

//      detail.setUser(new UserInfo(uid));

//      return detail;

//   }

//

//   public static MsgMoneyDetail createElmeFanliMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,

//         String beiZhu) {

//      if (money == null || money == null || uid == null)

//         return null;

//

//      MsgMoneyDetail detail = new MsgMoneyDetail();

//      detail.setBalance(balance);

//      detail.setBeiZhu(beiZhu);

//      detail.setCreateTime(new Date());

//      detail.setMoney(money);

//      detail.setMsgType(MsgTypeMoneyTypeEnum.fanliElme);

//      detail.setOrderId(orderId);

//      detail.setRead(false);

//      detail.setUser(new UserInfo(uid));

//      return detail;

//   }

//	
//	
//



      MsgMoneyDetail detail = new MsgMoneyDetail();

      detail.setBalance(balance);

      detail.setBeiZhu(beiZhu);

      detail.setCreateTime(new Date());

      detail.setMoney(money);

      detail.setMsgType(MsgTypeMoneyTypeEnum.inviteWeiQuan);

      detail.setOrderId(orderId);

      detail.setRead(false);

      detail.setUser(new UserInfo(uid));

      detail.setOrderType(orderType);



      return detail;

   }



   /**

    * 分享赚到账

    * 
    * @param money

    * @param balance

    * @param orderCount

    * @param goodsCount

    * @param uid

    * @param beiZhu

    * @return

    */

   public static MsgMoneyDetail createShareMsg(BigDecimal money, BigDecimal balance, int orderType, int orderCount,

         int goodsCount, Long uid, String beiZhu) {

      if (money == null || balance == null || uid == null)

         return null;



      MsgMoneyDetail detail = new MsgMoneyDetail();

      detail.setBalance(balance);

      detail.setBeiZhu(beiZhu);

      detail.setCreateTime(new Date());

      detail.setGoodsCount(goodsCount);

      detail.setOrderType(orderType);

      detail.setMoney(money);

      detail.setMsgType(MsgTypeMoneyTypeEnum.share);

      detail.setOrderCount(orderCount);

      detail.setRead(false);

      detail.setUser(new UserInfo(uid));



      return detail;

   }



   /**

    * 分享赚维权

    * 
    * @param uid

    * @param orderId

    * @param money

    * @param balance

    * @param beiZhu

    * @return

    */

   public static MsgMoneyDetail createShareWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,

         BigDecimal balance, String beiZhu) {

      if (money == null || orderId == null || money == null || uid == null)

         return null;

      MsgMoneyDetail detail = new MsgMoneyDetail();

      detail.setBalance(balance);

      detail.setBeiZhu(beiZhu);

      detail.setCreateTime(new Date());

      detail.setMoney(money);

      detail.setMsgType(MsgTypeMoneyTypeEnum.shareWeiQuan);

      detail.setOrderId(orderId);

      detail.setRead(false);

      detail.setUser(new UserInfo(uid));

      detail.setOrderType(orderType);

      return detail;

   }



   public static MsgMoneyDetail createOrderRewardMsg(Long uid, String orderId, int orderType, BigDecimal money,

         BigDecimal balance, String beiZhu) {

      if (money == null || orderId == null || money == null || uid == null)

         return null;



      MsgMoneyDetail detail = new MsgMoneyDetail();

      detail.setBalance(balance);

      detail.setBeiZhu(beiZhu);

      detail.setCreateTime(new Date());

      detail.setMoney(money);

      detail.setMsgType(MsgTypeMoneyTypeEnum.orderReward);

      detail.setOrderId(orderId);

      detail.setRead(false);

      detail.setOrderType(orderType);

      detail.setUser(new UserInfo(uid));

      return detail;

   }



   public static MsgMoneyDetail createSystemEqualizeMsg(Long uid, String reason, BigDecimal money, BigDecimal balance,

         String beiZhu) {

      if (money == null || money == null || uid == null)

         return null;



      MsgMoneyDetail detail = new MsgMoneyDetail();

      detail.setBalance(balance);

      detail.setBeiZhu(beiZhu);

      detail.setCreateTime(new Date());

      detail.setMoney(money);

      detail.setMsgType(MsgTypeMoneyTypeEnum.systemEqualize);

      detail.setOrderId(reason);

      detail.setRead(false);

      detail.setUser(new UserInfo(uid));

      return detail;

   }



   public static MsgMoneyDetail createElmeFanliMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,

         String beiZhu) {

      if (money == null || money == null || uid == null)

         return null;



      MsgMoneyDetail detail = new MsgMoneyDetail();

      detail.setBalance(balance);

      detail.setBeiZhu(beiZhu);

      detail.setCreateTime(new Date());

      detail.setMoney(money);

      detail.setMsgType(MsgTypeMoneyTypeEnum.fanliElme);

      detail.setOrderId(orderId);

      detail.setRead(false);

      detail.setUser(new UserInfo(uid));

      return detail;

   }

	
	


   /**

    * 邀请订单补贴

    * 
    * @param uid

    * @param date

    * @param from

    * @param money

    * @param balance

    * @param beiZhu

    * @return

    */

   public static MsgMoneyDetail createInviteOrderSubSidyMsg(Long uid, Date date, String from, BigDecimal money,

         BigDecimal balance, String beiZhu) {

      if (money == null || money == null || uid == null)

         return null;



      MsgMoneyDetail detail = new MsgMoneyDetail();

      detail.setBalance(balance);

      detail.setBeiZhu(beiZhu);

      detail.setCreateTime(new Date());

      detail.setMoney(money);

      detail.setMsgType(MsgTypeMoneyTypeEnum.subSidy);

      detail.setRead(false);

      detail.setUser(new UserInfo(uid));

      Calendar calendar = Calendar.getInstance();

      calendar.setTime(date);

      detail.setStateDesc(String.format("%s年%s月额外补贴到账", calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)));

      detail.setDesc(from);



      return detail;

   }

	
   /**

    * 团队奖励

    * @Title: createOrderTeamRewardMsg

    * @Description: 
    * @param uid

    * @param date

    * @param from

    * @param money

    * @param balance

    * @param beiZhu

    * @return 
    * MsgMoneyDetail 返回类型

    * @throws

    */

   public static MsgMoneyDetail createOrderTeamRewardMsg(Long uid, Date date, String from, BigDecimal money,

         BigDecimal balance, String beiZhu) {

      if (money == null || money == null || uid == null)

         return null;



      MsgMoneyDetail detail = new MsgMoneyDetail();

      detail.setBalance(balance);

      detail.setBeiZhu(beiZhu);

      detail.setCreateTime(new Date());

      detail.setMoney(money);

      detail.setMsgType(MsgTypeMoneyTypeEnum.orderTeamReward);

      detail.setRead(false);

      detail.setUser(new UserInfo(uid));

      Calendar calendar = Calendar.getInstance();

      calendar.setTime(date);

      detail.setStateDesc(String.format("%s年%s月团队奖励到账", calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)));

      detail.setDesc(from);



      return detail;

   }

	
	
//	
//   /**

//    * 团队奖励

//    * @Title: createOrderTeamRewardMsg

//    * @Description: 
//    * @param uid

//    * @param date

//    * @param from

//    * @param money

//    * @param balance

//    * @param beiZhu

//    * @return 
//    * MsgMoneyDetail 返回类型

//    * @throws

//    */

//   public static MsgMoneyDetail createOrderTeamRewardMsg(Long uid, Date date, String from, BigDecimal money,

//         BigDecimal balance, String beiZhu) {

//      if (money == null || money == null || uid == null)

//         return null;

//

//      MsgMoneyDetail detail = new MsgMoneyDetail();

//      detail.setBalance(balance);

//      detail.setBeiZhu(beiZhu);

//      detail.setCreateTime(new Date());

//      detail.setMoney(money);

//      detail.setMsgType(MsgTypeMoneyTypeEnum.orderTeamReward);

//      detail.setRead(false);

//      detail.setUser(new UserInfo(uid));

//      Calendar calendar = Calendar.getInstance();

//      calendar.setTime(date);

//      detail.setStateDesc(String.format("%s年%s月团队奖励到账", calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)));

//      detail.setDesc(from);

//

//      return detail;

//   }

//	
//	
   /**

    * 红包相关信息

    * @param uid