From 6375ca6c370b007d68786ec7dd941c6eb0e4efa7 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 26 四月 2021 09:27:57 +0800
Subject: [PATCH] bugfixed: 78658

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
index 5bb465f..edbe19c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
@@ -161,6 +161,7 @@
         if(shopOrders.isEmpty()){//未查询到用户上一笔订单
             //查询用户收货地址中的默认地址
             ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectOne(new QueryWrapper<ComShopUserAddressDO>()
+                    .eq("delete_status", 2)
                     .eq("user_id",orderPreviewDTO.getUserId()).eq("is_default",ComShopUserAddressDO.isDefault.yes));
             if(userAddressDO != null){
                 ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
@@ -198,7 +199,7 @@
         ComShopOrderVO shopOrderVO = new ComShopOrderVO();
         //查询用户收货地址
         ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(orderCreateDTO.getReceiverId());
-        if(userAddressDO == null){
+        if(userAddressDO == null||userAddressDO.getDeleteStatus()!=2){
             return R.fail("收货地址不存在");
         }
         //用户id

--
Gitblit v1.7.1