Merge branch 'order_received_statistics' into dev

# Conflicts:
#	xx-order/xx-order-server/src/test/java/ServiceTest.java

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

@@ -124,6 +124,15 @@ public class OrderVehicleServiceStatisticsBiz extends BaseBiz<OrderVehicleServic
 			if (oldValue == null) {
 				insertSelectiveRe(orderVehicleServiceStatistics);
 			} else {
+				if (orderVehicleServiceStatistics.getArrivalNum() != null) {
+					orderVehicleServiceStatistics.setArrivalNum(orderVehicleServiceStatistics.getArrivalNum() + oldValue.getArrivalNum());
+				}
+				if (orderVehicleServiceStatistics.getDepartureNum() != null) {
+					orderVehicleServiceStatistics.setDepartureNum(orderVehicleServiceStatistics.getDepartureNum() + oldValue.getDepartureNum());
+				}
+				if (orderVehicleServiceStatistics.getRentNum() != null) {
+					orderVehicleServiceStatistics.setRentNum(orderVehicleServiceStatistics.getRentNum() + oldValue.getRentNum());
+				}
 				BeanUtil.copyProperties(orderVehicleServiceStatistics, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
 				updateSelectiveByIdRe(oldValue);
 			}
@@ -156,6 +165,6 @@ public class OrderVehicleServiceStatisticsBiz extends BaseBiz<OrderVehicleServic
 				}
 			}
 		}
-
+		mapMap.clear();
 	}
 }