From 3ad6b6ba2ba56fc0bcd2130e47190779c6e15acc Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 04 十二月 2023 14:59:32 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai --- cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java | 14 +++++++++++++- 1 files changed, 13 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..eb877ac 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 @@ -2,9 +2,16 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.dsh.account.entity.RechargeRecords; +import com.dsh.account.entity.VipPayment; +import com.dsh.account.model.IncomeQuery; +import com.dsh.account.model.query.RechargeRecordsQuery; +import com.dsh.account.model.vo.RechargeRecordsVO; 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 +23,13 @@ */ 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); + + List<RechargeRecordsVO> rechargeList(RechargeRecordsQuery query); + + List<VipPayment> listAll(IncomeQuery query); } -- Gitblit v1.7.1