From 2a873a04ab9c600b8e0836d1f866a66d87c4b64f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 22 九月 2025 22:16:22 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
index 4d6584b..92e7702 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
@@ -42,6 +42,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
@@ -824,4 +825,27 @@
}
return judge;
}
+
+ /**
+ * 立即结束活动
+ * @param mgtBaseGetDto
+ */
+ @Override
+ public R endImmediately(MgtBaseGetDto mgtBaseGetDto) {
+ Activity activity = this.getById(mgtBaseGetDto.getId());
+ if(null == activity){
+ return R.fail("活动不存在");
+ }
+ //判断是否在活动中
+ Date now = new Date();
+ if (now.before(activity.getActivityStartTime())||now.after(activity.getActivityEndTime())){
+ return R.fail("未在活动时间范围内，不能执行立即结束操作");
+ }
+ activity.setActivityEndTime(now);
+ activity.setUpdateTime(now);
+ activity.setUpdateUserId(mgtBaseGetDto.getUserId());
+ activity.setActivityStatus(2);
+ this.updateById(activity);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1