From 99091a8cbb8e098575c75a7c640b568addbcc29d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 09 Oct 2022 21:41:13 +0800
Subject: [PATCH] Merge branch 'score_shop'
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
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 2649313..653c79c 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
@@ -183,8 +183,14 @@
}
@Override
- public SysOrder findById(Long id) {
+ public SysOrder findById(Long id) {
return sysOrderDao.selectById(id);
+
+ }
+
+ @Override
+ public List<SysOrder> findByIds(List<Long> ids) {
+ return sysOrderDao.selectByIds(ids);
}
@@ -341,6 +347,8 @@
moneyCardUseFlow.setTimes(1);
}
}
+
+ moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
moneyCardUseDao.update(moneyCardUse);
//插入充值卡变动流水
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
@@ -1380,7 +1388,7 @@
//赠送项目是否计算消耗业绩否则 赠送产品按原价计算消耗
boolean zsConsumeAchieve = projServicesService.skipServiceOrderStep(Dictionary.ZS_CONSUME_ACHIEVE);
if (zsConsumeAchieve) {
- if (sysOrderItem.getPrice() <= 0) {
+ if (sysOrderItem.getZkPrice() <= 0) {
//等于0取原价
if (taocanId == null) {
puse.setPrice(goodsAssemble.getShoppingGoods().getPrice());
--
Gitblit v1.9.1