From 6ba718dcc5433f62dfc02a412a57d8f299f48c4d Mon Sep 17 00:00:00 2001
From: lianjie111 <1046407070@qq.com>
Date: Thu, 13 Nov 2025 22:24:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jinrui/core/service/IMarriageCodeService.java  |  2 +-
 .../core/service/impl/MarriageActivityServiceImpl.java |  2 +-
 .../core/service/impl/MarriageCodeServiceImpl.java     | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/com-core-model/src/main/java/com/jinrui/core/service/IMarriageCodeService.java b/com-core-model/src/main/java/com/jinrui/core/service/IMarriageCodeService.java
index 16fd833..a1c67ce 100644
--- a/com-core-model/src/main/java/com/jinrui/core/service/IMarriageCodeService.java
+++ b/com-core-model/src/main/java/com/jinrui/core/service/IMarriageCodeService.java
@@ -13,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2025-09-15
  */
 public interface IMarriageCodeService extends IService<MarriageCode> {
-    void createCode(MarriageActivity marriageActivity);
+    void createCode(MarriageActivity marriageActivity,String createUser);
 }
diff --git a/com-core-model/src/main/java/com/jinrui/core/service/impl/MarriageActivityServiceImpl.java b/com-core-model/src/main/java/com/jinrui/core/service/impl/MarriageActivityServiceImpl.java
index f49f4db..723eb8b 100644
--- a/com-core-model/src/main/java/com/jinrui/core/service/impl/MarriageActivityServiceImpl.java
+++ b/com-core-model/src/main/java/com/jinrui/core/service/impl/MarriageActivityServiceImpl.java
@@ -118,7 +118,7 @@ public class MarriageActivityServiceImpl extends ServiceImpl<MarriageActivityMap
         marriageActivity.setCreateTime(DateTimeUtil.now());
         try {
             save(marriageActivity);
-            marriageCodeService.createCode(marriageActivity);
+            marriageCodeService.createCode(marriageActivity,SecurityUtils.getUsername());
 
 
         } catch (Exception e) {
diff --git a/com-core-model/src/main/java/com/jinrui/core/service/impl/MarriageCodeServiceImpl.java b/com-core-model/src/main/java/com/jinrui/core/service/impl/MarriageCodeServiceImpl.java
index 550b7e0..0bfe4df 100644
--- a/com-core-model/src/main/java/com/jinrui/core/service/impl/MarriageCodeServiceImpl.java
+++ b/com-core-model/src/main/java/com/jinrui/core/service/impl/MarriageCodeServiceImpl.java
@@ -13,6 +13,9 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.xml.crypto.Data;
+import java.util.Date;
+
 /**
  * <p>
  * 新婚送福活动明细表 服务实现类
@@ -27,14 +30,15 @@ public class MarriageCodeServiceImpl extends ServiceImpl<MarriageCodeMapper, Mar
     @Transactional
     @Override
     @Async
-    public void createCode(MarriageActivity marriageActivity) {
+    public void createCode(MarriageActivity marriageActivity, String createUser) {
+        Date now = DateTimeUtil.now();
         for (int i = 0; i < marriageActivity.getTotalSum(); i++) {
             MarriageCode marriageCode = MarriageCode.builder()
                     .activityId(marriageActivity.getId())
                     .code(CodeUtils.generate64CharSecure())
                     .status(0)
-                    .createBy(SecurityUtils.getUsername())
-                    .createTime(DateTimeUtil.now())
+                    .createBy(createUser)
+                    .createTime(now)
                     .build();
             baseMapper.insert(marriageCode);