From a6858191580ed1e519139f6dae39f7711f82693b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 20 Oct 2025 09:34:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=97=A5=E6=9C=89=E7=A4=BC=E5=8F=91?=
 =?UTF-8?q?=E6=94=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/market/entity/MkBirthdayGiftRecord.java   |  1 +
 .../service/impl/MkBirthdayGiftServiceImpl.java       | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkBirthdayGiftRecord.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkBirthdayGiftRecord.java
index b247dac6..c2aa0d64 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkBirthdayGiftRecord.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkBirthdayGiftRecord.java
@@ -65,6 +65,7 @@ public class MkBirthdayGiftRecord implements Serializable {
     private String templateContent;
     private String phone;
     private Long templateId;
+    private Integer year;
 
 
 }
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java
index 37b0c5c4..1d91303d 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java
@@ -151,6 +151,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
 
     @Override
     public void deliver() {
+        DateTime now = DateUtil.date();
         list(new QueryWrapper().eq(MkBirthdayGift::getIsEnable, 1)).forEach(birthdayGift -> {
             if (StrUtil.isNotBlank(birthdayGift.getConfigList())) {
                 SmsShopTemplate shopTemplate;
@@ -168,19 +169,20 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
                                 current = current.plusDays(config.getDeliverTime());
                             }
                         } else {
-                            DateTime now = DateUtil.date();
                             // 获取当月第一天
                             current = DateUtil.beginOfMonth(now).toLocalDateTime().toLocalDate();
                         }
 
                         QueryWrapper queryWrapper = new QueryWrapper().isNotNull(ShopUser::getBirthDay)
-                                .eq(ShopUser::getMainShopId, birthdayGift.getMainShopId()).eq(ShopUser::getBirthDay, current);
+                                .eq(ShopUser::getMainShopId, birthdayGift.getMainShopId())
+                                .eq("DATE_FORMAT(birth_day, '%m-%d')",  DateUtil.format(DateUtil.date(current), "MM-dd"));
                         if ("vip".equals(config.getUserType())) {
                             queryWrapper.eq(ShopUser::getIsVip, 1);
                         }
 
                         for (ShopUser shopUser : shopUserService.list(queryWrapper)) {
-                            long count = birthdayGiftRecordService.count(new QueryWrapper().eq(MkBirthdayGiftRecord::getUserId, shopUser.getUserId()).eq(MkBirthdayGiftRecord::getBirthday, current));
+                            long count = birthdayGiftRecordService.count(new QueryWrapper().eq(MkBirthdayGiftRecord::getUserId, shopUser.getUserId())
+                                            .eq(MkBirthdayGiftRecord::getYear, DateUtil.year(now)));
                             if (count > 1) {
                                 log.info("用户{}已领取过生日礼包", shopUser.getUserId());
                                 continue;
@@ -191,6 +193,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
                                             TableValueConstant.BirthdayGiftRecord.PushStatus.WAIT_PUSH.getCode() : TableValueConstant.BirthdayGiftRecord.PushStatus.NO_PUSH.getCode())
                                     .setMainShopId(birthdayGift.getMainShopId()).setBirthday(DateUtil.parseDate(shopUser.getBirthDay()).toLocalDateTime().toLocalDate())
                                     .setPhone(shopUser.getPhone()).setTemplateId(shopTemplate == null ? null : shopTemplate.getId())
+                                    .setYear(DateUtil.year(now))
                                     .setSourceId(birthdayGift.getId()).setTemplateCode(shopTemplate == null ? null : shopTemplate.getTemplateCode()).setTemplateContent(JSONObject.toJSONString(Map.of(
                                             "用户昵称", shopUser.getNickName(),
                                             "店铺名称", shopInfo.getShopName(),
@@ -221,9 +224,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
                                     }, "优惠券发放失败");
                                 });
                             }
-
                         }
-
                     });
                 });