From 24ef276642d829c8a0cf0c03d1469f0ced9147da Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 26 May 2025 15:52:54 +0800
Subject: [PATCH] refactor(mall): 优化自提码验证逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 7 +++++++
src/main/java/cc/mrbird/febs/mall/dto/ApiHappyOrderLeaderDto.java | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiHappyOrderLeaderDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiHappyOrderLeaderDto.java
index aea7976..5b63846 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/ApiHappyOrderLeaderDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiHappyOrderLeaderDto.java
@@ -10,7 +10,7 @@
@ApiModel(value = "ApiHappyOrderLeaderDto", description = "参数接收类")
public class ApiHappyOrderLeaderDto {
- @NotBlank(message = "自提码")
+ @NotBlank(message = "自提码不能为空")
@ApiModelProperty(value = "自提码（手动输入，或者扫码）", example = "1")
private String takeCode;
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..734aa7a 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")
);
--
Gitblit v1.9.1