Merge remote-tracking branch 'origin/order_received_statistics' into order_received_statistics

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderReceivedStatisticsSignEnum.java

@@ -64,46 +64,7 @@ public enum  OrderReceivedStatisticsSignEnum {
                resultMap.put(getSign(),orderReceivedStatisticsVos);
                return resultMap;
           }
-     },
-    /* ORDER_TOTAL_REAL_AMOUNT("ad_otra","实际收入"){
-          @Override
-          Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
-               Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
-               List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
-               orderMap.forEach((K,V)->{
-                    List<OrderReceivedStatistics> orderReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
-                    BigDecimal realAmount = orderReceivedStatisticsList.stream().map(x -> x.getRealAmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
-                    OrderReceivedStatistics orderReceivedStatistics = orderReceivedStatisticsList.get(0);
-                    OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,realAmount,null);
-                    orderReceivedStatisticsVos.add(receivedStatisticsVo);
-               });
-               resultMap.put(getSign(),orderReceivedStatisticsVos);
-               return resultMap;
-          }
-     },*/
-   /*  ORDER_REAL_AVG_AMOUNT("ae_oravga","实际arpu"){
-          @Override
-          Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
-               Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
-               AtomicReference<BigDecimal> divisorAtomicReference = new AtomicReference<>();
-               List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
-               orderMap.forEach((K,V)->{
-                    List<OrderReceivedStatistics> orderReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
-                    BigDecimal divisor = divisorAtomicReference.get();
-                    if (Objects.isNull(divisor)){
-                         Integer divi = orderReceivedStatisticsList.get(0).getDivisor();
-                          divisor = new BigDecimal(divi);
-                         divisorAtomicReference.set(divisor);
-                    }
-                    BigDecimal realAvgAmount = orderReceivedStatisticsList.stream().map(x -> x.getRealAmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y)).divide(divisor);
-                    OrderReceivedStatistics orderReceivedStatistics = orderReceivedStatisticsList.get(0);
-                    OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,realAvgAmount,null);
-                    orderReceivedStatisticsVos.add(receivedStatisticsVo);
-               });
-               resultMap.put(getSign(),orderReceivedStatisticsVos);
-               return resultMap;
-          }
-     }*/;
+     };
      private String sign;
      private String desc;
      private static  Map<String,OrderReceivedStatisticsSignEnum> orderReceivedStatisticsSignEnumMap;

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderRentVehicleReceivedStatisticsSignEnum.java

@@ -70,46 +70,7 @@ public enum OrderRentVehicleReceivedStatisticsSignEnum{
              resultMap.put(getSign(),orderReceivedStatisticsVos);
              return resultMap;
          }
-     },
-/*     RENT_VEHICLE_REAL_TOTAL_AMOUNT("bd_rvrta","实际租车金额") {
-         @Override
-         Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
-             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
-             List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
-             orderMap.forEach((K,V)->{
-                 List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
-                 BigDecimal realAmount = orderRentVehicleReceivedStatisticsList.stream().map(x -> x.getRealAmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
-                 OrderRentVehicleReceivedStatistics orderReceivedStatistics = orderRentVehicleReceivedStatisticsList.get(0);
-                 OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,realAmount,null);
-                 orderReceivedStatisticsVos.add(receivedStatisticsVo);
-             });
-             resultMap.put(getSign(),orderReceivedStatisticsVos);
-             return resultMap;
-         }
-     },*/
-/*     RENT_VEHICLE_REAL_AVG_AMOUNT("be_rvravga","实际租车arpu") {
-         @Override
-         Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
-             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
-             AtomicReference<BigDecimal> divisorAtomicReference = new AtomicReference<>();
-             List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
-             orderMap.forEach((K,V)->{
-                 List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
-                 BigDecimal divisor = divisorAtomicReference.get();
-                 if (Objects.isNull(divisor)){
-                     Integer divi = orderRentVehicleReceivedStatisticsList.get(0).getDivisor();
-                     divisor = new BigDecimal(divi);
-                     divisorAtomicReference.set(divisor);
-                 }
-                 BigDecimal realAvgAmount = orderRentVehicleReceivedStatisticsList.stream().map(x -> x.getRealAmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y)).divide(divisor, RoundingMode.HALF_UP);
-                 OrderRentVehicleReceivedStatistics orderReceivedStatistics = orderRentVehicleReceivedStatisticsList.get(0);
-                 OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,realAvgAmount,null);
-                 orderReceivedStatisticsVos.add(receivedStatisticsVo);
-             });
-             resultMap.put(getSign(),orderReceivedStatisticsVos);
-             return resultMap;
-         }
-     }*/;
+     };
     private String sign;
     private String desc;
     private static  Map<String,OrderRentVehicleReceivedStatisticsSignEnum> orderRentVehicleReceivedStatisticsSignEnumMap;

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/StatisticsStatusEnum.java

