From c554c7ad5405bafa149dbb6429e8245f78b33ffc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Dec 2020 15:59:53 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
index 66cf4ed..ef69075 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
@@ -4,9 +4,7 @@
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.pojo.VerifyResult;
-import com.matrix.core.tools.DateUtil;
-import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.WebUtil;
+import com.matrix.core.tools.*;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.SysUsersDao;
import com.matrix.system.constance.Dictionary;
@@ -166,12 +164,19 @@
taocan.setSurplusCount(0);
taocan.setStatus(Dictionary.TAOCAN_STATUS_WX);
} else if (Dictionary.FLAG_YES_Y.equals(taocan.getIsCourse())) {
- //任选套餐检查套餐整体剩余次数
- int tcSurplusCount = taocan.getSurplusCount() - sysBeauticianState.getCount();
- if (tcSurplusCount < 0) {
- throw new GlobleException(taocan.getProjName() + "已经达到最大使用次数");
- } else {
- taocan.setSurplusCount(tcSurplusCount);
+ if (StringUtils.isBlank(taocan.getIsInfinite()) || Dictionary.FLAG_NO_N.equals(taocan.getIsInfinite())) {
+ //任选套餐检查套餐整体剩余次数
+ int tcSurplusCount = taocan.getSurplusCount() - sysBeauticianState.getCount();
+ if (tcSurplusCount < 0) {
+ throw new GlobleException(taocan.getProjName() + "已经达到最大使用次数");
+ } else {
+ taocan.setSurplusCount(tcSurplusCount);
+ }
+
+ if (tcSurplusCount == 0) {
+ taocan.setIsOver(Dictionary.FLAG_YES_Y);
+ taocan.setStatus(Dictionary.TAOCAN_STATUS_WX);
+ }
}
}
@@ -493,13 +498,13 @@
if (sysProjUse.getTaocanId() != null) {
//TODO 更新套餐状态为有效
SysProjUse taocanProjUse = sysProjUseDao.selectById(sysProjUse.getTaocanId());
- if (taocanProjUse.getSurplusCount() == 0) {
- taocanProjUse.setIsOver(Dictionary.DELETED_N);
- taocanProjUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
- }
+ taocanProjUse.setIsOver(Dictionary.DELETED_N);
+ taocanProjUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
if (Dictionary.FLAG_YES_Y.equals(taocanProjUse.getIsCourse())) {
- taocanProjUse.setSurplusCount(taocanProjUse.getSurplusCount() + beauticianState.getCount());
+ if (StringUtils.isBlank(taocanProjUse.getIsInfinite()) || Dictionary.FLAG_NO_N.equals(taocanProjUse.getIsInfinite())) {
+ taocanProjUse.setSurplusCount(taocanProjUse.getSurplusCount() + beauticianState.getCount());
+ }
}
sysProjUseDao.update(taocanProjUse);
}
--
Gitblit v1.9.1