From 331c41ca7f21b81985ba23d60ec05c350d21daa8 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 十二月 2024 14:59:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java b/src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java
index 19645d7..8fcaad1 100644
--- a/src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java
@@ -1,8 +1,12 @@
package com.mzl.flower.mapper.wallet;
+import com.mzl.flower.dto.request.wallet.QueryWalletAmountDTO;
+import com.mzl.flower.dto.response.wallet.WalletWithdrawVO;
import com.mzl.flower.entity.wallet.WalletDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
import java.math.BigDecimal;
@@ -14,9 +18,25 @@
* @author @TaoJie
* @since 2024-10-22
*/
+@Repository
public interface WalletMapper extends BaseMapper<WalletDO> {
- @Select("select total_amount as totalAmount from t_wallet where supplier_id =#{supplierId}")
- public BigDecimal getTotalAmount(String supplierId);
+ @Select("select * from t_wallet where supplier_id =#{supplierId}")
+ public WalletDO getTotalAmount(String supplierId);
+
+ BigDecimal getWaittingSettlementAmount(@Param("dto") WalletDO walletDO);
+
+ @Select("select label from t_code_value where type_code='WALLET_ONLINE_TIME' and value='online'")
+ String selectWalletOnlineTime();
+
+ BigDecimal getSupplierTotalTransactionAmount(@Param("dto") QueryWalletAmountDTO queryWalletAmountDTO);
+
+
+ @Select("select sum(t.withdrawable_amount) + sum(t.withdrawing_amount) as supplierPendingAmount, sum(t.withdrawn_amount) as supplierCompleteAmount from t_wallet t")
+ WalletWithdrawVO getSumWithdrawTotal();
+
+ //历史变动总金额 通过备注
+ @Select("select sum(t.change_amount) from t_wallet_bill_record t where t.remark = '历史订单统一提现' and type = 'withdraw' ")
+ BigDecimal getSumHistoryWithdrawTotal();
}
--
Gitblit v1.9.3