@@ -18,15 +18,13 @@ import java.util.List;
  */
 public enum  StatisticsStatusEnum {
     ;
-    public static final int FINISH = 6;
-    public static final int CANCEL = 2;
-    public static final int UNFINISH = 3;
     public static final int DEFAULT_COMPANY=1;
     public static final int ORDER_MEMBER_TYPE=3;
     public static final int ORDER_RENT_VEHICLE_TYPE=1;
     public static final int ORDER_TOUR_TYPE=2;
     public static final String UN_PAY_STATE="0";
     public static final int NO_PAY_WAY=99;
+    public static final Integer DEFAULT_SQL_SIZE=1000;
 
     public static List<String> orderStates;
     public static List<String> orderOrigins;

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

@@ -27,7 +27,6 @@ public class OrderDTO {
     private BigDecimal realAmount;
     private Integer orderOrigin;
     private Integer payWay;
-    private Date crtTime;
     private Integer companyId;
     private String stateGroup;
     private Integer hasPay;

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

@@ -52,7 +52,7 @@ public class OrderMemberReceivedStatisticsBiz extends BaseBiz<OrderMemberReceive
         List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = new ArrayList<>(18);
 
         //根据时间范围查询出会员单
-        List<OrderDTO> orders = baseOrderBiz.selectOrdersByTypeAndTime(Arrays.asList(StatisticsStatusEnum.ORDER_TOUR_TYPE), startDate, endDate);
+        List<OrderDTO> orders = baseOrderBiz.selectOrdersByTypeAndTime(Arrays.asList(StatisticsStatusEnum.ORDER_MEMBER_TYPE), startDate, endDate);
 
         //数据处理 把状态组合
         Map<String, Map<LevelEnum, List<OrderDTO>>> ordersMap = orders.stream().peek(x -> {
@@ -89,7 +89,7 @@ public class OrderMemberReceivedStatisticsBiz extends BaseBiz<OrderMemberReceive
             }
         }
         //创建剩余状态数据
-        List stisticsActiveState = ordersMap.isEmpty() ? Collections.EMPTY_LIST : Lists.newArrayList(ordersMap.keySet());
+        List stisticsActiveState = ordersMap==null ? Collections.EMPTY_LIST : Lists.newArrayList(ordersMap.keySet());
         List<OrderMemberReceivedStatistics> otherStatisticsStateGroupList = createOtherStatisticsStateGroupList(startDate, stisticsActiveState, StatisticsStatusEnum.DEFAULT_COMPANY);
         orderMemberReceivedStatisticsList.addAll(otherStatisticsStateGroupList);
         //保存

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

@@ -36,11 +36,11 @@ public class OrderRentVehicleReceivedStatisticsBiz extends BaseBiz<OrderRentVehi
     private final BaseOrderBiz baseOrderBiz;
     private final OrderAccountBiz orderAccountBiz;
     private final VehicleFeign vehicleFeign;
-    private final String NO_PAY_STATE_STR = String.format("%s-%d", "-", StatisticsStatusEnum.NO_PAY_WAY);
     private final int PAY_ORDER = 101;
 
     /**
      * 租车统计查询
+     *
      * @param orderReceivedStatisticsFindDTO
      * @return
      */
@@ -50,19 +50,22 @@ public class OrderRentVehicleReceivedStatisticsBiz extends BaseBiz<OrderRentVehi
 
     /**
      * 租车统计处理
+     *
      * @param startDate 开始时间
-     * @param endDate 结束时间
+     * @param endDate   结束时间
      */
     public void orderRentVehicleReceivedStatistics(Date startDate, Date endDate) {
         List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = new ArrayList<>();
-
+        List<String> stisticsActiveState = new ArrayList<>();
         //根据租车订单类型 时间查询
         List<OrderDTO> orderDTOS = baseOrderBiz.selectOrdersByTypeAndTime(Arrays.asList(StatisticsStatusEnum.ORDER_RENT_VEHICLE_TYPE), startDate, endDate);
-        //数据处理 状态组合
-        Map<String, Long> stateGroupMap = orderDTOS.stream().peek(x -> {
+
+      //数据处理 状态组合 按支付状态分组 而后按组合状态
+        Map<Boolean, Map<String, List<OrderDTO>>> stateGroupMap = orderDTOS.stream().peek(x -> {
             x.setStateGroup(String.format("%d-%d-%d-%d", x.getCompanyId(), x.getOrderOrigin(), x.getPayWay() == null ? StatisticsStatusEnum.NO_PAY_WAY : x.getPayWay(), x.getStatus()));
+            stisticsActiveState.add(x.getStateGroup());
         })
-                .collect(Collectors.groupingBy(OrderDTO::getStateGroup, Collectors.counting()));
+                .collect(Collectors.partitioningBy(x -> Objects.isNull(x.getPayWay()), Collectors.groupingBy(OrderDTO::getStateGroup, Collectors.toList())));
 
         //订单账目信息
         List<OrderAccountBo> orderAccountBoList = orderAccountBiz.selectByDate(startDate, endDate);
@@ -70,7 +73,7 @@ public class OrderRentVehicleReceivedStatisticsBiz extends BaseBiz<OrderRentVehi
         Map<String, List<OrderAccountBo>> ordersMap = orderAccountBoList.stream().peek(x -> {
             x.setStateGroup(String.format("%d-%d-%d-%d", x.getCompanyId(), x.getOrderOrigin(), x.getPayWay() == null ? StatisticsStatusEnum.NO_PAY_WAY : x.getPayWay(), x.getStatus()));
         }).collect(Collectors.groupingBy(OrderAccountBo::getStateGroup, Collectors.toList()));
-
+        //已经支付单
         Set<Map.Entry<String, List<OrderAccountBo>>> ordersSet = ordersMap.entrySet();
         for (Map.Entry<String, List<OrderAccountBo>> orderEntry : ordersSet) {
             String orderKey = orderEntry.getKey();
@@ -87,50 +90,70 @@ public class OrderRentVehicleReceivedStatisticsBiz extends BaseBiz<OrderRentVehi
                 }
             }
             orderRentVehicleReceivedStatistics.setTotalAmount(totalAmount.subtract(refundAmount));
-            Long totalQuantity = stateGroupMap == null ? 0L : stateGroupMap.get(orderKey) == null ? 0L : stateGroupMap.get(orderKey);
+            Long totalQuantity = stateGroupMap == null ? 0L : stateGroupMap.get(Boolean.TRUE) == null ? 0L : stateGroupMap.get(Boolean.TRUE).get(orderKey)==null?0:stateGroupMap.get(Boolean.TRUE).get(orderKey).size();
             orderRentVehicleReceivedStatistics.setTotalQuantity(totalQuantity.intValue());
+            orderRentVehicleReceivedStatisticsList.add(orderRentVehicleReceivedStatistics);
         }
 
         //未支付单
-        List<BigDecimal> noPayOrdersPrices = orderDTOS.stream().filter(x -> x.getPayWay() != null).map(OrderDTO::getRealAmount).collect(Collectors.toList());
-        BigDecimal totalNoPayAmount = CollectionUtils.isEmpty(noPayOrdersPrices) ? BigDecimal.ZERO : noPayOrdersPrices.stream().reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
-        int totalNoPayOrderQuantity = CollectionUtils.isEmpty(noPayOrdersPrices) ? 0 : noPayOrdersPrices.size();
+        List<OrderRentVehicleReceivedStatistics> noPayOrderRentVehicleStatisticsList = createNoPayOrderRentVehicleStatisticsList(startDate, stateGroupMap.get(Boolean.FALSE));
+        orderRentVehicleReceivedStatisticsList.addAll(noPayOrderRentVehicleStatisticsList);
 
         //查询分公司ids
         List<Integer> companyIds = vehicleFeign.findCompanyIdsByAreaId(null);
         //创建剩余状态组合的租车统计对象
-        List stisticsActiveState = ordersMap.isEmpty() ? Collections.EMPTY_LIST : Lists.newArrayList(ordersMap.keySet());
-        List<OrderRentVehicleReceivedStatistics> otherStatisticsStateGroupList = createOtherStatisticsStateGroupList(startDate, stisticsActiveState, companyIds, totalNoPayAmount, totalNoPayOrderQuantity);
+        List<OrderRentVehicleReceivedStatistics> otherStatisticsStateGroupList = createOtherStatisticsStateGroupList(startDate, stisticsActiveState, companyIds);
         orderRentVehicleReceivedStatisticsList.addAll(otherStatisticsStateGroupList);
         //保存
         insertMemberReceivedStatisticsBatch(orderRentVehicleReceivedStatisticsList);
     }
 
+    /**
+     *
+     * @param startDate 时间
+     * @param noPayOrdersMap 未支付单map
+     * @return
+     */
+    private List<OrderRentVehicleReceivedStatistics> createNoPayOrderRentVehicleStatisticsList(Date startDate,Map<String, List<OrderDTO>> noPayOrdersMap) {
+        List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = new ArrayList<>();
+        if (noPayOrdersMap==null || noPayOrdersMap.isEmpty()){
+            return orderRentVehicleReceivedStatisticsList;
+        }
+        Set<Map.Entry<String, List<OrderDTO>>> noPayOrderSet = noPayOrdersMap.entrySet();
+        for (Map.Entry<String, List<OrderDTO>> noPayOrderEntry : noPayOrderSet) {
+            String noPayOrderStateGroup = noPayOrderEntry.getKey();
+            List<OrderDTO> noPayOrders = noPayOrderEntry.getValue();
+            BigDecimal totalNoPayAmount = noPayOrders.stream().map(OrderDTO::getRealAmount).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
+            OrderRentVehicleReceivedStatistics orderRentVehicleReceivedStatistics = StatisticsStatusEnum.wrapStatisticsObject(startDate, noPayOrderStateGroup, new OrderRentVehicleReceivedStatistics());
+            orderRentVehicleReceivedStatistics.setTotalAmount(totalNoPayAmount);
+            orderRentVehicleReceivedStatistics.setTotalQuantity(noPayOrders.size());
+            orderRentVehicleReceivedStatisticsList.add(orderRentVehicleReceivedStatistics);
+        }
+        return orderRentVehicleReceivedStatisticsList;
+    }
+
     /**
      * 创建剩余状态数据
      *
-     * @param startDate  时间
-     * @param statisticsStateGroups 状态组合 集合
-     * @param companyIds  公司ids
-     * @param totalNoPayAmount  未支付金额
-     * @param totalNoPayOrderQuantity  未支付订单数
+     * @param startDate               时间
+     * @param statisticsStateGroups   状态组合 集合
+     * @param companyIds              公司ids
      * @return
      */
     private List<OrderRentVehicleReceivedStatistics> createOtherStatisticsStateGroupList(Date startDate,
                                                                                          List<String> statisticsStateGroups,
-                                                                                         List<Integer> companyIds,
-                                                                                         BigDecimal totalNoPayAmount,
-                                                                                         Integer totalNoPayOrderQuantity) {
+                                                                                         List<Integer> companyIds) {
 
         List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = new ArrayList<>();
-         //获取剩余状态组合
+        //获取剩余状态组合
         List<String> otherStatisticsStateGroup = StatisticsStatusEnum.getOtherStatisticsStateGroup(companyIds, statisticsStateGroups);
         //创建租车统计克隆对象
         OrderRentVehicleReceivedStatistics orderRentVehicleReceivedStatistics = new OrderRentVehicleReceivedStatistics();
         //统计对象的生成
         otherStatisticsStateGroup.parallelStream().map(stateGroup -> {
-            OrderRentVehicleReceivedStatistics orderRentVehicleReceivedStatisticsClone = StatisticsStatusEnum.wrapStatisticsObject(startDate, stateGroup,ObjectUtil.cloneByStream(orderRentVehicleReceivedStatistics));
-            orderRentVehicleReceivedStatisticsClone = wrapOrderRentVehicleReceivedStatistics(stateGroup,totalNoPayAmount,totalNoPayOrderQuantity,orderRentVehicleReceivedStatisticsClone);
+            OrderRentVehicleReceivedStatistics orderRentVehicleReceivedStatisticsClone = StatisticsStatusEnum.wrapStatisticsObject(startDate, stateGroup, ObjectUtil.cloneByStream(orderRentVehicleReceivedStatistics));
+            orderRentVehicleReceivedStatisticsClone.setTotalAmount(BigDecimal.ZERO);
+            orderRentVehicleReceivedStatisticsClone.setTotalQuantity(0);
             orderRentVehicleReceivedStatisticsList.add(orderRentVehicleReceivedStatisticsClone);
             return orderRentVehicleReceivedStatisticsClone;
         }).count();
@@ -138,29 +161,22 @@ public class OrderRentVehicleReceivedStatisticsBiz extends BaseBiz<OrderRentVehi
     }
 
     /**
+     * 批量插入数据  mysql sql语句默认不能超过4M
      *
-     * @param stateGroup  状态组合
-     * @param totalNoPayAmount 未支付金额
-     * @param totalNoPayOrderQuantity  未支付订单量
-     * @param orderRentVehicleReceivedStatistics 租车统计对象
-     * @return
-     */
-    private OrderRentVehicleReceivedStatistics wrapOrderRentVehicleReceivedStatistics(String stateGroup,BigDecimal totalNoPayAmount, Integer totalNoPayOrderQuantity,OrderRentVehicleReceivedStatistics orderRentVehicleReceivedStatistics){
-        if (stateGroup.contains(NO_PAY_STATE_STR)) {
-            orderRentVehicleReceivedStatistics.setTotalAmount(totalNoPayAmount);
-            orderRentVehicleReceivedStatistics.setTotalQuantity(totalNoPayOrderQuantity);
-        } else {
-            orderRentVehicleReceivedStatistics.setTotalAmount(BigDecimal.ZERO);
-            orderRentVehicleReceivedStatistics.setTotalQuantity(0);
-        }
-        return orderRentVehicleReceivedStatistics;
-    }
-
-    /**
-     * 批量插入数据
      * @param orderRentVehicleReceivedStatistics
      */
     public void insertMemberReceivedStatisticsBatch(List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatistics) {
-        mapper.insertList(orderRentVehicleReceivedStatistics);
+
+        int orderSize = orderRentVehicleReceivedStatistics.size();
+        int sqlAdq = orderSize / StatisticsStatusEnum.DEFAULT_SQL_SIZE;
+        int sqlMod = orderSize % StatisticsStatusEnum.DEFAULT_SQL_SIZE;
+        sqlAdq = sqlMod == 0 ? sqlAdq : sqlAdq + 1;
+        for (int i = 0; i < sqlAdq; i++) {
+            int fromIndex = StatisticsStatusEnum.DEFAULT_SQL_SIZE * i;
+            int toIndex = StatisticsStatusEnum.DEFAULT_SQL_SIZE * (i + 1);
+            toIndex = toIndex > orderSize ? orderSize : toIndex;
+            List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = orderRentVehicleReceivedStatistics.subList(fromIndex, toIndex);
+            mapper.insertList(orderRentVehicleReceivedStatisticsList);
+        }
     }
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -356,7 +356,7 @@
     <select id="selectOrdersByTypeAndTime" resultType="com.xxfc.platform.order.pojo.dto.OrderDTO">
         select bo.*,omd.memberLevel,IFNULL(orvd.start_company_id,otd.start_company_id) AS `companyId` from (select `id`,`type`,`status`,`order_amount` AS `orderAmount`, `real_amount`AS
         `realAmount`,`order_origin` AS `orderOrigin`, `has_pay` AS `hasPay`,
-        `pay_way` AS `payWay`,`crt_time`AS `crtTime`
+        `pay_way` AS `payWay`
         from `base_order` where (`crt_time` between #{startDate} and #{endDate} or `pay_time` between #{startDate} and #{endDate} ) and `type` IN <foreach collection="types"
                                                                                                       item="type"
                                                                                                       open="(" close=")"

xx-order/xx-order-server/src/main/resources/mapper/OrderAccountMapper.xml

@@ -60,10 +60,12 @@
             bo.id,
             bo.`status`,
             bo.order_origin,
-            bo.pay_way
+            bo.pay_way,
+            brvd.start_company_id AS `companyId`
         FROM
             `order_account` AS `oa`
             INNER JOIN `base_order` AS `bo` ON bo.id = oa.order_id
+            INNER JOIN `order_rent_vehicle_detail` AS `brvd` ON brvd.order_id=oa.order_id
             WHERE oa.`crt_time` BETWEEN #{startTime} AND #{endTime}
     </select>
 </mapper>
\ No newline at end of file

xx-order/xx-order-server/src/test/java/ServiceTest.java

+import cn.hutool.core.date.DateUtil;
 import com.xxfc.platform.order.OrderApplication;
 import com.xxfc.platform.order.biz.DailyOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.OrderMemberReceivedStatisticsBiz;
+import com.xxfc.platform.order.biz.OrderRentVehicleReceivedStatisticsBiz;
 import com.xxfc.platform.order.jobhandler.BaseOrderStatisticsJobHandler;
-import com.xxfc.platform.universal.utils.DateUtil;
 import org.joda.time.DateTime;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,6 +34,9 @@ public class ServiceTest {
     @Autowired
     private OrderMemberReceivedStatisticsBiz orderMemberReceivedStatisticsBiz;
 
+    @Autowired
+    private OrderRentVehicleReceivedStatisticsBiz orderRentVehicleReceivedStatisticsBiz;
+
     @Test
     public void testSchedu(){
 
@@ -43,7 +47,15 @@ public class ServiceTest {
     @Test
     public void testMemberStatisticsInsert(){
         Date date = cn.hutool.core.date.DateTime.of("2019-11-17", "yyyy-MM-dd").toJdkDate();
-        orderMemberReceivedStatisticsBiz.orderMemberReceivedStatistics(date);
+        //orderMemberReceivedStatisticsBiz.orderMemberReceivedStatistics(date);
+    }
+
+    @Test
+    public void testRentvehicleStatistics(){
+        Date date = cn.hutool.core.date.DateTime.of("2019-11-18", "yyyy-MM-dd").toJdkDate();
+        Date startDate = DateUtil.beginOfDay(date).toJdkDate();
+        Date endDate = DateUtil.endOfDay(date).toJdkDate();
+        orderRentVehicleReceivedStatisticsBiz.orderRentVehicleReceivedStatistics(startDate,endDate);
     }