From 50199492d4033f995223c94fdb65297bb13c4505 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 22 Feb 2022 16:49:35 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 f9bc208..4827111 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
@@ -528,12 +528,19 @@
.map(SysOrderFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal cardPayAmount = flows.stream()
- .filter(item -> item.getPayMethod().equals("储值卡") && item.getIsGift().equals("N"))
+ .filter(item -> item.getPayMethod().equals("储值卡"))
.map(SysOrderFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
pageOrder.setCardPay(cardPayAmount.doubleValue());
pageOrder.setCashPay(cashPayAmount.doubleValue());
//欠款金额在流水处理中处理了
+
+ double sum = flows.stream().mapToDouble(item -> item.getAmount().doubleValue()).sum();
+
+ if(sum>0 && cardPayAmount.doubleValue()==0 && cashPayAmount.doubleValue()==0 ){
+ throw new GlobleException("订单更新失败，支付金额计算错误，请联系管理员");
+ }
+
sysOrderDao.update(pageOrder);
}
@@ -1520,6 +1527,7 @@
moneyCardUseFlow.setCreateTime(new Date());
moneyCardUseFlow.setOperationId(user.getSuId());
moneyCardUseFlow.setBalance(cardUser.getGiftMoney() + cardUser.getRealMoney());
+ moneyCardUseFlow.setCarUseId(cardUser.getId());
moneyCardUseFlowDao.insert(moneyCardUseFlow);
order.setFlows(czVo.getFlows());
--
Gitblit v1.9.1