From b933c7cdaea1386d50085b1602e4ee2729ac9af2 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 26 May 2025 16:05:14 +0800
Subject: [PATCH] fix(mall): 修复拼团团长详情页面订单信息展示问题- 将 ApiHappyOrderLeaderVo 中的 itemId 字段类型从 String 改为 Long - 在 ApiMallTeamLeaderServiceImpl 中为 apiHappyOrderLeaderVo 设置正确的 itemId值

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 773a97d..66e1455 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -683,9 +683,16 @@
 
         String takeCode = dto.getTakeCode();
 
+        List<Integer> orderStates = Arrays.asList(
+                OrderStatusEnum.WAIT_SHIPPING.getValue(),
+                OrderStatusEnum.WAIT_FINISH.getValue(),
+                OrderStatusEnum.FINISH.getValue()
+        );
+
         MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectOne(
                 new LambdaQueryWrapper<MallOrderInfo>()
                         .eq(MallOrderInfo::getTakeCode, takeCode)
+                        .in(MallOrderInfo::getStatus, orderStates)
                         .last("limit 1")
         );
 
@@ -714,6 +721,7 @@
                 apiHappyOrderLeaderVo.setOrderId(mallOrderInfo.getId());
                 apiHappyOrderLeaderVo.setOrderState(mallOrderInfo.getStatus());
                 apiHappyOrderLeaderVo.setTakeCode(takeCode);
+                apiHappyOrderLeaderVo.setItemId(item.getId());
                 apiHappyOrderLeaderVo.setGoodsName(item.getGoodsName());
                 apiHappyOrderLeaderVo.setGoodsSku(item.getSkuName());
                 apiHappyOrderLeaderVo.setGoodsCnt(item.getCnt());

--
Gitblit v1.9.1