修改订单统计

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderVehicleCrosstownDto.java

@@ -75,4 +75,6 @@ public class OrderVehicleCrosstownDto extends OrderVehicleCrosstown {
 
     private List<String> typeList;
 
+    private Integer address;
+
 }
\ No newline at end of file

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

@@ -51,6 +51,7 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
+import java.util.stream.Collectors;
 
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
@@ -119,6 +120,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             }
             updateCrossRecord(value);
             List<DepositRefundRecord> depositRefundRecords = orderDepositRefundRecordBiz.selectByCrossId(value.getId());
+            if (1==orderVehicleCrosstownDto.getAddress()&&CollectionUtil.isNotEmpty(depositRefundRecords))  {
+              depositRefundRecords = depositRefundRecords.parallelStream().filter(e -> e.getStatus() != 4 || e.getStatus() != 1).collect(Collectors.toList());
+            }
+
+
             value.setDepositRefundRecord(depositRefundRecords == null || depositRefundRecords.size() <= 0 ? null : depositRefundRecords);
         }
         return list;