From 59c430b896ee4577857dc0725bf6a5df4b99e1f7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 31 Jul 2021 17:43:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/pom.xml | 6 +-----
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 12 +++---------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index e9cf484..3f8dd9a 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -497,11 +497,7 @@
</repository>
- <repository>
- <id>repository.jboss.org-public</id>
- <name>JBoss.org Maven repository</name>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
- </repository>
+
</repositories>
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index 36773cc..83b57f5 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -1241,8 +1241,7 @@
if(zsConsumeAchieve){
if(sysOrderItem.getPrice()>0){
-
-
+ //大于0 不修改金额
}else{
//等于0取原价
@@ -1252,7 +1251,6 @@
puse.setPrice(goodsAssemble.getPrice());
}
}
-
}else{
puse.setPrice(0D);
}
@@ -1356,11 +1354,7 @@
//赠送项目是否计算消耗业绩否则 赠送产品按原价计算消耗
boolean zsConsumeAchieve = projServicesService.skipServiceOrderStep(Dictionary.ZS_CONSUME_ACHIEVE);
if(zsConsumeAchieve){
- if(sysOrderItem.getPrice()>0){
- puse.setPrice(sysOrderItem.getZkPrice());
- }else{
- puse.setPrice(sysOrderItem.getShoppingGoods().getSealPice());
- }
+ puse.setPrice(sysOrderItem.getShoppingGoods().getSealPice());
}else{
puse.setPrice(0D);
}
@@ -1692,7 +1686,7 @@
int sub = sysProjUse.getSurplusCount() - item.getCount();
if (sub < 0) {
- throw new GlobleException("项目余次不足");
+ throw new GlobleException("项目余次不足");
}else if(sub==0){
sysProjUse.setIsOver(Dictionary.FLAG_YES_Y);
sysProjUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
--
Gitblit v1.9.1