From 51f26723bee741bf112c8d0d965d0e2f2974bd04 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 31 三月 2025 10:02:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 b45c68a..a1d1753 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,10 +1,13 @@
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.IntegralDetailsResponse;
+import com.dsh.account.model.vo.userBenefitDetail.IntegralsData;
import com.dsh.account.model.vo.userBenefitDetail.PointDetailsVo;
import java.util.List;
@@ -19,19 +22,24 @@
*/
public interface UserIntegralChangesService extends IService<UserIntegralChanges> {
- IntegralDetailsResponse queryUserPointsDetails(String yearMonth, Integer recordId, Integer userIdFormRedis);
+ List<IntegralsData> queryUserPointsDetails(String yearMonth, Integer recordId, Integer userIdFormRedis);
/**
* 保存用户积分变动
+ *
* @param vo
* @throws Exception
*/
- void saveUserIntegralChanges(SaveUserIntegralChangesVo vo) throws Exception;
+ void saveUserIntegralChanges(SaveUserIntegralChangesVo vo);
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);
+
+
+ List<ExchangeDetailsResponse> queryExchangeGoodsdetails1(Integer userIdFormRedis, Integer useType, Integer goodType, Integer page, Integer size);
}
--
Gitblit v1.7.1