From a2fe11f549f52e887937dbdb63d967a09d3a3f21 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 02 十二月 2020 18:54:38 +0800
Subject: [PATCH] 抽奖核心服务完善，天天抽奖服务基本搭建
---
service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java b/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java
index 125794f..818d6be 100644
--- a/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java
+++ b/service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java
@@ -121,15 +121,15 @@
*/
private void checkActivityForPublish(LuckyActivity activity) throws LuckyActivityException {
notNull(activity);
- if (activity.getStartTime() == null) {
+ if (activity.getPreStartTime() == null) {
throw new LuckyActivityException(1, "娲诲姩寮�濮嬫椂闂存湭璁剧疆");
}
- if (activity.getStartTime().getTime() < System.currentTimeMillis()) {
+ if (activity.getPreStartTime().getTime() < System.currentTimeMillis()) {
throw new LuckyActivityException(1, "娲诲姩寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�");
}
- if (activity.getFinishTime() != null && activity.getStartTime().getTime() >= activity.getFinishTime().getTime()) {
+ if (activity.getPreFinishTime() != null && activity.getPreStartTime().getTime() >= activity.getPreFinishTime().getTime()) {
throw new LuckyActivityException(1, "娲诲姩寮�濮嬬粨鏉熸椂闂翠笉鑳藉皬浜庡紑濮嬫椂闂�");
}
@@ -185,29 +185,25 @@
throw new LuckyActivityException(2, "娲诲姩灏氭湭澶勪簬宸插彂甯冪姸鎬�");
}
- luckyActivityManager.startUpActivity(activityId);
-
- //灏濊瘯鍒犻櫎娑堟伅
try {
- LuckyMQ mq = LuckyMQFactory.createStartUpActivity(activity);
- luckyMQService.removeUnSendMsg(mq.getTaskId());
+ luckyActivityManager.startUpActivity(activityId);
} catch (LuckyMQException e) {
- e.printStackTrace();
+ throw new LuckyActivityException(e.getCode(), e.getMsg());
}
-
}
@Transactional(rollbackFor = Exception.class)
@Override
public void verifyActivity(Long activityId, boolean pass, String remarks) throws LuckyActivityException {
LuckyActivity activity = luckyActivityMapper.selectByPrimaryKeyForUpdate(activityId);
+ notNull(activity);
if (activity.getState() != LuckyActivity.STATE_WAITING_VERIFY) {
throw new LuckyActivityException(2, "娲诲姩灏氭湭澶勪簬瀹℃牳鐘舵��");
}
//瀹℃牳娲诲姩
- //瀹℃牳閫氳繃
if (pass) {
+ //瀹℃牳閫氳繃
luckyActivityManager.setState(activityId, LuckyActivity.STATE_NOT_PUBLISH, remarks);
} else {
//瀹℃牳鏈�氳繃
@@ -216,18 +212,15 @@
}
- @Transactional(rollbackFor = Exception.class)
@Override
public void forceFinishActivity(Long activityId, String remarks) throws LuckyActivityException {
- LuckyActivity activity = luckyActivityMapper.selectByPrimaryKeyForUpdate(activityId);
+ LuckyActivity activity = luckyActivityMapper.selectByPrimaryKey(activityId);
notNull(activity);
-
- if (activity.getState() != LuckyActivity.STATE_STARTED) {
- throw new LuckyActivityException(1, "娲诲姩鏈浜庡凡寮�濮嬬姸鎬�");
+ try {
+ luckyActivityManager.finishActivity(activityId, true, remarks);
+ } catch (LuckyMQException e) {
+ throw new LuckyActivityException(e.getCode(), e.getMsg());
}
-
- //璁剧疆娲诲姩澶勪簬寮哄埗缁撴潫鐘舵��
- luckyActivityManager.setState(activityId, LuckyActivity.STATE_FOUCE_FINISH, remarks);
}
@Transactional(rollbackFor = Exception.class)
@@ -251,6 +244,17 @@
throw new LuckyActivityException(2, e.getMsg());
}
+ }
+
+ @Override
+ public void cancelVerify(Long activityId) throws LuckyActivityException {
+ LuckyActivity activity = luckyActivityMapper.selectByPrimaryKeyForUpdate(activityId);
+ notNull(activity);
+ if (activity.getState() != LuckyActivity.STATE_WAITING_VERIFY) {
+ throw new LuckyActivityException(1, "娲诲姩鏈浜庣瓑寰呭鏍哥姸鎬�");
+ }
+
+ luckyActivityManager.setState(activityId, LuckyActivity.STATE_NOT_SUBMIT_VERIFY, "涓诲姩鍙栨秷瀹℃牳");
}
@Override
@@ -282,6 +286,10 @@
if (activity.getState() != null) {
throw new LuckyActivityException(1, "涓嶈兘鏇存敼娲诲姩鐘舵��");
}
+ if (!luckyActivityManager.canUpdate(activity.getId())) {
+ throw new LuckyActivityException(1, "褰撳墠娲诲姩涓嶈兘淇敼");
+ }
+
activity.setUpdateTime(new Date());
luckyActivityMapper.updateByPrimaryKeySelective(activity);
}
--
Gitblit v1.8.0