From e425e5d101e1d48e40674a2a801efb8dd060e8a5 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期五, 20 九月 2024 13:44:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'
---
src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 3a788f3..573ebaf 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
@@ -144,7 +144,8 @@
couponRecordDO.setCouponDiscountType(couponTemplateDO.getCouponDiscountType());
couponRecordDO.setGetUserType(couponTemplateDO.getGetUserType());
couponRecordDO.setPoint(couponTemplateDO.getPoint());
- couponRecordDO.setMemberId(couponRecordDO.getMemberId());
+ couponRecordDO.setMemberId(couponTemplateDO.getMemberId());
+ couponRecordDO.setImageUrl(couponTemplateDO.getImageUrl());
// 根据优惠券模板来计算优惠券的生效开始时间和结束时间
@@ -276,6 +277,7 @@
couponRecordDO.setEffectiveStart(firstDayStart);
couponRecordDO.setEffectiveEnd(lastDayEnd);
couponRecordDO.setMemberId(couponTemplateDO.getMemberId());
+ couponRecordDO.setImageUrl(couponTemplateDO.getImageUrl());
// 创建信息
couponRecordDO.create();
if(!checkCurMonVipCouponExists(couponRecordDO.getCouponId(),couponRecordDO.getCustomerId(),firstDayStart,lastDayEnd)){
@@ -395,6 +397,17 @@
}
@Override
+ public Integer getUserGainCouponRecordAmountByUserId(String couponId, String userId) {
+ QueryWrapper<CouponRecordDO> queryWrapper=new QueryWrapper<>();
+ queryWrapper.lambda().eq(CouponRecordDO::getDeleted, TrueOrFalseEnum.FALSE.isFlag())
+ .eq(StringUtils.isNotBlank(couponId), CouponRecordDO::getCouponId,couponId)
+ .eq(null!=userId,CouponRecordDO::getUserId,userId)
+ ;
+
+ return baseMapper.selectCount(queryWrapper);
+ }
+
+ @Override
public List<CouponRecordVO> getMineCouponRecordList(QueryMineCouponRecordDTO dto) {
checkCouponExpired(dto);
return couponRecordMapperCustom.getMineCouponRecordList(dto);
--
Gitblit v1.9.3