From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 11 十月 2023 20:03:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java b/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java index c753574..9591ece 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java +++ b/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java @@ -1,7 +1,10 @@ package com.dsh.account.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.dsh.account.entity.UserIntegral; import com.dsh.account.entity.UserIntegralChanges; +import com.dsh.account.model.IntegralListQuery; import com.dsh.account.model.SaveUserIntegralChangesVo; import com.dsh.account.model.vo.userBenefitDetail.ExchangeDetailsResponse; import com.dsh.account.model.vo.userBenefitDetail.IntegralsData; @@ -32,6 +35,9 @@ List<ExchangeDetailsResponse> queryExchangeGoodsdetails(Integer userIdFormRedis, Integer useType, Integer goodType); - PointDetailsVo queryRedemptionDetails(Integer detailsId); + PointDetailsVo queryRedemptionDetails(Long detailsId); + + Page<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery); + } -- Gitblit v1.7.1