From 98accdd9c6dd5c20d0b565e4f6ddd382c63b6308 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 16:54:58 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 d9d7203..be86361 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
@@ -127,6 +127,14 @@
public R<Shop> shopCommissionStatisticsinfo(){
Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
Shop byId = shopService.getById(objectId);
+ List<ShopWithdraw> list = shopWithdrawService.lambdaQuery().eq(ShopWithdraw::getShopId, objectId)
+ .eq(ShopWithdraw::getAuditStatus, 0).list();
+ if (!list.isEmpty()){
+ BigDecimal bigDecimal = list.stream().map(ShopWithdraw::getMoney).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
+ byId.setWithdrawAuditMoney(bigDecimal);
+ }else {
+ byId.setWithdrawAuditMoney(BigDecimal.ZERO);
+ }
return R.ok(byId);
}
@@ -137,6 +145,9 @@
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
Integer objectId = sysUser.getObjectId();
Shop shop = shopService.getById(objectId);
+ if (money.compareTo(BigDecimal.ZERO)==0){
+ return R.fail("提现金额必须大于零");
+ }
if (money.compareTo(shop.getCanWithdrawMoney())>0){
return R.fail("提现金额不能大于可提现金额");
}
@@ -148,6 +159,7 @@
shopWithdraw.setMoney(money);
shopWithdraw.setAuditStatus(0);
shopWithdraw.setStatus(1);
+ shopWithdraw.setCreateTime(LocalDateTime.now());
shopWithdrawService.save(shopWithdraw);
//扣除账户余额及添加变动明细
BigDecimal balance = shop.getBalance();
--
Gitblit v1.7.1