From 76f04927058e3b144ff0e5dd8cde01b7fe069d74 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 22 四月 2025 17:28:07 +0800
Subject: [PATCH] 2.0bug修改
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/impl/WithdrawServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/impl/WithdrawServiceImpl.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/impl/WithdrawServiceImpl.java
index fa1cc7f..002bef5 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/impl/WithdrawServiceImpl.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/impl/WithdrawServiceImpl.java
@@ -53,18 +53,18 @@
if (!orderList.getRecords().isEmpty()) {
// 总金额
totalMoney = orderList.getRecords().stream().map(Order::getOrderMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal reduce = orderList.getRecords().stream().map(Order::getSubsidy).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal reduce = orderList.getRecords().stream().filter(e->e.getSubsidy()!=null).map(Order::getSubsidy).reduce(BigDecimal.ZERO, BigDecimal::add);
totalMoney = reduce.add(totalMoney);
// 未提现金额withdrawn
withdrawn = orderList.getRecords().stream().filter(data -> Constants.ZERO.equals(data.getIsWithdrawal()))
.map(Order::getOrderMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal reduce1 = orderList.getRecords().stream().filter(data -> Constants.ZERO.equals(data.getIsWithdrawal()))
+ BigDecimal reduce1 = orderList.getRecords().stream().filter(data -> Constants.ZERO.equals(data.getIsWithdrawal())&&data.getSubsidy()!=null)
.map(Order::getSubsidy).reduce(BigDecimal.ZERO, BigDecimal::add);
withdrawn = reduce1.add(withdrawn);
// 已提现金额
undelivered = orderList.getRecords().stream().filter(data -> Constants.ONE.equals(data.getIsWithdrawal()))
.map(Order::getOrderMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal reduce2 = orderList.getRecords().stream().filter(data -> Constants.ONE.equals(data.getIsWithdrawal()))
+ BigDecimal reduce2 = orderList.getRecords().stream().filter(data -> Constants.ONE.equals(data.getIsWithdrawal())&&data.getSubsidy()!=null)
.map(Order::getSubsidy).reduce(BigDecimal.ZERO, BigDecimal::add);
undelivered = reduce2.add(undelivered);
}
--
Gitblit v1.7.1