From a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 19 Dec 2020 15:53:24 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into test
---
zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
index c4c732b..2744c37 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
@@ -296,7 +296,7 @@
if (newDate != null && newDate.before(today)) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "有效期要大于当前日期");
}
- if (newDate == null && failTime.before(today)) {
+ if (newDate == null && (failTime == null || failTime.before(today))) {
//如果是已过期界面会提醒重新设置有效期
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "已过期");
}
--
Gitblit v1.9.1