From 2ba0e4c222d707b163d97afb122d3183c99dbf7a Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 02 十二月 2024 09:31:19 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v5
---
src/main/java/com/mzl/flower/mapper/wallet/WalletBillRecordMapper.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/mapper/wallet/WalletBillRecordMapper.java b/src/main/java/com/mzl/flower/mapper/wallet/WalletBillRecordMapper.java
index 069bc6f..f93dbac 100644
--- a/src/main/java/com/mzl/flower/mapper/wallet/WalletBillRecordMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/wallet/WalletBillRecordMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -31,8 +32,11 @@
List<WalletBillRecordVO> getPageByDesc(Page page, @Param("dto") QueryWalletBillDTO dto);
- @Select("select * from t_wallet_withdraw_record where withdraw_record_id = #{withdrawRecordId}")
+ @Select("select * from t_wallet_bill_record where withdraw_record_id = #{withdrawRecordId}")
WalletBillRecordDO getBillRecordByWithdrawRecordId(Long withdrawRecordId);
+ @Select("SELECT COALESCE(SUM(change_amount), 0) AS change_amount FROM t_wallet_bill_record WHERE supplier_id = #{supplierId} and wallet_id = #{walletId} AND remark = '历史订单统一提现'")
+ BigDecimal getHistoryAmount(Long walletId, Long supplierId);
}
+
--
Gitblit v1.9.3