From 5405154d6979f1b50ce2d881bb164b1acca80b6d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 一月 2021 18:58:18 +0800
Subject: [PATCH] 修改相关bug

---
 service-lucky/src/main/java/com/ks/lucky/util/mq/LuckyMQFactory.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/service-lucky/src/main/java/com/ks/lucky/util/mq/LuckyMQFactory.java b/service-lucky/src/main/java/com/ks/lucky/util/mq/LuckyMQFactory.java
index f6c4cef..cc9d79b 100644
--- a/service-lucky/src/main/java/com/ks/lucky/util/mq/LuckyMQFactory.java
+++ b/service-lucky/src/main/java/com/ks/lucky/util/mq/LuckyMQFactory.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 import com.ks.lucky.pojo.DO.LuckyActivity;
+import com.ks.lucky.pojo.DO.LuckyActivityOpenInfo;
 import com.ks.lucky.pojo.DO.LuckyMQ;
 import com.ks.lucky.pojo.DTO.ActivityDrwanOutDateMsg;
 import com.ks.lucky.pojo.DTO.ActivityMQMsg;
@@ -36,19 +37,15 @@
     }
 
 
-    public static LuckyMQ createOpenActivity(LuckyActivity activity) {
+    public static LuckyMQ createOpenActivity(Long activityId, Date preOpenTime) {
         LuckyMQ mq = new LuckyMQ();
         mq.setState(LuckyMQ.STATE_NOT_SEND);
         mq.setCreateTime(new Date());
         //璁剧疆寮�濂栨椂闂�
-        if (activity.getPreOpenTime() != null) {
-            mq.setPreSendTime(activity.getPreOpenTime());
-        } else {
-            mq.setPreSendTime(activity.getActualFinishTime());
-        }
-        mq.setQueueContent(new Gson().toJson(new ActivityMQMsg(activity.getId(), ActivityMQMsg.TYPE_EXEC_OPEN, new Date())));
+        mq.setPreSendTime(preOpenTime);
+        mq.setQueueContent(new Gson().toJson(new ActivityMQMsg(activityId, ActivityMQMsg.TYPE_EXEC_OPEN, new Date())));
         mq.setQueueName(CMQManager.QUEUENAME_LUCKY_ACTIVITY);
-        mq.setTaskId("open-activity-" + activity.getId());
+        mq.setTaskId("open-activity-" + activityId);
         mq.setTaskName("娲诲姩寮�濂�");
         return mq;
     }

--
Gitblit v1.8.0