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 | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 23f05de..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,12 +53,20 @@
if (!orderList.getRecords().isEmpty()) {
// 总金额
totalMoney = orderList.getRecords().stream().map(Order::getOrderMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
- // 未提现金额
- undelivered = orderList.getRecords().stream().filter(data -> Constants.ZERO.equals(data.getIsWithdrawal()))
+ 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())&&data.getSubsidy()!=null)
+ .map(Order::getSubsidy).reduce(BigDecimal.ZERO, BigDecimal::add);
+ withdrawn = reduce1.add(withdrawn);
// 已提现金额
- withdrawn = orderList.getRecords().stream().filter(data -> Constants.ONE.equals(data.getIsWithdrawal()))
+ 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())&&data.getSubsidy()!=null)
+ .map(Order::getSubsidy).reduce(BigDecimal.ZERO, BigDecimal::add);
+ undelivered = reduce2.add(undelivered);
}
withdrawList.setMoneyCount(new WithdrawMoneyVO(totalMoney, undelivered, withdrawn));
// 回收服务列表
@@ -79,9 +87,15 @@
withdrawOrder.setServeName(recoveryServe.getServeName());
withdrawOrder.setServeDescribe(recoveryServe.getServeDescribe());
withdrawOrder.setCover(recoveryServe.getCover());
- withdrawOrder.setCompleteTime(order.getCompleteTime());
+ withdrawOrder.setCompleteTime(order.getCreateTime());
withdrawOrder.setIsWithdrawal(order.getIsWithdrawal());
- withdrawOrder.setMoney(order.getOrderMoney());
+ withdrawOrder.setMoney(order.getSubsidy()!=null?order.getSubsidy().add(order.getOrderMoney()):order.getOrderMoney());
+ withdrawOrder.setPackageInfo(order.getPackageInfo());
+ if (order.getAddress()!=null) {
+ withdrawOrder.setAddress(order.getReservationAddress() + order.getAddress());
+ }else {
+ withdrawOrder.setAddress(order.getReservationAddress());
+ }
list.add(withdrawOrder);
}
Page<WithdrawOrderVO> page = new Page<>();
--
Gitblit v1.7.1