From 3669a3b5074e160ddb5b823a2e3a272946cbc45b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 15:31:44 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 fc47e2b..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
@@ -98,10 +98,11 @@
shops = shopService.listByIds(collect);
}
for(ShopWithdraw item : records){
- Optional<Shop> first = shops.stream().filter(s -> s.getId().equals(item.getId())).findFirst();
+ Optional<Shop> first = shops.stream().filter(s -> s.getId().equals(item.getShopId())).findFirst();
if(first.isPresent()){
item.setShopName(first.get().getName());
}
+ item.setIdStr(item.getId().toString());
}
return R.ok(page);
}
@@ -126,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);
}
@@ -136,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("提现金额不能大于可提现金额");
}
@@ -147,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