From e85a0679ecd9e78483df43e8ee0b338e8dbfe8be Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 14 Feb 2023 17:18:26 +0800
Subject: [PATCH] 后台商品修改

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index d3dd280..5f9d624 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -462,8 +462,8 @@
 
         OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo);
 
-        if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue()) {
-            MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
+        MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
+        if(ObjectUtil.isNotEmpty(expressInfo)){
             orderDetailVo.setExpressNo(expressInfo.getExpressNo());
             orderDetailVo.setExpressCom(expressInfo.getExpressCom());
         }

--
Gitblit v1.9.1