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/consumer/ActivityConsumer.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/service-lucky/src/main/java/com/ks/lucky/util/mq/consumer/AcitivtyConsumer.java b/service-lucky/src/main/java/com/ks/lucky/util/mq/consumer/ActivityConsumer.java
similarity index 83%
rename from service-lucky/src/main/java/com/ks/lucky/util/mq/consumer/AcitivtyConsumer.java
rename to service-lucky/src/main/java/com/ks/lucky/util/mq/consumer/ActivityConsumer.java
index 718aba5..0c561b8 100644
--- a/service-lucky/src/main/java/com/ks/lucky/util/mq/consumer/AcitivtyConsumer.java
+++ b/service-lucky/src/main/java/com/ks/lucky/util/mq/consumer/ActivityConsumer.java
@@ -1,12 +1,10 @@
 package com.ks.lucky.util.mq.consumer;
 
-import com.ks.lucky.exception.LuckyActivityAwardException;
-import com.ks.lucky.exception.LuckyActivityException;
-import com.ks.lucky.exception.LuckyActivityOpenException;
-import com.ks.lucky.exception.LuckyMQException;
+import com.ks.lucky.exception.*;
 import com.ks.lucky.pojo.DTO.ActivityMQMsg;
 import com.ks.lucky.remote.service.LuckyActivityOpenService;
 import com.ks.lucky.service.impl.LuckyActivityManager;
+import com.ks.lucky.util.LoggerUtil;
 import com.ks.lucky.util.mq.CMQManager;
 import com.ks.lucky.utils.mq.CMQConsumeRunner;
 import org.yeshi.utils.mq.JobThreadExecutorServiceImpl;
@@ -15,7 +13,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-public class AcitivtyConsumer implements CMQConsumeRunner {
+public class ActivityConsumer implements CMQConsumeRunner {
 
     @Resource
     private LuckyActivityManager luckyActivityManager;
@@ -51,11 +49,13 @@
                         if (msg != null) {
                             switch (msg.getType()) {
                                 case ActivityMQMsg.TYPE_EXEC_START:
+                                    LoggerUtil.activityLogger.info("鎵ц鍚姩娲诲姩:"+msg.getActivityId());
                                     //鍚姩娲诲姩
                                     try {
                                         luckyActivityManager.startUpActivity(msg.getActivityId());
                                         CMQManager.getInstance().deleteActivityMsg(handler);
                                     } catch (LuckyActivityException e) {
+                                        CMQManager.getInstance().deleteActivityMsg(handler);
                                         e.printStackTrace();
                                     } catch (LuckyMQException e) {
                                         e.printStackTrace();
@@ -63,6 +63,7 @@
 
                                     break;
                                 case ActivityMQMsg.TYPE_EXEC_FINSIH:
+                                    LoggerUtil.activityLogger.info("鎵ц缁撴潫娲诲姩:"+msg.getActivityId());
                                     //缁撴潫娲诲姩
                                     try {
                                         luckyActivityManager.finishActivity(msg.getActivityId(), false, "瀹氭椂缁撴潫");
@@ -77,6 +78,7 @@
 
 
                                 case ActivityMQMsg.TYPE_REACH_MIN_PERSON:
+                                    LoggerUtil.activityLogger.info("鍙備笌浜烘暟鍒拌揪鏈�浣庡紑濂栦汉鏁�:"+msg.getActivityId());
                                     try {
                                         luckyActivityOpenService.reachMinPerson(msg.getActivityId());
                                         CMQManager.getInstance().deleteActivityMsg(handler);
@@ -86,6 +88,7 @@
                                     break;
 
                                 case ActivityMQMsg.TYPE_REACH_MAX_PERSON:
+                                    LoggerUtil.activityLogger.info("鍙備笌浜烘暟鍒拌揪鏈�澶у弬涓庝汉鏁�:"+msg.getActivityId());
                                     try {
                                         luckyActivityManager.finishActivity(msg.getActivityId(), false, "娲诲姩杈惧埌鏈�澶у紑濂栦汉鏁�");
                                         CMQManager.getInstance().deleteActivityMsg(handler);
@@ -99,6 +102,7 @@
                                     break;
 
                                 case ActivityMQMsg.TYPE_REACH_OPEN_TIME:
+                                    LoggerUtil.activityLogger.info("娲诲姩杈惧埌寮�濂栨椂闂�:"+msg.getActivityId());
                                     try {
                                         luckyActivityManager.finishActivity(msg.getActivityId(), false, "娲诲姩杈惧埌寮�濂栨椂闂�");
                                         CMQManager.getInstance().deleteActivityMsg(handler);
@@ -110,21 +114,23 @@
                                     break;
 
                                 case ActivityMQMsg.TYPE_OPEN_SHOW:
+                                    LoggerUtil.activityLogger.info("鏄剧ず寮�濂栫粨鏋�:"+msg.getActivityId());
                                     try {
                                         luckyActivityOpenService.showOpenAward(msg.getActivityId());
                                         CMQManager.getInstance().deleteActivityMsg(handler);
                                     } catch (LuckyActivityException e) {
                                         e.printStackTrace();
+                                    } catch (LuckyActivityOpenInfoException e) {
+                                        e.printStackTrace();
                                     }
                                     break;
 
                                 case ActivityMQMsg.TYPE_EXEC_OPEN:
+                                    LoggerUtil.activityLogger.info("鎵ц棰勫紑濂�:"+msg.getActivityId());
                                     preOpen(msg.getActivityId(), handler);
                                     break;
                             }
                         }
-
-
                     }
                 }
             }

--
Gitblit v1.8.0