From 671660360e591c153ab16f99205930b283baaa1d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 16 May 2022 16:10:41 +0800
Subject: [PATCH] 20220516
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 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 e370684..d643db5 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
@@ -21,6 +21,7 @@
import com.matrix.system.common.service.BusParameterSettingService;
import com.matrix.system.common.service.OperationLogService;
import com.matrix.system.constance.Dictionary;
+import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.enums.OperationButtonEnum;
import com.matrix.system.enums.OperationFunctionEnum;
import com.matrix.system.hive.bean.*;
@@ -650,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);
}
@@ -1025,7 +1026,8 @@
if (CollectionUtils.isNotEmpty(projServicesVo.getOutStoreItem())) {
BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, projServicesVo.getCompanyId());
- if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
+// if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
+ if (BooleanEnum.TRUE.getValue() == manageStockSetting.getIntParamValue()) {
for (SysOutStoreItem item : projServicesVo.getOutStoreItem()) {
if (item.getAmount() != null && item.getAmount() > 0) {
return true;
@@ -1119,12 +1121,18 @@
sysProjServicesDao.update(checkprojServices);
}
//保存单据日志
- operationLogService.saveOperation(projServices.getCompanyId(), projServices.getShopId(),users.getSuId(),
+// operationLogService.saveOperation(projServices.getCompanyId(), projServices.getShopId(),users.getSuId(),
+// OperationFunctionEnum.SERVICE_ORDER,
+// OperationButtonEnum.SERVICE_ORDER_END,
+// projServices.getId(),
+// projServices.getServiceNo(),
+// projServices.getVipId());
+ operationLogService.saveOperation(checkprojServices.getCompanyId(), checkprojServices.getShopId(),users.getSuId(),
OperationFunctionEnum.SERVICE_ORDER,
OperationButtonEnum.SERVICE_ORDER_END,
- projServices.getId(),
- projServices.getServiceNo(),
- projServices.getVipId());
+ checkprojServices.getId(),
+ checkprojServices.getServiceNo(),
+ checkprojServices.getVipId());
return rerunlt;
}
@@ -1164,7 +1172,11 @@
boolean flag = false;
if (CollUtil.isNotEmpty(settings)) {
for (ParameterSettings setting : settings) {
- if (step.equals(setting.getCode()) && Dictionary.FLAG_YES.equals(setting.getUserValue())) {
+// if (step.equals(setting.getCode()) && Dictionary.FLAG_YES.equals(setting.getUserValue())) {
+// flag = true;
+// break;
+// }
+ if (step.equals(setting.getCode()) && BooleanEnum.TRUE.getValue() == Integer.parseInt(setting.getUserValue())) {
flag = true;
break;
}
@@ -1206,5 +1218,13 @@
return i;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int signService(SysProjServices services) {
+ SysProjServices projServices =findById(services.getId());
+ projServices.setSignPic(services.getSignPic());
+ return sysProjServicesDao.update(projServices);
+ }
+
}
--
Gitblit v1.9.1