IOS上线隐藏我的界面的banner与超级会员升级信息

admin

2020-05-06 24a8d17e007545f7426c48352109aa1a9c6587ee

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

@@ -29,7 +29,8 @@
    * @param beiZhu

    * @return

    */

   public static MsgMoneyDetail createExtractMsg(String stateDesc, Long uid, Extract extract, String reason, String alipayNo) {

   public static MsgMoneyDetail createExtractMsg(String stateDesc, Long uid, Extract extract, String reason, 
         String alipayNo, String beizu) {

      if (extract == null || uid == null)

         return null;

      

@@ -54,9 +55,8 @@
         listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("原因", ClientTextStyleVO.COLOR_TITLE),

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

      }

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

            new ClientTextStyleVO("如有疑问请联系人工客服", ClientTextStyleVO.COLOR_CONTENT)));

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

      

      MsgMoneyDetail detail = new MsgMoneyDetail();

      detail.setBeiZhu(reason);

@@ -98,9 +98,14 @@
      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("提现账号", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO(String.format("支付宝:%s-姓名:%s",account, name), ClientTextStyleVO.COLOR_CONTENT)));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("打款金额", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO(money.setScale(2, BigDecimal.ROUND_DOWN) + "", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT)));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("提现账号", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO(String.format("提现账号收到一笔，来自%s的转账，即绑定成功", appName), ClientTextStyleVO.COLOR_CONTENT)));

            new ClientTextStyleVO("¥" + money.setScale(2, BigDecimal.ROUND_DOWN), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT)));

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

      contentList2.add(new ClientTextStyleVO("提现账号收到一笔，来自", ClientTextStyleVO.COLOR_CONTENT));

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

      contentList2.add(new ClientTextStyleVO("的转账，即绑定成功", ClientTextStyleVO.COLOR_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("说明", ClientTextStyleVO.COLOR_TITLE),contentList2));

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

@@ -181,24 +186,13 @@
    * @param beiZhu

    * @return

    */

   public static MsgMoneyDetail createOrderReceivedMsg(BigDecimal money, BigDecimal balance, String orderId, int source,

          int goodsCount, Long uid, int type, Date downTime, boolean useCoupon) {

   public static MsgMoneyDetail fanLiOrderReceivedMsg(BigDecimal money, BigDecimal balance, String orderId, int source,

          int goodsCount, Long uid, Date downTime, boolean useCoupon) {

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

         return null;



      String fanliName = "";

      MsgTypeMoneyTypeEnum typeEnum = null;

      String sourceName = Constant.getSourceName(source);

      if (Constant.TYPE_REBATE == type) {

         fanliName = "自购返利";

         sourceName += "-返利订单";

         typeEnum = MsgTypeMoneyTypeEnum.fanli;

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

         fanliName = "分享奖金";

         sourceName += "-分享订单";

         typeEnum = MsgTypeMoneyTypeEnum.share;

      } 


      String fanliName = "自购返利";

      String sourceName = Constant.getSourceName(source) + "-返利订单";

      if (useCoupon) {

         fanliName = "使用返利奖励券";

      }

@@ -207,14 +201,17 @@
      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("到账详情", ClientTextStyleVO.COLOR_TITLE),

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

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("订单号", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));

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



      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("下单时间", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO(TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT)));

		
      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("共", 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));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("商品数量", ClientTextStyleVO.COLOR_TITLE), contentList));

		
      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("到账类目", ClientTextStyleVO.COLOR_TITLE),

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

      

@@ -230,7 +227,7 @@
      detail.setCreateTime(new Date());

      detail.setGoodsCount(goodsCount);

      detail.setMoney(money);

      detail.setMsgType(typeEnum);

      detail.setMsgType(MsgTypeMoneyTypeEnum.fanli);

      detail.setOrderId(orderId);

      detail.setOrderType(source);

      detail.setRead(false);

@@ -239,6 +236,58 @@
      return detail;

   }



	


   /**

    * 返利到账

    * 
    * @param money

    * @param balance

    * @param orderId

    * @param goodsCount

    * @param uid

    * @param beiZhu

    * @return

    */

   public static MsgMoneyDetail shareOrderReceivedMsg(BigDecimal money, BigDecimal balance, int source, Long uid, Date receivedDate) {

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

         return null;



      String sourceName = Constant.getSourceName(source) + "-分享订单";

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

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

      contentList.add(new ClientTextStyleVO(TimeUtil.getYearOnlyYYYY(receivedDate)+ "年", ClientTextStyleVO.COLOR_CONTENT));

      contentList.add(new ClientTextStyleVO(TimeUtil.getMonthOnlyMM(receivedDate), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

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

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("结算月度", ClientTextStyleVO.COLOR_TITLE), contentList));

		
      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("到账详情", ClientTextStyleVO.COLOR_TITLE),

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

		
      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("到账类目", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO("分享奖金", ClientTextStyleVO.COLOR_CONTENT)));

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

      contentList2.add(new ClientTextStyleVO("¥" + money.setScale(2, BigDecimal.ROUND_DOWN), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

      contentList2.add(new ClientTextStyleVO("（账户余额¥"+ balance.setScale(2, BigDecimal.ROUND_DOWN) + "）", ClientTextStyleVO.COLOR_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("到账金额", ClientTextStyleVO.COLOR_TITLE), contentList2));

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

            new ClientTextStyleVO("如有疑问请联系人工客服",   ClientTextStyleVO.COLOR_CONTENT)));

		
      MsgMoneyDetail detail = new MsgMoneyDetail();

      detail.setBalance(balance);

      detail.setCreateTime(new Date());

      detail.setMoney(money);

      detail.setMsgType(MsgTypeMoneyTypeEnum.share);

      detail.setOrderType(source);

      detail.setRead(false);

      detail.setUser(new UserInfo(uid));

      detail.setExtraInfo(new Gson().toJson(listMsg));

      return detail;

   }

	
   /**

    * 返利维权

    * 

@@ -275,14 +324,16 @@
      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("退回详情", ClientTextStyleVO.COLOR_TITLE),

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

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("订单号", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));

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



      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("下单时间", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO(TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT)));

		
      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("共", 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));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("商品数量", ClientTextStyleVO.COLOR_TITLE), contentList));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("退回原因", ClientTextStyleVO.COLOR_TITLE),

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

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("到账金额", ClientTextStyleVO.COLOR_TITLE),

@@ -320,7 +371,8 @@
    * @param beiZhu

    * @return

    */

   public static MsgMoneyDetail createTeamReceivedMsg(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate) {

   public static MsgMoneyDetail createTeamReceivedMsg(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate,

         String teamName) {

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

         return null;



@@ -332,7 +384,7 @@
      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("结算月度", ClientTextStyleVO.COLOR_TITLE), contentList));

      

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("到账类目", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO("团队收益", ClientTextStyleVO.COLOR_CONTENT), true));

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

      

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

      contentList2.add(new ClientTextStyleVO("¥" + money.setScale(2, BigDecimal.ROUND_DOWN), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));