diff --git a/src/main/java/com/ycwl/basic/pricing/dto/req/VoucherClaimReq.java b/src/main/java/com/ycwl/basic/pricing/dto/req/VoucherClaimReq.java index 7586ec15..4bb277f4 100644 --- a/src/main/java/com/ycwl/basic/pricing/dto/req/VoucherClaimReq.java +++ b/src/main/java/com/ycwl/basic/pricing/dto/req/VoucherClaimReq.java @@ -4,6 +4,5 @@ import lombok.Data; @Data public class VoucherClaimReq { - private Long scenicId; private String code; } \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/pricing/service/impl/VoucherCodeServiceImpl.java b/src/main/java/com/ycwl/basic/pricing/service/impl/VoucherCodeServiceImpl.java index 6209afd6..9af9ed69 100644 --- a/src/main/java/com/ycwl/basic/pricing/service/impl/VoucherCodeServiceImpl.java +++ b/src/main/java/com/ycwl/basic/pricing/service/impl/VoucherCodeServiceImpl.java @@ -74,9 +74,6 @@ public void generateVoucherCodes(Long batchId, Long scenicId, Integer count) { @Override @Transactional public VoucherCodeResp claimVoucher(VoucherClaimReq req) { - if (req.getScenicId() == null) { - throw new BizException(400, "景区ID不能为空"); - } if (!StringUtils.hasText(req.getCode())) { throw new BizException(400, "券码不能为空"); } @@ -86,19 +83,18 @@ public VoucherCodeResp claimVoucher(VoucherClaimReq req) { // 验证券码是否存在且未被领取 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PriceVoucherCode::getCode, req.getCode()) - .eq(PriceVoucherCode::getScenicId, req.getScenicId()) .eq(PriceVoucherCode::getDeleted, 0); PriceVoucherCode voucherCode = voucherCodeMapper.selectOne(wrapper); if (voucherCode == null) { - throw new BizException(400, "券码不存在或不属于该景区"); + throw new BizException(400, "券码不存在"); } if (!Objects.equals(voucherCode.getStatus(), VoucherCodeStatus.UNCLAIMED.getCode())) { throw new BizException(400, "券码已被领取或已使用"); } - if (!canClaimVoucher(userId, req.getScenicId())) { + if (!canClaimVoucher(userId, voucherCode.getScenicId())) { throw new BizException(400, "该用户在此景区已领取过券码"); }