From 63ceff022cb43ceb92a92985f0ab11778150d015 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 12:00:58 +0800
Subject: [PATCH] fix(mall): 优化确认收货逻辑

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 2160e22..b6e6fa7 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
@@ -904,7 +904,7 @@
         if (orderInfo.getStatus() != OrderStatusEnum.WAIT_FINISH.getValue()) {
             throw new FebsException("该状态不能确认收货");
         }
-        if(1 == orderInfo.getDeliveryType()){
+        if(ObjectUtil.isNotEmpty(orderInfo.getDeliveryType()) && 1 == orderInfo.getDeliveryType()){
             List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectList(
                     new LambdaQueryWrapper<MallOrderItem>()
                             .eq(MallOrderItem::getOrderId, id)

--
Gitblit v1.9.1