用户端代码提交

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.setIntro(storeGoods.getIntro());
                 totalOrderVo.setGoodsId(storeGoods.getId());
                 totalOrderVo.setGoodsId(storeGoods.getId());
             }
             }
-
+            UserAddressVo userAddressVo = userAddressMapper.selectVoById(storeOrder.getAddressId());
+            if(null != userAddressVo){
+                totalOrderVo.setUserAddressVo(userAddressVo);
+            }
             if (StringUtils.isNotEmpty(storeOrder.getLogisticsCode())) {
             if (StringUtils.isNotEmpty(storeOrder.getLogisticsCode())) {
-                UserAddressVo userAddressVo = userAddressMapper.selectVoById(storeOrder.getAddressId());
                 TotalOrderBo totalOrderBo = new TotalOrderBo();
                 TotalOrderBo totalOrderBo = new TotalOrderBo();
                 if(null != userAddressVo){
                 if(null != userAddressVo){
-                    totalOrderVo.setUserAddressVo(userAddressVo);
                     totalOrderBo.setPhone(userAddressVo.getPhone());
                     totalOrderBo.setPhone(userAddressVo.getPhone());
                 }
                 }
+
                 totalOrderBo.setId(totalOrderVo.getId());
                 totalOrderBo.setId(totalOrderVo.getId());
                 totalOrderBo.setLogisticsCode(storeOrder.getLogisticsCode());
                 totalOrderBo.setLogisticsCode(storeOrder.getLogisticsCode());
                 totalOrderVo.setObject(selectLogisticsStatus(totalOrderBo));
                 totalOrderVo.setObject(selectLogisticsStatus(totalOrderBo));