parent: c253b555 | patch | commit | ignore whitespace
935090232@qq.com
2022-02-20 3324a37c81f1fb4329727d98e11051d2dfc6bcbe 
合并到master分支
2 files modified
8 ■■■■■ changed files
zq-erp/pom.xml 6 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 2 ●●●●● patch | view | raw | blame | history 
 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>




 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());