From 994bd426e2772bc26bccd430f0d4f2440a6dc021 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 12:18:17 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallActServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallActServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallActServiceImpl.java
index 40d0090..f677265 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallActServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallActServiceImpl.java
@@ -152,6 +152,15 @@
if (ObjectUtil.isEmpty(mallActSet)) {
return new FebsResponse().fail().message("活动不存在，请刷新当前页面");
}
+ Date date = new Date();
+ int compareStart = DateUtil.compare(date, mallActSet.getActStartTime());
+ if(compareStart < 0){
+ return new FebsResponse().fail().message("活动还未开始");
+ }
+ int compareEnd = DateUtil.compare(date, mallActSet.getActEndTime());
+ if(compareEnd > 0){
+ return new FebsResponse().fail().message("活动已结束");
+ }
mallActSet.setActStatus(MallActSet.ACT_STATUS_ENABLE);
this.baseMapper.updateById(mallActSet);
return new FebsResponse().success();
--
Gitblit v1.9.1