资金验证优化

admin

2020-08-26 26f7accb815f55f18f8eedfca4324700a96884ec

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java

@@ -367,10 +367,8 @@
    * 增加提现记录

    * 

    * @param extract

    * @param maxCount

    *            最多提现次数

    * @param maxMoney

    *            最大提现金额

     * @param maxCount 最多提现次数

     * @param maxMoney 最大提现金额

    * @param session

    * @return 如果为0，则增加成功。为1，则超过每日最多提现次数。为2，则超过每日最多提现金额

    */

@@ -580,8 +578,23 @@
      BigDecimal hongBaoMoney = hongBaoV2Service.computeMoneyByUidAndState(uid, HongBaoV2.STATE_YILINGQU);



      Date now = new Date();

      // 获取提现，获取提现验证

        //获取团队分红

      List<UserMoneyDetailTypeEnum> typeList = new ArrayList<>();

        typeList.add(UserMoneyDetailTypeEnum.teamDividents);

        BigDecimal teamDividents = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, new Date(0),

                now);



        //红包提现收入

        typeList = new ArrayList<>();

        typeList.add(UserMoneyDetailTypeEnum.redPackExchange);

        BigDecimal redPackExchange = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, new Date(0),

                now);





        //----------所有支出开始------------



        // 获取提现，获取提现验证

        typeList = new ArrayList<>();

      typeList.add(UserMoneyDetailTypeEnum.extract);

      typeList.add(UserMoneyDetailTypeEnum.extractNew);

      typeList.add(UserMoneyDetailTypeEnum.extractReject);

@@ -597,13 +610,19 @@
      typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);

        //新版维权（到账时减去了维权资金，但是在资金明细里面加入了维权金额，但并未外显）

        typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuanNew);



      BigDecimal weiqaunMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, new Date(0),

            now);

      weiqaunMoney = weiqaunMoney.abs();





        //--------------所有支出结束------------



      BigDecimal balance = userInfoService.selectByPKey(uid).getMyHongBao();



      BigDecimal after = hongBaoMoney.subtract(extractMoney.add(weiqaunMoney).add(balance).add(compensateMoney));

        BigDecimal after = hongBaoMoney.add(teamDividents).add(redPackExchange).subtract(extractMoney.add(weiqaunMoney).add(balance).add(compensateMoney));



      if (after.compareTo(new BigDecimal("0")) != 0)

         throw new ExtractException(2, "结算资金异常：" + after);