From ba11b8586b1f3a6b072d787719083a792e1d1671 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 03 Jul 2025 16:04:03 +0800
Subject: [PATCH] feat(mall): 添加衣速达订单相关功能

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 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 031f3a6..e7e5c42 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
@@ -34,6 +34,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -871,8 +872,15 @@
             }
         }
 
-        MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
-        if(ObjectUtil.isNotEmpty(expressInfo)){
+        MallExpressInfo expressInfo = expressInfoMapper.selectOne(
+                Wrappers.lambdaQuery(MallExpressInfo.class)
+                        .eq(MallExpressInfo::getOrderId, orderInfo.getId())
+                        .eq(MallExpressInfo::getOrderNo, orderInfo.getOrderNo())
+                        .last("limit 1")
+        );
+
+//        MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
+        if(ObjectUtil.isNotNull(expressInfo)){
             orderDetailVo.setExpressNo(expressInfo.getExpressNo());
             orderDetailVo.setExpressCom(expressInfo.getExpressCom());
         }

--
Gitblit v1.9.1