From 9af336a5be2483d67b5dbbf02d87e1e54185014f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 23 七月 2024 14:52:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
index c952541..576f4ff 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -148,7 +148,12 @@
String s = replace + ":00";
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = dateFormat.parse(s);
+ if (date.before(new Date())){
+ // 选择的生效时间不能小于当前时间
+ return 501;
+ }
tSysRedSet.setInsertTime(new Date());
+ tSysRedSet.setUpdateTime(new Date());
tSysRedSet.setEffectiveDate(date);
tSysRedSet.setStatus(1);
redEnvelopePaymentSettingsService.insert(tSysRedSet);
--
Gitblit v1.7.1