From 3324a37c81f1fb4329727d98e11051d2dfc6bcbe Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:26:36 +0800
Subject: [PATCH] 合并到master分支
---
zq-erp/pom.xml | 6 +++++-
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 4049589..ae1ed8a 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -500,7 +500,11 @@
</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 0c14697..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,7 +528,7 @@
.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());
--
Gitblit v1.9.1