From 451116c1df3c639da15b3d213f3fcff2f585337a Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 15 四月 2025 19:22:52 +0800
Subject: [PATCH] 前端联调
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 d102de0..fcbb2b7 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
@@ -79,7 +79,7 @@
* 提现申请列表
*/
@GetMapping("/list")
- @ApiOperation("提现申请列表")
+ @ApiOperation(value = "提现申请列表" )
public R<IPage<ShopWithdraw>> list(@ApiParam("页码") @RequestParam Integer pageNum,
@ApiParam("每一页数据大小") Integer pageSize,
ShopWithdraw shopWithdraw) {
@@ -120,7 +120,6 @@
.eq(auditStatus!=null,ShopWithdraw::getAuditStatus,auditStatus)
.orderByDesc(ShopWithdraw::getCreateTime)
);
- page.getRecords().forEach(s->s.setIdStr(s.getId().toString()));
return R.ok(page);
}
@@ -191,6 +190,8 @@
}
ShopWithdraw shopWithdraw = new ShopWithdraw();
shopWithdraw.setShopId(shopId);
+ shopWithdraw.setShopName(shop.getName());
+ shopWithdraw.setCreateUserId(userId);
shopWithdraw.setMoney(money);
shopWithdraw.setAuditStatus(0);//待审核
shopWithdraw.setStatus(1);//申请中
@@ -202,7 +203,7 @@
BigDecimal withdrawMoney = shop.getWithdrawMoney();//审核中金额
shop.setBalance(balance.subtract(money).setScale(2, RoundingMode.HALF_EVEN));//余额减少
shop.setCanWithdrawMoney(canWithdrawMoney.subtract(money).setScale(2, RoundingMode.HALF_EVEN));//可提现金额减少
- shop.setWithdrawMoney(withdrawMoney.add(money).setScale(2, RoundingMode.HALF_EVEN));//审核中金额增加
+ shop.setWithdrawAuditMoney(withdrawMoney.add(money).setScale(2, RoundingMode.HALF_EVEN));//审核中金额增加
shopService.updateById(shop);
//添加余额变动明细
ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement();
--
Gitblit v1.7.1