From 34c755eb76b677201cadb2acb8ed5fff1f96dc27 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 23 Jan 2024 14:06:34 +0800
Subject: [PATCH] 发票

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 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..d9eddd8 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
@@ -53,6 +53,12 @@
     public void withdrawal(WithdrawalDto withdrawalDto) {
         Long memberId = LoginUserUtil.getLoginUser().getId();
         MallMember mallMember = mallMemberService.getById(memberId);
+
+        Integer outsideWith = mallMember.getOutsideWith() == null ? 2 :mallMember.getOutsideWith();
+        if (1 != outsideWith) {
+            throw new FebsException("功能升级中");
+        }
+
         if (StrUtil.isBlank(mallMember.getTradePassword())) {
             throw new FebsException("未设置支付密码");
         }
@@ -69,9 +75,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