refactor(mall): 优化自提码验证逻辑

Administrator

2025-05-26 24ef276642d829c8a0cf0c03d1469f0ced9147da

refactor(mall): 优化自提码验证逻辑

- 完善自提码不能为空的验证提示
- 添加订单状态过滤，只查询待发货、待完成和已完成的订单

 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;


 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")
        );