From 60102c7bc76680b14baf0a62a2becea24f414a82 Mon Sep 17 00:00:00 2001
From: js199000131 <2728757160@qq.com>
Date: Mon, 15 May 2023 10:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=94=B6=E4=BB=B6=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/shop/service/order/impl/OrderServiceImpl.java | 3 +--
 .../yudao/module/member/api/address/dto/AddressRespDTO.java    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java
index 7c8ae3f38..536346d02 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java
@@ -51,7 +51,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.annotation.OrderUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.support.TransactionTemplate;
 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
@@ -1120,7 +1119,7 @@ public class OrderServiceImpl implements OrderService {
         if (orderRequest.getShippingType() == 1) { // 快递配送
             if (orderRequest.getAddressId() <= 0) throw new ServiceException("请选择收货地址");
             AddressRespDTO userAddress = addressApi.getById(orderRequest.getAddressId());
-            if (ObjectUtil.isNull(userAddress) || userAddress.getIsDel()) {
+            if (ObjectUtil.isNull(userAddress) || userAddress.getDeleted()) {
                 throw new ServiceException("收货地址有误");
             }
             orderRequest.setRealName(userAddress.getName());
diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/dto/AddressRespDTO.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/dto/AddressRespDTO.java
index 050d72965..7233d4b69 100644
--- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/dto/AddressRespDTO.java
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/dto/AddressRespDTO.java
@@ -75,5 +75,5 @@ public class AddressRespDTO {
      *
      * true - 收货人所在区
      */
-    private Boolean isDel;
+    private Boolean deleted;
 }