From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 5fb1438..b49f53d 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;
@@ -192,7 +193,8 @@
BigDecimal activityPrice = mgtActivityGoodsEditDto.getActivityPrice();
BigDecimal activitySubscription = mgtActivityGoodsEditDto.getActivitySubscription();
Integer activityNumber = mgtActivityGoodsEditDto.getActivityNumber();
- if(goodsId.equals(goodsId1) && activitySubscription1.compareTo(activitySubscription) != 0){
+ if(null != activitySubscription && null != activitySubscription1 &&
+ goodsId.equals(goodsId1) && activitySubscription1.compareTo(activitySubscription) != 0){
throw new ServiceException("不能修改定金");
}
if(goodsId.equals(goodsId1) && activityPrice1.compareTo(activityPrice) != 0){
@@ -823,4 +825,26 @@
}
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());
+ this.updateById(activity);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1