From efe9a1a6e4018b347e5c310fb1457273888c3b27 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Fri, 7 Apr 2023 16:45:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lili/controller/member/MemberAddressBuyerController.java  | 2 ++
 .../modules/member/serviceimpl/MemberAddressServiceImpl.java  | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java
index 16caae695..fdd8e297d 100644
--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java
@@ -68,6 +68,8 @@ public class MemberAddressBuyerController {
     @ApiOperation(value = "修改会员收件地址")
     @PutMapping
     public ResultMessage<MemberAddress> editShippingAddress(@Valid MemberAddress shippingAddress) {
+        OperationalJudgment.judgment(memberAddressService.getById(shippingAddress.getId()));
+        shippingAddress.setMemberId(Objects.requireNonNull(UserContext.getCurrentUser()).getId());
         return ResultUtil.data(memberAddressService.updateMemberAddress(shippingAddress));
     }
 
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberAddressServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberAddressServiceImpl.java
index a05ff296b..5ccee96c3 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberAddressServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberAddressServiceImpl.java
@@ -69,9 +69,7 @@ public class MemberAddressServiceImpl extends ServiceImpl<MemberAddressMapper, M
     @Transactional(rollbackFor = Exception.class)
     public MemberAddress updateMemberAddress(MemberAddress memberAddress) {
         MemberAddress originalMemberAddress = this.getMemberAddress(memberAddress.getId());
-        if (originalMemberAddress != null &&
-                originalMemberAddress.getMemberId().equals(Objects.requireNonNull(UserContext.getCurrentUser()).getId())) {
-
+        if (originalMemberAddress != null) {
             if (memberAddress.getIsDefault() == null) {
                 memberAddress.setIsDefault(false);
             }