From 28b56dbf572ce6563ca4f7e4a83db86bfefb9620 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 02 Apr 2022 10:38:28 +0800
Subject: [PATCH] 取消之后，套餐数量增加，取消状态修改
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 4 ++--
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
index f08af58..5c9a035 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
@@ -556,6 +556,11 @@
&& !checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DQR)) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待预约订单");
}
+ }else{
+ if (checkProjServices.getState().equals(Dictionary.SERVICE_STATU_FWWC)
+ || checkProjServices.getState().equals(Dictionary.SERVICE_STATU_FFJS)) {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "当前状态无法取消订单");
+ }
}
return erpCancelOrder(services);
}
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 6d9dff5..0b3ffe4 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
@@ -651,11 +651,11 @@
taocanProjUse.setIsOver(Dictionary.DELETED_N);
taocanProjUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
taocanProjUse.setBalance(MoneyUtil.add(taocanProjUse.getBalance(), backBlance.doubleValue()));
- if (Dictionary.FLAG_YES_Y.equals(taocanProjUse.getIsCourse())) {
+// if (Dictionary.FLAG_YES_Y.equals(taocanProjUse.getIsCourse())) {
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