From e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 六月 2024 20:04:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
index cfb31bc..841eec1 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
@@ -5,13 +5,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.member.dto.MemberDTO;
-import com.ruoyi.member.domain.pojo.MemberPoints;
+import com.ruoyi.member.domain.MemberPoints;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.member.mapper.MemberPointsMapper;
import com.ruoyi.member.service.IMemberPointsService;
import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
/**
* <p>
@@ -24,14 +22,13 @@
@Service
public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, MemberPoints> implements IMemberPointsService {
- @Resource
- private IMemberPointsService iMemberPointsService;
+
@Override
public PageDTO<MemberPoints> getMemberPoints(MemberDTO memberDTO) {
Page<MemberPoints> page = new Page<>(memberDTO.getPageCurr(), memberDTO.getPageSize());
LambdaQueryWrapper<MemberPoints> wrapper= Wrappers.lambdaQuery();
wrapper.eq(MemberPoints::getMemberId,memberDTO.getMemberid());
- Page<MemberPoints> page1 = iMemberPointsService.page(page, wrapper);
+ Page<MemberPoints> page1 = this.page(page, wrapper);
return PageDTO.of(page1);
}
}
--
Gitblit v1.7.1