From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类,添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑,增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑,移除冗余代码

---
 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