From df1b14344ba81cab80ddd118a12289d95f69e4a3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 17 Dec 2020 21:45:02 +0800
Subject: [PATCH] modify vip_detail.html
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java
index 8e0556f..4365d9f 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java
@@ -591,6 +591,7 @@
Date today = new Date();
Date newDate = proj.getFailTime();
proj = sysProjUseDao.selectById(proj.getId());
+ // TODO 设置项目有效时，需完善该逻辑
switch (proj.getStatus()) {
case Dictionary.TAOCAN_STATUS_WX:
// 如果到期，需要重新设置有效期
@@ -600,13 +601,12 @@
return new AjaxResult(AjaxResult.STATUS_FAIL, "有效期要大于当前日期");
}
}
- if (newDate == null && proj.getFailTime().before(today)) {
+ if (newDate == null || newDate.before(today)) {
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "已过期");
}
break;
//如果是冻结状态则要算出冻结的天数，延长有效期
case Dictionary.TAOCAN_STATUS_DJ:
-
break;
default:
return new AjaxResult(AjaxResult.STATUS_FAIL, "请选择无效或者冻结的套餐");
--
Gitblit v1.9.1