From b38caa7012b8da89d5ca61d389258d4fd8d9172e Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 09 八月 2023 17:51:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java b/cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java
index 3c920de..5e3a7ad 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java
@@ -4,7 +4,10 @@
import com.dsh.account.entity.RechargeRecords;
import com.dsh.account.model.vo.userBenefitDetail.RechargeDetailsVo;
import com.dsh.account.model.vo.userBenefitDetail.RechargePayRequest;
+import com.dsh.account.model.vo.userBenefitDetail.RechargesDetail;
import com.dsh.account.util.ResultUtil;
+
+import java.util.List;
/**
* <p>
@@ -16,8 +19,9 @@
*/
public interface RechargeRecordsService extends IService<RechargeRecords> {
- RechargeDetailsVo getAppUserRechargeRecord(String yearMonth, Integer recordId, Integer appUserId);
+ List<RechargesDetail> getAppUserRechargeRecord(String yearMonth, Integer recordId, Integer appUserId,Integer pageNum,Integer pageSize);
ResultUtil rechargeCenPayment(Integer userIdFormRedis, RechargePayRequest request);
+ ResultUtil addRechargeCallbackPay(String code, String orderNumber);
}
--
Gitblit v1.7.1