From 9fef5e91afa0073f95dd203159b5eccf68555536 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 19 Aug 2025 11:20:12 +0800
Subject: [PATCH] refactor(mall): 修改 WxxcxJob 类的条件加载配置- 将 @ConditionalOnProperty 注解的 havingValue 属性从 "true" 改为 "false"- 此修改改变了 WxxcxJob 类的加载条件，根据配置项 system.job 的值来决定是否加载该类
---
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