From e69b3046a4e09c9d864959e20bdcd11cec80ba0c Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 10 九月 2024 18:16:09 +0800
Subject: [PATCH] 1.优惠券-增加有效开始时间和结束时间
---
src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java
index ec5067b..619f255 100644
--- a/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java
@@ -135,7 +135,7 @@
}
// 优惠券字段冗余
- couponRecordDO.setCategory(couponTemplateDO.getGetUserType());
+ couponRecordDO.setCategory(couponTemplateDO.getCategory());
couponRecordDO.setCouponCode(couponTemplateDO.getCouponCode());
couponRecordDO.setCouponName(couponTemplateDO.getCouponName());
couponRecordDO.setCouponDiscountValue(couponTemplateDO.getCouponDiscountValue());
@@ -212,7 +212,7 @@
// 优惠券字段冗余
final CouponTemplateDO couponTemplateDO = couponTemplateService.getById(dto.getCouponId());
if(null!=couponTemplateDO){
- couponRecordDO.setCategory(couponTemplateDO.getGetUserType());
+ couponRecordDO.setCategory(couponTemplateDO.getCategory());
couponRecordDO.setCouponCode(couponTemplateDO.getCouponCode());
couponRecordDO.setCouponName(couponTemplateDO.getCouponName());
couponRecordDO.setCouponDiscountValue(couponTemplateDO.getCouponDiscountValue());
@@ -497,7 +497,7 @@
// 查询订单使用的优惠券
final CouponRecordDO couponRecordDO = getCouponByOrderId(orderId);
if(null==couponRecordDO){
- throw new IllegalArgumentException("优惠券不存在，无法操作");
+ return false;
}
log.info("优惠券退回之前："+ JSON.toJSONString(couponRecordDO));
couponRecordDO.setStatus(CouponUsedStatusEnum.UNUSED.getType());
@@ -524,4 +524,14 @@
}
return null;
}
+
+ @Override
+ public boolean checkUserCouponExists(String couponId, Long customId) {
+ QueryWrapper<CouponRecordDO> queryWrapper=new QueryWrapper<>();
+ queryWrapper.lambda().eq(CouponRecordDO::getDeleted,TrueOrFalseEnum.FALSE.isFlag())
+ .eq(CouponRecordDO::getCouponId,couponId)
+ .eq(CouponRecordDO::getCustomerId,customId)
+ ;
+ return baseMapper.selectCount(queryWrapper)>0;
+ }
}
--
Gitblit v1.9.3