From 678b01185fda7ffd4d0959ca39be9b3633cb8294 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 01 十二月 2020 19:18:26 +0800
Subject: [PATCH] 活动流程优化
---
service-lucky/src/main/java/com/ks/lucky/service/impl/remote/LuckyActivityServiceImpl.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 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..ff16ad1 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, "娲诲姩寮�濮嬬粨鏉熸椂闂翠笉鑳藉皬浜庡紑濮嬫椂闂�");
}
@@ -216,18 +216,11 @@
}
- @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, "娲诲姩鏈浜庡凡寮�濮嬬姸鎬�");
- }
-
- //璁剧疆娲诲姩澶勪簬寮哄埗缁撴潫鐘舵��
- luckyActivityManager.setState(activityId, LuckyActivity.STATE_FOUCE_FINISH, remarks);
+ luckyActivityManager.finishActivity(activityId, true, remarks);
}
@Transactional(rollbackFor = Exception.class)
--
Gitblit v1.8.0