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

---
 .../czg/controller/admin/BirthdayGiftController.java   |  7 ++++++-
 .../com/czg/market/entity/MkBirthdayGiftRecord.java    |  2 ++
 .../market/service/impl/MkBirthdayGiftServiceImpl.java | 10 ++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/BirthdayGiftController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/BirthdayGiftController.java
index b0447fa5..353afd79 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/admin/BirthdayGiftController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/BirthdayGiftController.java
@@ -24,10 +24,15 @@ import java.time.LocalDateTime;
 @RestController
 @RequestMapping("/admin/birthdayGift")
 public class BirthdayGiftController {
-
     @Resource
     private MkBirthdayGiftService service;
 
+
+    @GetMapping("/test")
+    public CzgResult<String> test() {
+        service.deliver();
+        return CzgResult.success();
+    }
     /**
      * 配置信息获取
      * 权限标识: activate:list
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 e548a8e6..b247dac6 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
@@ -63,6 +63,8 @@ public class MkBirthdayGiftRecord implements Serializable {
     private String pushResp;
     private String templateCode;
     private String templateContent;
+    private String phone;
+    private Long templateId;
 
 
 }
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 bec01b3b..80fcf213 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
@@ -147,7 +147,12 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
     public void deliver() {
         list(new QueryWrapper().eq(MkBirthdayGift::getIsEnable, 1)).forEach(birthdayGift -> {
             if (StrUtil.isNotBlank(birthdayGift.getConfigList())) {
-                SmsShopTemplate shopTemplate = smsShopTemplateService.getById(birthdayGift.getTemplateId());
+                SmsShopTemplate shopTemplate;
+                if (birthdayGift.getTemplateId() != null) {
+                    shopTemplate = smsShopTemplateService.getById(birthdayGift.getTemplateId());
+                } else {
+                    shopTemplate = null;
+                }
                 ShopInfo shopInfo = shopInfoService.getById(birthdayGift.getMainShopId());
                 FunUtils.safeRunVoid(() -> {
                     JSONArray.parseArray(birthdayGift.getConfigList()).toJavaList(MkBirthdayGiftConfig.class).forEach(config -> {
@@ -174,7 +179,8 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
                                     .setPushStatus(birthdayGift.getSendSms() == 1 ?
                                             TableValueConstant.BirthdayGiftRecord.PushStatus.WAIT_PUSH.getCode() : TableValueConstant.BirthdayGiftRecord.PushStatus.NO_PUSH.getCode())
                                     .setMainShopId(birthdayGift.getMainShopId()).setBirthday(DateUtil.parseDate(shopUser.getBirthDay()).toLocalDateTime().toLocalDate())
-                                    .setSourceId(birthdayGift.getId()).setTemplateCode(shopTemplate.getTemplateCode()).setTemplateContent(JSONObject.toJSONString(Map.of(
+                                    .setPhone(shopUser.getPhone()).setTemplateId(shopTemplate == null ? null : shopTemplate.getId())
+                                    .setSourceId(birthdayGift.getId()).setTemplateCode(shopTemplate == null ? null : shopTemplate.getTemplateCode()).setTemplateContent(JSONObject.toJSONString(Map.of(
                                             "用户昵称", shopUser.getNickName(),
                                             "店铺名称", shopInfo.getShopName(),
                                             "数量", config.getCouponInfoList() != null ? config.getCouponInfoList().stream().map(CouponInfoDTO::getNum).reduce(0, Integer::sum) : 0