From 0c00942b096c8fcdd0c8e53d4e71741aa1f3a74b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 17 Feb 2023 15:33:08 +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