From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/IntegralRecordServiceImpl.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/IntegralRecordServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/IntegralRecordServiceImpl.java
index bfa0bff..38d6bd9 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/IntegralRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/IntegralRecordServiceImpl.java
@@ -1,10 +1,17 @@
 package com.ruoyi.member.service.impl.member;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.member.domain.dto.MgtMemberIntegralPageDto;
 import com.ruoyi.member.domain.pojo.member.IntegralRecord;
+import com.ruoyi.member.domain.vo.AppIntegralRecordPageVo;
+import com.ruoyi.member.domain.vo.MgtMemberIntegralPageVo;
 import com.ruoyi.member.mapper.member.IntegralRecordMapper;
 import com.ruoyi.member.service.member.IntegralRecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +24,29 @@
 @Service
 public class IntegralRecordServiceImpl extends ServiceImpl<IntegralRecordMapper, IntegralRecord> implements IntegralRecordService {
 
+    @Resource
+    private IntegralRecordMapper integralRecordMapper;
+
+    /**
+     * 获取会员积分明细
+     * @param mgtMemberIntegralPageDto
+     * @return
+     */
+    @Override
+    public List<MgtMemberIntegralPageVo> pageMgtMemberIntegral(Page page, MgtMemberIntegralPageDto mgtMemberIntegralPageDto){
+        return integralRecordMapper.pageMgtMemberIntegral(page, mgtMemberIntegralPageDto);
+    }
+
+    /**
+     * @description  小程序获取用户积分明细
+     * @author  jqs
+     * @date    2023/7/12 14:37
+     * @param page
+     * @param userId
+     * @return  List<AppIntegralRecordPageVo>
+     */
+    @Override
+    public List<AppIntegralRecordPageVo> pageAppMemberIntegralRecord(Page page, Long userId){
+        return integralRecordMapper.pageAppMemberIntegralRecord(page,userId);
+    }
 }

--
Gitblit v1.7.1