From 75d8b0ad39a7eb04f72ef8654dbb895322f07cfd Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 21 Oct 2025 13:41:42 +0800
Subject: [PATCH] feat(ai): 新增会员答题分页及详情查询功能 - 在 AiMemberAnswerMapper 中新增 getAnswerPage 方法及对应 XML 查询语句 - 新增 ApiMemberAnswerPageDto 和 ApiMemberAnswerPageVo 用于分页查询参数和返回结果 - 在 AiMemberAnswerService 及其实现类中添加 getAnswerPage 方法 - 在 AiMemberService 及其实现类中新增 answerPage 和 answerInfo 接口实现 - 新增 ApiMemberAnswerInfoDto 和 ApiMemberAnswerInfoVo 用于答题详情接口参数和响应 - 在 ApiMemberController 中增加 /answerPage 和 /answerInfo两个 POST 接口 - 优化 AiMemberTeamPracticeVo,增加 memberUuid 字段 - 统一导入包路径,简化代码结构

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 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..8c2676e 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")
         );
 
@@ -703,7 +710,7 @@
         List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectList(
                 new LambdaQueryWrapper<MallOrderItem>()
                         .eq(MallOrderItem::getOrderId, mallOrderInfo.getId())
-                        .eq(MallOrderItem::getLeaderState, StateUpDownEnum.DOWN.getCode())
+//                        .eq(MallOrderItem::getLeaderState, StateUpDownEnum.DOWN.getCode())
                 );
         if(CollUtil.isNotEmpty(mallOrderItems)){
             for(MallOrderItem item : mallOrderItems){
@@ -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());
@@ -744,6 +752,10 @@
         if(mallOrderInfo == null){
             throw new FebsException("订单不存在!");
         }
+        if(mallOrderInfo.getStatus() != OrderStatusEnum.WAIT_FINISH.getValue()){
+            throw new FebsException("订单不是待收货状态!");
+        }
+
 
         MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(mallOrderInfo.getTakeUniqueCode());
         if(mallTeamLeader==null){

--
Gitblit v1.9.1