From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 24 七月 2024 11:01:09 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel 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