From 3701dcb2483643ac40d4b81c021b3d8cdab62402 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期五, 06 九月 2024 21:50:18 +0800 Subject: [PATCH] 8.9 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/WithdrawMapper.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 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 7a5a545..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; @@ -35,9 +36,9 @@ @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); + 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导出 @@ -68,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); /** * 年度查询 @@ -76,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); /** * 月度查询 @@ -84,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); /** * 用户所关联提现记录分页列表 @@ -94,5 +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); + Page<UserWithdrawRecordVO> withdrawList1(@Param("cityList") List<String> cityList,@Param("userId") Integer userId, Page<UserWithdrawRecordVO> page,@Param("siteIds")List<String> siteIds); } -- Gitblit v1.7.1