Merge branch 'master' into dev

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

@@ -305,6 +305,7 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
                 types.add(DeductionTypeEnum.VIOLATE_ADVANCE.getCode());
                 types.add(DeductionTypeEnum.VIOLATE_CANCEL.getCode());
                 types.add(DeductionTypeEnum.VIOLATE_DELAY.getCode());
+                types.add(DeductionTypeEnum.VIOLATE_CHANGE_C.getCode());
                 orderStatistics.setDefaultMoney(get(OrderAccountDeductions, types));
 
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderStatisticsController.java

@@ -111,7 +111,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
                 return ObjectRestResponse.succ(baseBiz.getTourHomePageOrderData(companyIds));
             }
             //只统计会员订单
-            if (TYPE_MEMBER.equals(type)||DATA_AUTHORITY.equals(user.getDataAll())) {
+            if (TYPE_MEMBER.equals(type)&&DATA_AUTHORITY.equals(user.getDataAll())) {
                 return ObjectRestResponse.succ(baseBiz.getMemberHomePageOrderData(companyIds));
             }
             //所有订单

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

@@ -200,7 +200,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
             LocalDateTime ldt = LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis()), ZoneOffset.ofHours(8)).plusSeconds(30L);
             dto.setBookStartDate(DateTimeFormatter.ofPattern(DATE_TIME_LINE).format(ldt));
         }else {
-            dto.setBookStartDate(dto.getBookEndDateTime());
+            dto.setBookStartDate(dto.getBookStartDateTime());
         }
         dto.setBookEndDate(dto.getBookEndDateTime());
         BookVehicleVO bookVehicleVo = BeanUtil.toBean(dto, BookVehicleVO.class);