From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java |   74 ++++++++++++++++++++++++++++++++++++
 1 files changed, 73 insertions(+), 1 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 8eed8ae..e85f6d4 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
@@ -1,10 +1,18 @@
 package com.ruoyi.member.service.impl;
 
-import com.ruoyi.member.domain.pojo.MemberAddress;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.system.api.domain.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 java.util.List;
+
 
 /**
  * <p>
@@ -17,4 +25,68 @@
 @Service
 public class MemberAddressServiceImpl extends ServiceImpl<MemberAddressMapper, MemberAddress> implements IMemberAddressService {
 
+    @Override
+    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);
+        Page<MemberAddress> page1 = this.page(page, wrapper);
+        return PageDTO.of(page1);
+    }
+
+    @Override
+    public MemberAddress getDefaultMemberAddressList(MemberAddressDTO memberAddressDTO) {
+        LambdaQueryWrapper<MemberAddress> wrapper= Wrappers.lambdaQuery();
+        wrapper.eq(MemberAddress::getMemberId,memberAddressDTO.getMemberId());
+        wrapper.eq(MemberAddress::getDelFlag,0);
+        wrapper.eq(MemberAddress::getIsDefault,2);
+        MemberAddress memberAddress1=this.getOne(wrapper);
+        if (memberAddress1==null){
+            LambdaQueryWrapper<MemberAddress> wrapper1= Wrappers.lambdaQuery();
+            wrapper1.eq(MemberAddress::getMemberId,memberAddressDTO.getMemberId());
+            wrapper1.eq(MemberAddress::getDelFlag,0);
+            List<MemberAddress> list = this.list(wrapper);
+            if (list.size()>0){
+                memberAddress1=list.get(0);
+            }
+        }
+        return memberAddress1;
+    }
+
+    @Override
+    public void addMemberAddress(MemberAddressDTO memberAddressDTO) {
+        MemberAddress memberAddress=new MemberAddress();
+        if (memberAddressDTO.getId()!=null){
+            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=this.getOne(wrapper);
+           if (memberAddress1!=null){
+               memberAddress1.setIsDefault(1);
+               this.updateById(memberAddress1);
+           }
+       }
+       memberAddress.setMemberId(memberAddressDTO.getMemberId());
+       memberAddress.setReceiverCity(memberAddressDTO.getReceiverCity());
+       memberAddress.setReceiverProvince(memberAddressDTO.getReceiverProvince());
+       memberAddress.setReceiverRegion(memberAddressDTO.getReceiverRegion());
+       memberAddress.setCity(memberAddressDTO.getReceiverProvince()+memberAddressDTO.getReceiverCity()+memberAddressDTO.getReceiverRegion());
+       memberAddress.setRecipientName(memberAddressDTO.getRecipientName());
+       memberAddress.setRecipientPhone(memberAddressDTO.getRecipientPhone());
+       memberAddress.setDetailedAddress(memberAddressDTO.getDetailedAddress());
+       memberAddress.setIsDefault(memberAddressDTO.getIsDefault());
+        this.saveOrUpdate(memberAddress);
+
+    }
+
+    @Override
+    public void delMemberAddress(MemberAddressDTO memberAddressDTO) {
+        this.removeById(memberAddressDTO.getId());
+    }
 }

--
Gitblit v1.7.1