租车订单统计

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/OrderRentVehicleReceivedStatisticsBiz.java

@@ -36,7 +36,7 @@ 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 String NO_PAY_STATE_STR = String.format("%s%d", "-", StatisticsStatusEnum.NO_PAY_WAY);
     private final int PAY_ORDER = 101;
 
     /**
@@ -163,13 +163,14 @@ public class OrderRentVehicleReceivedStatisticsBiz extends BaseBiz<OrderRentVehi
      * @param orderRentVehicleReceivedStatistics
      */
     public void insertMemberReceivedStatisticsBatch(List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatistics) {
+
         int orderSize = orderRentVehicleReceivedStatistics.size();
         int sqlAdq = orderSize / StatisticsStatusEnum.DEFAULT_SQL_SIZE;
         int sqlMod = orderSize % StatisticsStatusEnum.DEFAULT_SQL_SIZE;
-        sqlAdq = sqlMod == 0 ? sqlAdq + 1 : sqlAdq;
+        sqlAdq = sqlMod == 0 ? sqlAdq : sqlAdq + 1;
         for (int i = 0; i < sqlAdq; i++) {
-            int fromIndex = sqlAdq * i;
-            int toIndex = sqlAdq * (i + 1);
+            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);

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(){
 
@@ -46,6 +50,14 @@ public class ServiceTest {
         //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);
+    }
+
 
     @Test
     public void test() throws ParseException {