diff --git a/src/main/java/com/ycwl/basic/task/CouponExpireNotificationTask.java b/src/main/java/com/ycwl/basic/task/CouponExpireNotificationTask.java index 05e596ee..8ea345b4 100644 --- a/src/main/java/com/ycwl/basic/task/CouponExpireNotificationTask.java +++ b/src/main/java/com/ycwl/basic/task/CouponExpireNotificationTask.java @@ -3,6 +3,7 @@ package com.ycwl.basic.task; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO; import com.ycwl.basic.mapper.MemberMapper; import com.ycwl.basic.model.pc.member.resp.MemberRespVO; import com.ycwl.basic.model.pc.notify.req.WechatSubscribeNotifyTriggerRequest; @@ -11,6 +12,7 @@ import com.ycwl.basic.pricing.entity.PriceCouponConfig; import com.ycwl.basic.pricing.enums.CouponStatus; import com.ycwl.basic.pricing.mapper.PriceCouponClaimRecordMapper; import com.ycwl.basic.pricing.mapper.PriceCouponConfigMapper; +import com.ycwl.basic.repository.ScenicRepository; import com.ycwl.basic.service.notify.WechatSubscribeNotifyTriggerService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -39,6 +41,8 @@ public class CouponExpireNotificationTask { private WechatSubscribeNotifyTriggerService notifyTriggerService; @Autowired private PriceCouponConfigMapper priceCouponConfigMapper; + @Autowired + private ScenicRepository scenicRepository; @Scheduled(cron = "0 0 20 * * *") public void sendCouponExpireNotification() { @@ -54,6 +58,31 @@ public class CouponExpireNotificationTask { log.info("优惠券临期提醒定时任务执行结束"); } + @Scheduled(cron = "0 30 10-22 * * *") + public void sendCouponReceivedNotification() { + log.info("开始执行优惠券领取通知定时任务"); + Date now = new Date(); + Date beginTime = DateUtil.offsetHour(now, -3); + Date endTime = DateUtil.offsetHour(now, -2); + + log.info("查询时间范围: {} - {}", beginTime, endTime); + + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.between(PriceCouponClaimRecord::getCreateTime, beginTime, endTime); + queryWrapper.eq(PriceCouponClaimRecord::getStatus, CouponStatus.CLAIMED); + + List couponRecords = couponClaimRecordMapper.selectList(queryWrapper); + processRecords(couponRecords, "COUPON_NOTICE"); + log.info("优惠券领取通知定时任务执行结束"); + } + + @Scheduled(cron = "0 0 18 * * *") + public void sendCouponPastHalfNotification() { + log.info("开始执行优惠券有效期过半提醒定时任务"); + processNotification("COUPON_PAST_HALF", -1); + log.info("优惠券有效期过半提醒定时任务执行结束"); + } + private void processNotification(String notifyType, int offsetDays) { // 获取指定偏移天数(例如-2 days)的开始和结束时间 Date date = DateUtil.offsetDay(new Date(), offsetDays); @@ -68,7 +97,10 @@ public class CouponExpireNotificationTask { queryWrapper.eq(PriceCouponClaimRecord::getStatus, CouponStatus.CLAIMED); List couponRecords = couponClaimRecordMapper.selectList(queryWrapper); + processRecords(couponRecords, notifyType); + } + private void processRecords(List couponRecords, String notifyType) { if (couponRecords == null || couponRecords.isEmpty()) { log.info("未找到符合条件的优惠券记录"); return; @@ -82,6 +114,7 @@ public class CouponExpireNotificationTask { if (member == null || member.getOpenId() == null) { continue; } + ScenicV2DTO scenicBasic = scenicRepository.getScenicBasic(member.getScenicId()); PriceCouponConfig coupon = priceCouponConfigMapper.selectValidCouponById(record.getCouponId()); HashMap variables = new HashMap<>(); @@ -91,6 +124,8 @@ public class CouponExpireNotificationTask { // 优惠券有效期到第二天的结束,从领取开始的时候算 variables.put("couponStartTime", DateUtil.format(record.getCreateTime(), "yyyy-MM-dd HH:mm")); variables.put("couponExpireTime", DateUtil.format(DateUtil.endOfDay(DateUtil.offsetDay(record.getCreateTime(), 2)), "yyyy-MM-dd HH:mm")); + variables.put("scenicId", member.getScenicId()); + variables.put("scenicName", scenicBasic.getName()); WechatSubscribeNotifyTriggerRequest request = WechatSubscribeNotifyTriggerRequest.builder() .memberId(record.getUserId())