From 8fdc0ca22c39004b7c0d17dc9058af8cc55b80b9 Mon Sep 17 00:00:00 2001
From: sdif <xiaoping_0000@163.com>
Date: Thu, 21 Sep 2023 10:23:26 +0800
Subject: [PATCH] 用户端代码提交

---
 pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java b/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
index c8deead..d9880e0 100644
--- a/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
+++ b/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
@@ -329,14 +329,16 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
                 totalOrderVo.setIntro(storeGoods.getIntro());
                 totalOrderVo.setGoodsId(storeGoods.getId());
             }
-
+            UserAddressVo userAddressVo = userAddressMapper.selectVoById(storeOrder.getAddressId());
+            if(null != userAddressVo){
+                totalOrderVo.setUserAddressVo(userAddressVo);
+            }
             if (StringUtils.isNotEmpty(storeOrder.getLogisticsCode())) {
-                UserAddressVo userAddressVo = userAddressMapper.selectVoById(storeOrder.getAddressId());
                 TotalOrderBo totalOrderBo = new TotalOrderBo();
                 if(null != userAddressVo){
-                    totalOrderVo.setUserAddressVo(userAddressVo);
                     totalOrderBo.setPhone(userAddressVo.getPhone());
                 }
+
                 totalOrderBo.setId(totalOrderVo.getId());
                 totalOrderBo.setLogisticsCode(storeOrder.getLogisticsCode());
                 totalOrderVo.setObject(selectLogisticsStatus(totalOrderBo));
--
libgit2 0.26.0