From 428519bd1056dd90cd4589dbf85b380e403ff254 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 05 七月 2024 18:13:08 +0800
Subject: [PATCH] feat: 代码初始化、腾讯云短信SDK
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/WithdrawService.java | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/WithdrawService.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/WithdrawService.java
index 1cbf321..06e1380 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/WithdrawService.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/WithdrawService.java
@@ -1,10 +1,13 @@
package com.ruoyi.admin.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.admin.entity.Order;
+import com.ruoyi.admin.entity.User;
import com.ruoyi.admin.entity.Withdraw;
import com.ruoyi.admin.entity.WithdrawalSetting;
-import com.ruoyi.admin.vo.UserWithdrawRecordRequestVO;
+import com.ruoyi.admin.request.WithdrawExportRequest;
import com.ruoyi.admin.vo.UserWithdrawRecordVO;
import com.ruoyi.common.core.domain.R;
@@ -25,35 +28,37 @@
/**
* excel模板导出
*
- * @param idList 提现记录id
- * @param response 响应体
+ * @param exportRequest 提现记录
+ * @param response 响应体
* @return 导出结果
*/
- R<String> excelExport(List<String> idList, HttpServletResponse response);
+ R<String> excelExport(WithdrawExportRequest exportRequest, HttpServletResponse response);
/**
* 获取用户提现金额
*
- * @param cityIdList 城市id
+ * @param cityList 城市集合
+ * @param startDateStr 季度开始时间
+ * @param endDateStr 季度结束时间
* @return 总金额
*/
- BigDecimal withdrawalTotalMoney(List<String> cityIdList);
+ BigDecimal withdrawalTotalMoney(List<String> cityList, String startDateStr, String endDateStr);
/**
* 年度查询
*
- * @param cityIdList 城市id
+ * @param cityList 城市集合
* @return 年度提现总额
*/
- BigDecimal withdrawalTotalMoneyByYear(List<String> cityIdList);
+ BigDecimal withdrawalTotalMoneyByYear(List<String> cityList);
/**
* 月度查询
*
- * @param cityIdList 城市id
+ * @param cityList 城市列表
* @return 年度提现总额
*/
- BigDecimal withdrawalTotalMoneyByMonth(List<String> cityIdList);
+ BigDecimal withdrawalTotalMoneyByMonth(List<String> cityList);
/**
* 用户所关联提现记录分页列表
@@ -62,7 +67,7 @@
* @param page 分页参数
* @return 分页列表
*/
- UserWithdrawRecordRequestVO withdrawList(Integer userId, Page<UserWithdrawRecordVO> page);
+ IPage<UserWithdrawRecordVO> withdrawList(Integer userId, Page<UserWithdrawRecordVO> page);
/**
* 关闭/开启审核
@@ -78,4 +83,26 @@
* @return 审核设置
*/
WithdrawalSetting withdrawProcess();
+
+ /**
+ * 用户所关联提现记录分页列表
+ *
+ * @param nickname 用户名称
+ * @param userPhone 用户手机号
+ * @param applyForTime 申请开始时间
+ * @param state 审核状态
+ * @param page 分页
+ * @return 分页列表
+ */
+ IPage<UserWithdrawRecordVO> withdrawPage(String nickname, String userPhone, String applyForTime,
+ Integer state, Page<UserWithdrawRecordVO> page);
+
+ /**
+ * 提现审批通过，微信打款
+ *
+ * @param user 下单用户
+ * @param order 订单信息
+ * @return 打款结果
+ */
+ Boolean confirmWithdraw(User user, Order order);
}
--
Gitblit v1.7.1