From e59e26244b2a07b9d8360551cbab75c6fd8a1248 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 31 五月 2024 15:15:21 +0800
Subject: [PATCH] 修改循环注入

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java
index ac3324b..8022145 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java
@@ -2,15 +2,15 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.member.DTO.MemberAddressDTO;
-import com.ruoyi.member.domain.pojo.MemberAddress;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.member.dto.MemberAddressDTO;
 import com.ruoyi.member.mapper.MemberAddressMapper;
 import com.ruoyi.member.service.IMemberAddressService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.api.domain.MemberAddress;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * <p>
@@ -22,32 +22,33 @@
  */
 @Service
 public class MemberAddressServiceImpl extends ServiceImpl<MemberAddressMapper, MemberAddress> implements IMemberAddressService {
-    @Resource
-    private  IMemberAddressService iMemberAddressService;
+
     @Override
-    public List<MemberAddress> getMemberAddressList(MemberAddressDTO memberAddressDTO) {
+    public PageDTO<MemberAddress> getMemberAddressList(MemberAddressDTO memberAddressDTO) {
+        Page<MemberAddress> page = new Page<>(memberAddressDTO.getPageCurr(), memberAddressDTO.getPageSize());
         LambdaQueryWrapper<MemberAddress> wrapper= Wrappers.lambdaQuery();
         wrapper.eq(MemberAddress::getMemberId,memberAddressDTO.getMemberId());
         wrapper.eq(MemberAddress::getDelFlag,0);
         wrapper.orderByDesc(MemberAddress::getIsDefault);
-        return iMemberAddressService.list(wrapper);
+        Page<MemberAddress> page1 = this.page(page, wrapper);
+        return PageDTO.of(page1);
     }
 
     @Override
     public void addMemberAddress(MemberAddressDTO memberAddressDTO) {
         MemberAddress memberAddress=new MemberAddress();
         if (memberAddressDTO.getId()!=null){
-            memberAddress=iMemberAddressService.getById(memberAddressDTO.getId());
+            memberAddress=this.getById(memberAddressDTO.getId());
         }
        if(memberAddressDTO.getIsDefault()==2){
            LambdaQueryWrapper<MemberAddress> wrapper= Wrappers.lambdaQuery();
            wrapper.eq(MemberAddress::getMemberId,memberAddressDTO.getMemberId());
            wrapper.eq(MemberAddress::getDelFlag,0);
            wrapper.eq(MemberAddress::getIsDefault,2);
-           MemberAddress memberAddress1=iMemberAddressService.getOne(wrapper);
+           MemberAddress memberAddress1=this.getOne(wrapper);
            if (memberAddress1!=null){
                memberAddress1.setIsDefault(1);
-               iMemberAddressService.updateById(memberAddress1);
+               this.updateById(memberAddress1);
            }
        }
        memberAddress.setMemberId(memberAddressDTO.getMemberId());
@@ -59,12 +60,12 @@
        memberAddress.setRecipientPhone(memberAddressDTO.getRecipientPhone());
        memberAddress.setDetailedAddress(memberAddressDTO.getDetailedAddress());
        memberAddress.setIsDefault(memberAddressDTO.getIsDefault());
-       iMemberAddressService.saveOrUpdate(memberAddress);
+        this.saveOrUpdate(memberAddress);
 
     }
 
     @Override
     public void delMemberAddress(MemberAddressDTO memberAddressDTO) {
-        iMemberAddressService.removeById(memberAddressDTO.getId());
+        this.removeById(memberAddressDTO.getId());
     }
 }

--
Gitblit v1.7.1