From d1cab4b2f2690d1331f12f0d9de78bbbf926f390 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 14:27:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java | 5 ++++-
1 files changed, 4 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 577cf1f..092ec05 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
@@ -94,7 +94,8 @@
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));
+ .in(collect1.size() > 0, ShopWithdraw::getShopId, collect1)
+ .orderByDesc(ShopWithdraw::getCreateTime));
List<ShopWithdraw> records = page.getRecords();
List<Integer> collect = records.stream().map(ShopWithdraw::getShopId).collect(Collectors.toList());
List<Shop> shops = null;
@@ -141,6 +142,7 @@
}else {
byId.setWithdrawAuditMoney(BigDecimal.ZERO);
}
+ byId.setWithdrawMoney(byId.getWithdrawMoney().subtract(byId.getWithdrawAuditMoney()));
return R.ok(byId);
}
@@ -221,6 +223,7 @@
singlePay.setReceiverAccountNoEnc(shop.getReceiverAccountNoEnc());
singlePay.setReceiverNameEnc(shop.getReceiverNameEnc());
singlePay.setReceiverAccountType(shop.getReceiverAccountType());
+ singlePay.setReceiverBankChannelNo(shop.getReceiverBankChannelNo());
singlePay.setPaidAmount(shopWithdraw1.getMoney().doubleValue());
singlePay.setPaidDesc("账户余额提现");
singlePay.setPaidUse("208");
--
Gitblit v1.7.1