From 2c44da15d2ed01cefdc0d9e12497ebbd0ef2c8f9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 11:22:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 af6ba86..f0a432b 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
@@ -31,6 +31,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -81,8 +82,13 @@
public R<IPage<ShopWithdraw>> list(@ApiParam("页码") @RequestParam Integer pageNum,
@ApiParam("每一页数据大小") Integer pageSize,
ShopWithdraw shopWithdraw) {
- List<Shop> list = shopService.list(new LambdaUpdateWrapper<Shop>().like(StringUtils.isNotEmpty(shopWithdraw.getShopName()), Shop::getName, shopWithdraw.getShopName()).eq(Shop::getDelFlag, 0));
+ List<Shop> list = shopService.list(new LambdaUpdateWrapper<Shop>()
+ .like(StringUtils.isNotEmpty(shopWithdraw.getShopName()), Shop::getName, shopWithdraw.getShopName())
+ .eq(Shop::getDelFlag, 0));
List<Integer> collect1 = list.stream().map(Shop::getId).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(collect1)){
+ return R.ok(Page.of(pageNum, pageSize));
+ }
Page<ShopWithdraw> page = shopWithdrawService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<ShopWithdraw>()
.in(collect1.size() > 0, ShopWithdraw::getShopId, collect1));
List<ShopWithdraw> records = page.getRecords();
@@ -92,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);
}
@@ -111,6 +118,7 @@
.eq(shopWithdraw.getAuditStatus()!=null,ShopWithdraw::getAuditStatus,shopWithdraw.getAuditStatus())
.orderByDesc(ShopWithdraw::getCreateTime)
);
+ page.getRecords().forEach(s->s.setIdStr(s.getId().toString()));
return R.ok(page);
}
@@ -140,6 +148,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