Merge branch 'master-invoice-modular' into dev

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

@@ -800,11 +800,15 @@ 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 -> {
-                if(result.getAccountAmount() != null) {
-                    bigDecimal.add(new BigDecimal(result.getAccountAmount().toString()));
+                double amount = 0;
+                if(result.getAccountAmount() != null && result.getAccountStatus() == 1) {
+                    amount = amount + result.getAccountAmount().doubleValue();
                 }
+                log.info("amount: {}", amount);
+                bigDecimal.add(new BigDecimal(amount+""));
             });
         }
         return bigDecimal;