资金明细增加团队分红

admin

2020-04-15 ee5c8055b1c0dd7c67a9025a76b10bd287c93d9a

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

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

      

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

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

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

      if (!StringUtil.isNullOrEmpty(alipayNo)) {

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

      }

@@ -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 + "", 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));

@@ -137,14 +142,12 @@
      if (change) {

         changeWay = "修改";

      }

      String name = filterName(valid.getName());

      String account = filterAccount(valid.getAccount());

      

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

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("验证状态", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO(String.format("提现账号%s失败", changeWay), ClientTextStyleVO.COLOR_CONTENT)));

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

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

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

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

            new ClientTextStyleVO("请仔细核对填写账号是否有误或距上一次修改时长是否超过30天", ClientTextStyleVO.COLOR_CONTENT)));

   

@@ -196,7 +199,7 @@
         sourceName += "-返利订单";

         typeEnum = MsgTypeMoneyTypeEnum.fanli;

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

         fanliName = "分享奖金:";

         fanliName = "分享奖金";

         sourceName += "-分享订单";

         typeEnum = MsgTypeMoneyTypeEnum.share;

      } 

@@ -209,7 +212,7 @@
      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)));



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

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

@@ -221,8 +224,8 @@
            new ClientTextStyleVO(fanliName, ClientTextStyleVO.COLOR_CONTENT)));

      

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

      contentList2.add(new ClientTextStyleVO("¥" + money, ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

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

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

@@ -277,7 +280,7 @@
      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)));



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

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

@@ -288,10 +291,10 @@
      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("退回原因", ClientTextStyleVO.COLOR_TITLE),

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

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

            new ClientTextStyleVO("¥" +fanliMoney.setScale(2) + "（原到账金额）", ClientTextStyleVO.COLOR_CONTENT)));

            new ClientTextStyleVO("¥" +fanliMoney.setScale(2, BigDecimal.ROUND_DOWN) + "（原到账金额）", ClientTextStyleVO.COLOR_CONTENT)));

      

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

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

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

      contentList2.add(new ClientTextStyleVO("（"+ weiquanMoney + "）", ClientTextStyleVO.COLOR_CONTENT));

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

      

@@ -337,8 +340,8 @@
            new ClientTextStyleVO("团队收益", ClientTextStyleVO.COLOR_CONTENT), true));

      

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

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

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

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

@@ -392,14 +395,14 @@
      } else {// 其他

         if (alipayAccount.length() >= 6) {

            for (int i = 0; i < alipayAccount.length(); i++) {

               if (i < 3 || i >= alipayAccount.length() - 2)

               if (i < alipayAccount.length() - 4)

                  account += alipayAccount.charAt(i);

               else

                  account += "*";

            }

         } else {

            for (int i = 0; i < alipayAccount.length(); i++) {

               if (i < 1 || i >= alipayAccount.length() - 1)

               if (i <  alipayAccount.length() - 1)

                  account += alipayAccount.charAt(i);

               else

                  account += "*";