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/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);
     }