From d90ac211d9168c1ce8d390838f367a0db00afb52 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 03 六月 2025 14:37:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/WithdrawMapper.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/WithdrawMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/WithdrawMapper.java
index b59fb20..72f7656 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/WithdrawMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/WithdrawMapper.java
@@ -6,6 +6,7 @@
import com.ruoyi.order.vo.UserWithdrawRecordVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
import java.math.BigDecimal;
import java.util.List;
@@ -31,9 +32,13 @@
* @param page 分页
* @return 分页列表
*/
- Page<UserWithdrawRecordVO> withdrawPage(@Param("name") String nickname, @Param("phone") String userPhone,
+ Page<UserWithdrawRecordVO> withdrawPage(@Param("userIds") List<Integer> userIds,@Param("name") String nickname, @Param("phone") String userPhone,
@Param("time") String applyForTime,
@Param("state") Integer state, Page<UserWithdrawRecordVO> page);
+
+ Page<UserWithdrawRecordVO> withdrawPage1(@Param("cityList") List<String> cityList, @Param("userIds") List<Integer> userIds, @Param("name") String nickname, @Param("phone") String userPhone,
+ @Param("time") String applyForTime,
+ @Param("state") Integer state, Page<UserWithdrawRecordVO> page, @Param("siteIds")List<String> siteIds);
/**
* 根据所选id导出
@@ -64,7 +69,7 @@
* @param endDateStr 季度结束时间
* @return 总金额
*/
- BigDecimal withdrawalTotalMoney(@Param("cityList") List<String> cityList, @Param("start") String startDateStr, @Param("end") String endDateStr);
+ BigDecimal withdrawalTotalMoney(@Param("cityList") List<String> cityList, @Param("start") String startDateStr, @Param("end") String endDateStr,@Param("siteIds")List<String> siteIds);
/**
* 年度查询
@@ -72,7 +77,7 @@
* @param cityList 城市列表
* @return 年度提现总额
*/
- BigDecimal withdrawalTotalMoneyByYear(@Param("cityList") List<String> cityList);
+ BigDecimal withdrawalTotalMoneyByYear(@Param("cityList") List<String> cityList,@Param("siteIds")List<String> siteIds);
/**
* 月度查询
@@ -80,7 +85,7 @@
* @param cityList 城市列表
* @return 年度提现总额
*/
- BigDecimal withdrawalTotalMoneyByMonth(@Param("cityList") List<String> cityList);
+ BigDecimal withdrawalTotalMoneyByMonth(@Param("cityList") List<String> cityList,@Param("siteIds")List<String> siteIds);
/**
* 用户所关联提现记录分页列表
@@ -90,4 +95,5 @@
* @return 分页列表
*/
Page<UserWithdrawRecordVO> withdrawList(@Param("userId") Integer userId, Page<UserWithdrawRecordVO> page);
+ Page<UserWithdrawRecordVO> withdrawList1(@Param("cityList") List<String> cityList,@Param("userId") Integer userId, Page<UserWithdrawRecordVO> page,@Param("siteIds")List<String> siteIds);
}
--
Gitblit v1.7.1