From ec59428eacc798b8dfc617644aa9ca05066f2341 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Sat, 02 Jul 2022 16:13:55 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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 e8268a4..048b4a8 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
@@ -341,7 +341,12 @@
return sysProjServicesDao.selectById(id);
}
+ @Override
+ public List<SysProjServices> findByIds(List<Long> ids) {
+ return sysProjServicesDao.selectByIds(ids);
+
+ }
/**
* TODO 做成配置项目 校验服务单中的项目是否存在欠款
@@ -654,11 +659,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 (StringUtils.isBlank(taocanProjUse.getIsInfinite()) || Dictionary.FLAG_NO_N.equals(taocanProjUse.getIsInfinite())) {
- taocanProjUse.setSurplusCount(taocanProjUse.getSurplusCount() + beauticianState.getCount());
- }
+// 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);
}
@@ -797,15 +802,15 @@
BusParameterSettings principalConsumption = busParameterSettingsDao.selectCompanyParamByCode(ScoreSettingConstant.PRINCIPAL_CONSUMPTION, vipInfo.getCompanyId());
//本金消耗
if (principalPrice > 0
- && StringUtils.isNotBlank(principalConsumption.getParamValue())) {
+ && StringUtils.isNotBlank(principalConsumption.getParamValue()) && Double.parseDouble(principalConsumption.getParamValue()) > 0 ) {
principalConsumScore[0] = (int) (principalPrice / Double.parseDouble(principalConsumption.getParamValue()));
- if (StringUtils.isNotBlank(principalConsumption.getParamValue1())) {
+ if (StringUtils.isNotBlank(principalConsumption.getParamValue1()) && Double.parseDouble(principalConsumption.getParamValue1()) > 0 ) {
principalConsumScore[1] = (int) (principalPrice / Double.parseDouble(principalConsumption.getParamValue1()));
}
- if (StringUtils.isNotBlank(principalConsumption.getParamValue2())) {
+ if (StringUtils.isNotBlank(principalConsumption.getParamValue2()) && Double.parseDouble(principalConsumption.getParamValue2()) > 0 ) {
principalConsumScore[2] = (int) (principalPrice / Double.parseDouble(principalConsumption.getParamValue2()));
}
}
@@ -814,15 +819,15 @@
BusParameterSettings giveConsumption = busParameterSettingsDao.selectCompanyParamByCode(ScoreSettingConstant.GIVE_CONSUMPTION, vipInfo.getCompanyId());
//本金消耗
if (giftPrice > 0
- && StringUtils.isNotBlank(giveConsumption.getParamValue())) {
+ && StringUtils.isNotBlank(giveConsumption.getParamValue()) && Double.parseDouble(giveConsumption.getParamValue())>0) {
giveConsumScore[0] = (int) (giftPrice / Double.parseDouble(giveConsumption.getParamValue()));
- if (StringUtils.isNotBlank(giveConsumption.getParamValue1())) {
+ if (StringUtils.isNotBlank(giveConsumption.getParamValue1()) && Double.parseDouble(giveConsumption.getParamValue1())>0) {
giveConsumScore[1] = (int) (giftPrice / Double.parseDouble(giveConsumption.getParamValue1()));
}
- if (StringUtils.isNotBlank(giveConsumption.getParamValue2())) {
+ if (StringUtils.isNotBlank(giveConsumption.getParamValue2()) && Double.parseDouble(giveConsumption.getParamValue2())>0 ) {
giveConsumScore[2] = (int) (giftPrice / Double.parseDouble(giveConsumption.getParamValue2()));
}
}
--
Gitblit v1.9.1