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/resources/templates/febs/views/modules/act/actUpdateNew.html | 11 ++++++++---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallActServiceImpl.java | 9 +++++++++
src/main/resources/templates/febs/views/modules/act/actAddNew.html | 10 +++++++---
3 files changed, 24 insertions(+), 6 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();
diff --git a/src/main/resources/templates/febs/views/modules/act/actAddNew.html b/src/main/resources/templates/febs/views/modules/act/actAddNew.html
index 7a96398..5b89224 100644
--- a/src/main/resources/templates/febs/views/modules/act/actAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/act/actAddNew.html
@@ -29,14 +29,14 @@
<div class="layui-col-lg6">
<label class="layui-form-label febs-form-item-require">开始时间：</label>
<div class="layui-input-block">
- <input type="text" name="actStartTime" id="febs-form-group-date" lay-verify="date"
+ <input type="text" name="actStartTime" id="febs-form-group-date-start" lay-verify="date"
placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-col-lg6">
<label class="layui-form-label febs-form-item-require">结束时间：</label>
<div class="layui-input-block">
- <input type="text" name="actEndTime" id="febs-form-group-date" lay-verify="date"
+ <input type="text" name="actEndTime" id="febs-form-group-date-end" lay-verify="date"
placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
</div>
</div>
@@ -155,7 +155,11 @@
form.render();
laydate.render({
- elem: '#febs-form-group-date'
+ elem: '#febs-form-group-date-start'
+ });
+
+ laydate.render({
+ elem: '#febs-form-group-date-end'
});
formSelects.render();
diff --git a/src/main/resources/templates/febs/views/modules/act/actUpdateNew.html b/src/main/resources/templates/febs/views/modules/act/actUpdateNew.html
index 606723c..6c537ca 100644
--- a/src/main/resources/templates/febs/views/modules/act/actUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/act/actUpdateNew.html
@@ -33,14 +33,14 @@
<div class="layui-col-lg6">
<label class="layui-form-label febs-form-item-require">开始时间：</label>
<div class="layui-input-block">
- <input type="text" name="actStartTime" id="febs-form-group-date" lay-verify="date"
+ <input type="text" name="actStartTime" id="febs-form-group-date-start" lay-verify="date"
placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-col-lg6">
<label class="layui-form-label febs-form-item-require">结束时间：</label>
<div class="layui-input-block">
- <input type="text" name="actEndTime" id="febs-form-group-date" lay-verify="date"
+ <input type="text" name="actEndTime" id="febs-form-group-date-end" lay-verify="date"
placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
</div>
</div>
@@ -160,8 +160,13 @@
validate = layui.validate,
element = layui.element;
form.render();
+
laydate.render({
- elem: '#febs-form-group-date'
+ elem: '#febs-form-group-date-start'
+ });
+
+ laydate.render({
+ elem: '#febs-form-group-date-end'
});
formSelects.render();
--
Gitblit v1.9.1