Merge branch 'master-invoice-modular' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -800,16 +800,13 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
     public BigDecimal getAllOrderCost(Integer orderId) {
         List<OrderAccount> list = getByOrderId(orderId);
         BigDecimal bigDecimal = new BigDecimal("0");
-
         if (list != null && list.size() > 0) {
-            list.parallelStream().forEach(result -> {
-                double amount = 0;
-                if(result.getAccountAmount() != null && result.getAccountStatus() == 1) {
-                    amount = amount + result.getAccountAmount().doubleValue();
+            for (OrderAccount orderAccount : list) {
+                if(orderAccount.getAccountAmount() != null && orderAccount.getAccountStatus() == 1) {
+                    bigDecimal.add(orderAccount.getAccountAmount());
                 }
-                log.info("amount: {}", amount);
-                bigDecimal.add(new BigDecimal(amount+""));
-            });
+            }
+            log.info("bigDecimal: {}", bigDecimal);
         }
         return bigDecimal;
     }