活动流程优化

admin

2020-12-01 678b01185fda7ffd4d0959ca39be9b3633cb8294

 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.getPreFinishTime() != null && activity.getStartTime().getTime() >= activity.getPreFinishTime().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)