From cbf2486983b77a27af9968bbb362cb8d43789115 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 26 三月 2025 15:30:53 +0800
Subject: [PATCH] 修改统计bug和部分功能修改
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java
index 873101a..828b3c1 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java
@@ -131,11 +131,26 @@
LoginUser loginUser = tokenService.getLoginUser();
SysUser sysUser = sysUserClient.getSysUser(loginUser.getUserid()).getData();
Shop byId = shopService.getById(sysUser.getObjectId());
- List<ShopWithdraw> list = shopWithdrawService.lambdaQuery().eq(ShopWithdraw::getShopId, sysUser.getObjectId())
- .eq(ShopWithdraw::getAuditStatus, 0).list();
+ List<ShopWithdraw> list = shopWithdrawService.lambdaQuery()
+ .eq(ShopWithdraw::getShopId, sysUser.getObjectId())
+ .list();
+
+
if (!list.isEmpty()){
- BigDecimal bigDecimal = list.stream().map(ShopWithdraw::getMoney).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
+ // 待审核列表
+ List<ShopWithdraw> toBeReviewList = list.stream()
+ .filter(s -> s.getAuditStatus() == 0)
+ .collect(Collectors.toList());
+ // 审核通过列表
+ List<ShopWithdraw> passedReviewList = list.stream()
+ .filter(s -> s.getAuditStatus() == 1)
+ .collect(Collectors.toList());
+
+ BigDecimal bigDecimal = toBeReviewList.stream().map(ShopWithdraw::getMoney).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
byId.setWithdrawAuditMoney(bigDecimal);
+
+ BigDecimal bigDecimal1 = passedReviewList.stream().map(ShopWithdraw::getMoney).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
+ byId.setWithdrawMoney(bigDecimal1);
}else {
byId.setWithdrawAuditMoney(BigDecimal.ZERO);
}
@@ -193,12 +208,11 @@
ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement();
shopBalanceStatement.setShopId(shop.getId());
shopBalanceStatement.setType(4);
- shopBalanceStatement.setHistoricalBalance(balance);
shopBalanceStatement.setVariableAmount(money);
- shopBalanceStatement.setBalance(shop.getBalance());
shopBalanceStatement.setCreateUserId(userId);
shopBalanceStatement.setCreateTime(LocalDateTime.now());
shopBalanceStatement.setObjectId(shopWithdraw.getId());
+ shopBalanceStatement.setChangeDirection(-1);
shopBalanceStatementService.save(shopBalanceStatement);
}
@@ -259,12 +273,11 @@
ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement();
shopBalanceStatement.setShopId(shop.getId());
shopBalanceStatement.setType(4);
- shopBalanceStatement.setHistoricalBalance(balance);
shopBalanceStatement.setVariableAmount(money);
- shopBalanceStatement.setBalance(shop.getBalance());
shopBalanceStatement.setCreateUserId(loginUser.getUserid());
shopBalanceStatement.setCreateTime(LocalDateTime.now());
shopBalanceStatement.setObjectId(shopWithdraw.getId());
+ shopBalanceStatement.setChangeDirection(-1);
shopBalanceStatementService.save(shopBalanceStatement);
}
shopWithdraw1.setAuditStatus(shopWithdraw.getAuditStatus());
@@ -310,12 +323,11 @@
ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement();
shopBalanceStatement.setShopId(shop.getId());
shopBalanceStatement.setType(4);
- shopBalanceStatement.setHistoricalBalance(balance);
shopBalanceStatement.setVariableAmount(shopWithdraw.getMoney());
- shopBalanceStatement.setBalance(shop.getBalance());
shopBalanceStatement.setCreateUserId(shopWithdraw.getAuditUserId());
shopBalanceStatement.setCreateTime(LocalDateTime.now());
shopBalanceStatement.setObjectId(shopWithdraw.getId());
+ shopBalanceStatement.setChangeDirection(-1);
shopBalanceStatementService.save(shopBalanceStatement);
shopWithdraw.setStatus(3);
shopWithdraw.setRemark(singlePayCallbackResult.getErrorCodeDesc());
--
Gitblit v1.7.1