From 8657f3758fa1acef3445f82b82f81fdba5e0c1db Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Sep 2025 11:29:00 +0800
Subject: [PATCH] feat(member): 更新会员公司ID逻辑 - 从API DTO中提取公司ID - 验证并转换公司编码为内部ID - 设置会员关联的公司ID - 优化公司信息查询逻辑 - 修复公司ID更新问题 - 确保会员信息正确绑定公司关系

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java |    6 +++++-
 1 files changed, 5 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 66e1455..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
@@ -710,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){
@@ -752,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