From 614b0106f079e67bb674a37ede2bd0fe3df2a430 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 27 七月 2023 17:45:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 1d6b382..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 rechargePayment(Integer userIdFormRedis, RechargePayRequest request);
+ ResultUtil rechargeCenPayment(Integer userIdFormRedis, RechargePayRequest request);
+ ResultUtil addRechargeCallbackPay(String code, String orderNumber);
}
--
Gitblit v1.7.1