Merge branch 'order_received_statistics' into dev

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

@@ -53,6 +53,7 @@ public class OrderVehicleServiceStatisticsBiz extends BaseBiz<OrderVehicleServic
 		param.put("status", 1);
 		List<OrderPageVO> orderPageVOS = baseOrderBiz.selectAllRentVehicleOrder(param);
 		if (orderPageVOS != null && orderPageVOS.size() > 0) {
+			log.info(timeStr + "所有订单： list = {}", orderPageVOS);
 			orderPageVOS.parallelStream().forEach(result -> {
 				if (result.getOrderRentVehicleDetail() != null) {
 					Map<String, Integer> dateNumMap = mapMap.getOrDefault(result.getOrderRentVehicleDetail().getStartCompanyId(), new HashMap<>());
@@ -71,7 +72,7 @@ public class OrderVehicleServiceStatisticsBiz extends BaseBiz<OrderVehicleServic
 							OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
 							orderVehicleCrosstownDto.setOrderId(result.getId());
 							List<OrderVehicleCrosstownDto> list = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
-							if(list != null && list.size() > 0) {
+							if (list != null && list.size() > 0) {
 								list.parallelStream().forEach(order -> {
 									//获取还车时间
 									if (order.getType() == CrosstownTypeEnum.ARRIVE.getCode() || order.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode() || order.getType() == CrosstownTypeEnum.FIXED_LOSS_NOW.getCode()) {
@@ -85,6 +86,8 @@ public class OrderVehicleServiceStatisticsBiz extends BaseBiz<OrderVehicleServic
 							} else { //还车记录不存在，异常数据
 								log.info("还车记录不存在，异常数据, {}", result.toString());
 							}
+						} else if (bookDays - actualUsedDays < 0) { //如果实际使用时间大于预定时间，还车时租车天数为多出的天数
+							dateNumMap.put(timeStr, dateNumMap.getOrDefault(timeStr, 0) + (actualUsedDays - bookDays));
 						}
 					}
 					mapMap.put(result.getOrderRentVehicleDetail().getStartCompanyId(), dateNumMap);
@@ -109,7 +112,7 @@ public class OrderVehicleServiceStatisticsBiz extends BaseBiz<OrderVehicleServic
 				OrderVehicleServiceStatistics orderVehicleServiceStatistics = new OrderVehicleServiceStatistics();
 				log.info(result.toString());
 				BeanUtil.copyProperties(result, orderVehicleServiceStatistics, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
-				String dateStr = result.getCountYear() +"-"+ result.getCountMonth() +"-"+ result.getCountDay();
+				String dateStr = result.getCountYear() + "-" + result.getCountMonth() + "-" + result.getCountDay();
 				DateTime date = DateTime.parse(dateStr);
 				orderVehicleServiceStatistics.setCountDate(date.toDate());
 				orderVehicleServiceStatistics.setCountMonth(result.getCountYear() + result.getCountMonth());
@@ -120,7 +123,7 @@ public class OrderVehicleServiceStatisticsBiz extends BaseBiz<OrderVehicleServic
 	}
 
 	public void add(OrderVehicleServiceStatistics orderVehicleServiceStatistics) {
-		if(orderVehicleServiceStatistics != null) {
+		if (orderVehicleServiceStatistics != null) {
 			OrderVehicleServiceStatistics oldValue = mapper.selectByCompanyIdAndDate(orderVehicleServiceStatistics);
 			if (oldValue == null) {
 				insertSelectiveRe(orderVehicleServiceStatistics);
@@ -143,7 +146,7 @@ public class OrderVehicleServiceStatisticsBiz extends BaseBiz<OrderVehicleServic
 	//添加记录
 	public void addAll() {
 		DateTime dateTime = DateTime.parse("2019-08-01");
-		for(DateTime curDate = dateTime.plusDays(1); curDate.compareTo(DateTime.now()) < 0; curDate = curDate.plusDays(1)) {
+		for (DateTime curDate = dateTime.plusDays(1); curDate.compareTo(DateTime.now()) < 0; curDate = curDate.plusDays(1)) {
 			countVehicleServiceNum(curDate);
 			getAllOrder(curDate);
 		}