From b02836d6cdcc2092eb6a864f52c90379e4d171b9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 25 Mar 2021 11:28:46 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 1e81817..9a8f42b 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
@@ -301,7 +301,7 @@
@Override
public VerifyResult checkArrears(SysProjServices sysProjServices) {
// 检测欠款
- for (SysBeauticianState sysBeauticianState : sysProjServices.getServiceItems()) {
+ /*for (SysBeauticianState sysBeauticianState : sysProjServices.getServiceItems()) {
SysProjUse sysProjUse = projUseService.findById(sysBeauticianState.getPuseId());
ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(sysProjUse.getProjId());
@@ -328,11 +328,11 @@
}
} else if ("赠送".equals(sysProjUse.getSource())) {
- if (orderItem!=null &&orderItem.getArrears() > 0) {
- return new VerifyResult(true, shoppingGoods.getName() + "存在欠款" + orderItem.getArrears() + "元 , 不能消费赠送项目，订单编号[ " + orderItem.getOrderNo() + " ] ");
+ if (orderItem!=null && orderItem.getArrears()!=null&&orderItem.getArrears() > 0) {
+ return new VerifyResult(true, shoppingGoods.getName() + "存在欠款" + orderItem.getArrears() + "元 , 不能消费赠送项目，订单编号[ " + sysOrderService.findById(orderItem.getOrderId()).getOrderNo() + " ] ");
}
}
- }
+ }*/
return new VerifyResult(false);
}
--
Gitblit v1.9.1