From 668923a19eea20bd3705319e778f781d53fc2837 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 26 四月 2021 11:04:14 +0800
Subject: [PATCH] Default Changelist

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 edbe19c..d1c97ae 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
@@ -179,9 +179,11 @@
         }else{//查询到用户上一笔订单
             ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(shopOrders.get(0).getReceiverId());
             if(userAddressDO != null){
-                ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
-                BeanUtils.copyProperties(userAddressDO,userAddressVO);
-                orderPreviewVO.setUserAddressVO(userAddressVO);
+                if(userAddressDO.getDeleteStatus() == 2) {
+                    ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
+                    BeanUtils.copyProperties(userAddressDO, userAddressVO);
+                    orderPreviewVO.setUserAddressVO(userAddressVO);
+                }
             }
         }
         return R.ok(orderPreviewVO);

--
Gitblit v1.7.1