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

---
 service-daylucky/src/main/java/com/ks/daylucky/util/factory/LuckyMsgContentFactory.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/service-daylucky/src/main/java/com/ks/daylucky/util/factory/LuckyMsgContentFactory.java b/service-daylucky/src/main/java/com/ks/daylucky/util/factory/LuckyMsgContentFactory.java
index c172049..79a9d34 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/util/factory/LuckyMsgContentFactory.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/util/factory/LuckyMsgContentFactory.java
@@ -4,6 +4,8 @@
 import com.ks.daylucky.pojo.VO.SimpleUser;
 import com.ks.daylucky.util.activity.ActivityUtil;
 
+import java.util.Date;
+
 public class LuckyMsgContentFactory {
 
 
@@ -13,11 +15,11 @@
      * @param activityId
      * @return
      */
-    public static LuckyMsgContent createJoinSuccess(Long activityId) {
+    public static LuckyMsgContent createJoinSuccess(Long activityId, Date activityCreateTime) {
         LuckyMsgContent msgContent = new LuckyMsgContent();
         msgContent.setLuckyMsgType(LuckyMsgContent.LuckyMsgType.joinSuccess);
         msgContent.setActivityId(activityId);
-        msgContent.setDateNumber(ActivityUtil.getActivityDateNumber(activityId));
+        msgContent.setDateNumber(ActivityUtil.getActivityDateNumber(activityId,activityCreateTime));
         msgContent.setRemarks("鏃�");
         return msgContent;
     }
@@ -28,11 +30,11 @@
      * @param activityId
      * @return
      */
-    public static LuckyMsgContent createNotDrawn(Long activityId) {
+    public static LuckyMsgContent createNotDrawn(Long activityId,Date activityCreateTime) {
         LuckyMsgContent msgContent = new LuckyMsgContent();
         msgContent.setLuckyMsgType(LuckyMsgContent.LuckyMsgType.notDrawn);
         msgContent.setActivityId(activityId);
-        msgContent.setDateNumber(ActivityUtil.getActivityDateNumber(activityId));
+        msgContent.setDateNumber(ActivityUtil.getActivityDateNumber(activityId,activityCreateTime));
         msgContent.setRemarks("鏃�");
         msgContent.setOpenState("宸插紑濂�");
         msgContent.setDrawnState("寰堥仐鎲撅紝鏈腑濂�");
@@ -45,11 +47,11 @@
      * @param activityId
      * @return
      */
-    public static LuckyMsgContent createDrawn(Long activityId, String awardName) {
+    public static LuckyMsgContent createDrawn(Long activityId,Date activityCreateTime, String awardName) {
         LuckyMsgContent msgContent = new LuckyMsgContent();
         msgContent.setLuckyMsgType(LuckyMsgContent.LuckyMsgType.joinSuccess);
         msgContent.setActivityId(activityId);
-        msgContent.setDateNumber(ActivityUtil.getActivityDateNumber(activityId));
+        msgContent.setDateNumber(ActivityUtil.getActivityDateNumber(activityId,activityCreateTime));
         msgContent.setRemarks("鏃�");
         msgContent.setOpenState("宸插紑濂�");
         msgContent.setAwardName(awardName);
@@ -64,11 +66,11 @@
      * @param activityId
      * @return
      */
-    public static LuckyMsgContent createOpenFail(Long activityId) {
+    public static LuckyMsgContent createOpenFail(Long activityId,Date activityCreateTime) {
         LuckyMsgContent msgContent = new LuckyMsgContent();
         msgContent.setLuckyMsgType(LuckyMsgContent.LuckyMsgType.openFail);
         msgContent.setActivityId(activityId);
-        msgContent.setDateNumber(ActivityUtil.getActivityDateNumber(activityId));
+        msgContent.setDateNumber(ActivityUtil.getActivityDateNumber(activityId,activityCreateTime));
         msgContent.setRemarks("鏃�");
         msgContent.setOpenState("鏈兘婊¤冻寮�濂栨潯浠讹紝宸茬粨鏉熴��");
         return msgContent;
@@ -83,11 +85,11 @@
      * @param weight
      * @return
      */
-    public static LuckyMsgContent createAssist(Long activityId, SimpleUser user, int weight) {
+    public static LuckyMsgContent createAssist(Long activityId,Date activityCreateTime, SimpleUser user, int weight) {
         LuckyMsgContent msgContent = new LuckyMsgContent();
         msgContent.setLuckyMsgType(LuckyMsgContent.LuckyMsgType.assist);
         msgContent.setActivityId(activityId);
-        msgContent.setDateNumber(ActivityUtil.getActivityDateNumber(activityId));
+        msgContent.setDateNumber(ActivityUtil.getActivityDateNumber(activityId,activityCreateTime));
         msgContent.setRemarks("鏃�");
         msgContent.setWeight(weight);
         msgContent.setAssistUser(user);
@@ -102,11 +104,11 @@
      * @param weight
      * @return
      */
-    public static LuckyMsgContent createAssistAndJoin(Long activityId, SimpleUser user, int weight) {
+    public static LuckyMsgContent createAssistAndJoin(Long activityId,Date activityCreateTime, SimpleUser user, int weight) {
         LuckyMsgContent msgContent = new LuckyMsgContent();
         msgContent.setLuckyMsgType(LuckyMsgContent.LuckyMsgType.assistAndJoin);
         msgContent.setActivityId(activityId);
-        msgContent.setDateNumber(ActivityUtil.getActivityDateNumber(activityId));
+        msgContent.setDateNumber(ActivityUtil.getActivityDateNumber(activityId,activityCreateTime));
         msgContent.setRemarks("鏃�");
         msgContent.setWeight(weight);
         msgContent.setAssistUser(user);
@@ -119,11 +121,11 @@
      * @param activityId
      * @return
      */
-    public static LuckyMsgContent createReceiveOutDate(Long activityId) {
+    public static LuckyMsgContent createReceiveOutDate(Long activityId,Date activityCreateTime) {
         LuckyMsgContent msgContent = new LuckyMsgContent();
         msgContent.setLuckyMsgType(LuckyMsgContent.LuckyMsgType.receiveOutDate);
         msgContent.setActivityId(activityId);
-        msgContent.setDateNumber(ActivityUtil.getActivityDateNumber(activityId));
+        msgContent.setDateNumber(ActivityUtil.getActivityDateNumber(activityId,activityCreateTime));
         msgContent.setRemarks("鏃�");
         msgContent.setReceiveState("鏈娊濂栨椿鍔ㄤ綘涓浜嗭紝杩囨湡鏈");
         msgContent.setOutDateAwardState("宸插師璺��鍥炶禐鍔╁晢");

--
Gitblit v1.8.0