diff --git a/src/main/java/com/ycwl/basic/model/pc/coupon/entity/CouponEntity.java b/src/main/java/com/ycwl/basic/model/pc/coupon/entity/CouponEntity.java index 40dcbb4..c8c24c1 100644 --- a/src/main/java/com/ycwl/basic/model/pc/coupon/entity/CouponEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/coupon/entity/CouponEntity.java @@ -18,13 +18,16 @@ public class CouponEntity { // 新增优惠券名称字段 private String name; - + // 优惠券描述 private String description; - + // 倒计时字段(仅用于展示) private String countdown; - + + // 广播字段,仅用于展示 + private String broadcast; + /** * 优惠券类别,0:普通优惠券;1:第一次推送;2:第二次;3:第三次 */ diff --git a/src/main/java/com/ycwl/basic/model/pc/coupon/resp/CouponRespVO.java b/src/main/java/com/ycwl/basic/model/pc/coupon/resp/CouponRespVO.java index e5b7b07..5c7c985 100644 --- a/src/main/java/com/ycwl/basic/model/pc/coupon/resp/CouponRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/coupon/resp/CouponRespVO.java @@ -12,13 +12,16 @@ public class CouponRespVO { // 新增优惠券名称字段 private String name; - + // 优惠券描述 private String description; - + // 倒计时字段(仅用于展示) private String countdown; - + + // 通知展示字段,仅用于展示 + private String broadcast; + /** * 优惠券类别,0:普通优惠券;1:第一次推送;2:第二次;3:第三次 */ diff --git a/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java b/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java index 9e33c0d..eedb013 100644 --- a/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java +++ b/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java @@ -1,9 +1,12 @@ package com.ycwl.basic.task; import cn.hutool.core.date.DateUtil; +import com.ycwl.basic.mapper.CouponMapper; import com.ycwl.basic.mapper.MemberMapper; import com.ycwl.basic.mapper.ScenicMapper; import com.ycwl.basic.mapper.VideoMapper; +import com.ycwl.basic.model.pc.coupon.req.CouponQueryReq; +import com.ycwl.basic.model.pc.coupon.resp.CouponRespVO; import com.ycwl.basic.model.pc.member.resp.MemberRespVO; import com.ycwl.basic.model.pc.mp.MpConfigEntity; import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity; @@ -47,6 +50,8 @@ public class DownloadNotificationTasker { private TemplateRepository templateRepository; @Autowired private ScenicMapper scenicMapper; + @Autowired + private CouponMapper couponMapper; @Scheduled(cron = "0 0 21 * * *") public void sendDownloadNotification() { @@ -129,7 +134,16 @@ public class DownloadNotificationTasker { dateMap.put("value", DateUtil.format(expireDate, "yyyy-MM-dd HH:mm")); dataParam.put("time2", dateMap); Map remarkMap = new HashMap<>(); - remarkMap.put("value", "视频即将删除,花点小钱买下回忆"); + // 查询是否有优惠券可用,如果有,则显示优惠券配置的内容 + CouponQueryReq query = new CouponQueryReq(); + query.setScenicId(item.getScenicId()); + query.setType(3); + List coupons = couponMapper.selectByQuery(query); + if (coupons.isEmpty()) { + remarkMap.put("value", "视频即将删除,花点小钱买下回忆"); + } else { + remarkMap.put("value", coupons.getFirst().getBroadcast()); + } dataParam.put("thing3", remarkMap); params.put("data", dataParam); params.put("page", page); diff --git a/src/main/resources/mapper/CouponMapper.xml b/src/main/resources/mapper/CouponMapper.xml index bfb8214..50d2e6d 100644 --- a/src/main/resources/mapper/CouponMapper.xml +++ b/src/main/resources/mapper/CouponMapper.xml @@ -11,7 +11,7 @@ \ No newline at end of file