From d2afc5875ab0d87573ea3d8a78eeed9af4ca1953 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 Apr 2023 14:47:11 +0800
Subject: [PATCH] 统计

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
index 7cf9f63..d24988d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
@@ -69,9 +69,14 @@
 
         //每日提现额度上限
         BigDecimal allCashOut = cashOutSettingVo.getAllCashOut();
+        if(withdrawalDto.getAmount().compareTo(allCashOut) > 0){
+            throw new FebsException("每日限额为"+cashOutSettingVo.getAllCashOut().setScale(2,BigDecimal.ROUND_DOWN));
+        }
         List<MallMemberWithdraw> mallMemberWithdrawListDone = this.baseMapper.selectListByMemberIdAndDate(memberId,new Date());
         if(CollUtil.isNotEmpty(mallMemberWithdrawListDone)){
-            if (withdrawalDto.getAmount().compareTo(allCashOut) >= 0) {
+            BigDecimal amountTCAll = mallMemberWithdrawListDone.stream().map(MallMemberWithdraw::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+            amountTCAll = amountTCAll.add(withdrawalDto.getAmount());
+            if (amountTCAll.compareTo(allCashOut) > 0) {
                 throw new FebsException("每日限额为"+cashOutSettingVo.getAllCashOut().setScale(2,BigDecimal.ROUND_DOWN));
             }
         }

--
Gitblit v1.9.1