订单统计

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

@@ -22,7 +22,7 @@ public enum  OrderMemberReceivedStatisticsSignEnum{
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
             List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
             orderMap.forEach((K,V)->{
-                List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = V.stream().map(x -> (OrderMemberReceivedStatistics) x).collect(Collectors.toList());
+                List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
                 BigDecimal totalAmount = orderMemberReceivedStatisticsList.stream().map(x -> x.getTotalAmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
                 OrderMemberReceivedStatistics orderMemberReceivedStatistics = orderMemberReceivedStatisticsList.get(0);
                 OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderMemberReceivedStatistics,totalAmount,null);
@@ -38,7 +38,7 @@ public enum  OrderMemberReceivedStatisticsSignEnum{
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
             List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
             orderMap.forEach((K,V)->{
-                List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = V.stream().map(x -> (OrderMemberReceivedStatistics) x).collect(Collectors.toList());
+                List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
                 BigDecimal totalAmount = orderMemberReceivedStatisticsList.stream().map(x -> x.getToalCommonAmmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
                 OrderMemberReceivedStatistics orderMemberReceivedStatistics = orderMemberReceivedStatisticsList.get(0);
                 OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderMemberReceivedStatistics,totalAmount,null);
@@ -70,7 +70,7 @@ public enum  OrderMemberReceivedStatisticsSignEnum{
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
             List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
             orderMap.forEach((K,V)->{
-                List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = V.stream().map(x -> (OrderMemberReceivedStatistics) x).collect(Collectors.toList());
+                List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
                 BigDecimal totalAmount = orderMemberReceivedStatisticsList.stream().map(x -> x.getTotalGoldAmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
                 OrderMemberReceivedStatistics orderMemberReceivedStatistics = orderMemberReceivedStatisticsList.get(0);
                 OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderMemberReceivedStatistics,totalAmount,null);
@@ -86,7 +86,7 @@ public enum  OrderMemberReceivedStatisticsSignEnum{
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
             List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
             orderMap.forEach((K,V)->{
-                List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = V.stream().map(x -> (OrderMemberReceivedStatistics) x).collect(Collectors.toList());
+                List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
                 Integer totalQuantity = orderMemberReceivedStatisticsList.stream().map(x -> x.getTotalGoldQuantity()).reduce(0, (x, y) -> x+y);
                 OrderMemberReceivedStatistics orderMemberReceivedStatistics = orderMemberReceivedStatisticsList.get(0);
                 OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderMemberReceivedStatistics,null,totalQuantity);
@@ -102,7 +102,7 @@ public enum  OrderMemberReceivedStatisticsSignEnum{
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
             List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
             orderMap.forEach((K,V)->{
-                List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = V.stream().map(x -> (OrderMemberReceivedStatistics) x).collect(Collectors.toList());
+                List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
                 BigDecimal totalAmount = orderMemberReceivedStatisticsList.stream().map(x -> x.getTotalDiamondAmmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
                 OrderMemberReceivedStatistics orderMemberReceivedStatistics = orderMemberReceivedStatisticsList.get(0);
                 OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderMemberReceivedStatistics,totalAmount,null);
@@ -118,7 +118,7 @@ public enum  OrderMemberReceivedStatisticsSignEnum{
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
             List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
             orderMap.forEach((K,V)->{
-                List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = V.stream().map(x -> (OrderMemberReceivedStatistics) x).collect(Collectors.toList());
+                List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
                 Integer totalQuantity = orderMemberReceivedStatisticsList.stream().map(x -> x.getTotalDiamondQuantity()).reduce(0, (x, y) -> x+y);
                 OrderMemberReceivedStatistics orderMemberReceivedStatistics = orderMemberReceivedStatisticsList.get(0);
                 OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderMemberReceivedStatistics,null,totalQuantity);

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

@@ -22,7 +22,7 @@ public enum  OrderReceivedStatisticsSignEnum {
                Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
                List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
                orderMap.forEach((K,V)->{
-                    List<OrderReceivedStatistics> orderReceivedStatisticsList = V.stream().map(x -> (OrderReceivedStatistics) x).collect(Collectors.toList());
+                    List<OrderReceivedStatistics> orderReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
                     BigDecimal totalAmount = orderReceivedStatisticsList.stream().map(x -> x.getTotalAmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
                     OrderReceivedStatistics orderReceivedStatistics = orderReceivedStatisticsList.get(0);
                     OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,totalAmount,null);
@@ -38,7 +38,7 @@ public enum  OrderReceivedStatisticsSignEnum {
                Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
                List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
                orderMap.forEach((K,V)->{
-                    List<OrderReceivedStatistics> orderReceivedStatisticsList = V.stream().map(x -> (OrderReceivedStatistics) x).collect(Collectors.toList());
+                    List<OrderReceivedStatistics> orderReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
                     Integer totalQuantity = orderReceivedStatisticsList.stream().map(x -> x.getTotalQuantity()).reduce(0, (x, y) -> x+y);
                     OrderReceivedStatistics orderReceivedStatistics = orderReceivedStatisticsList.get(0);
                     OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,null,totalQuantity);
@@ -54,7 +54,7 @@ public enum  OrderReceivedStatisticsSignEnum {
                Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
                List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
                orderMap.forEach((K,V)->{
-                    List<OrderReceivedStatistics> orderReceivedStatisticsList = V.stream().map(x -> (OrderReceivedStatistics) x).collect(Collectors.toList());
+                    List<OrderReceivedStatistics> orderReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
                     Integer avgQuantity = orderReceivedStatisticsList.stream().map(x -> x.getTotalQuantity()).reduce(0, (x, y) -> x+y)/V.size();
                     OrderReceivedStatistics orderReceivedStatistics = orderReceivedStatisticsList.get(0);
                     OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,null,avgQuantity);
@@ -70,7 +70,7 @@ public enum  OrderReceivedStatisticsSignEnum {
                Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
                List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
                orderMap.forEach((K,V)->{
-                    List<OrderReceivedStatistics> orderReceivedStatisticsList = V.stream().map(x -> (OrderReceivedStatistics) x).collect(Collectors.toList());
+                    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);
@@ -86,7 +86,7 @@ public enum  OrderReceivedStatisticsSignEnum {
                Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
                List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
                orderMap.forEach((K,V)->{
-                    List<OrderReceivedStatistics> orderReceivedStatisticsList = V.stream().map(x -> (OrderReceivedStatistics) x).collect(Collectors.toList());
+                    List<OrderReceivedStatistics> orderReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
                     BigDecimal realAvgAmount = orderReceivedStatisticsList.stream().map(x -> x.getRealAmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y)).divide(new BigDecimal(V.size()));
                     OrderReceivedStatistics orderReceivedStatistics = orderReceivedStatisticsList.get(0);
                     OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,realAvgAmount,null);

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

@@ -23,7 +23,7 @@ public enum OrderRentVehicleReceivedStatisticsSignEnum{
              Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
              List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
              orderMap.forEach((K,V)->{
-                 List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = V.stream().map(x -> (OrderRentVehicleReceivedStatistics) x).collect(Collectors.toList());
+                 List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
                  BigDecimal totalAmount = orderRentVehicleReceivedStatisticsList.stream().map(x -> x.getTotalAmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
                  OrderRentVehicleReceivedStatistics orderReceivedStatistics = orderRentVehicleReceivedStatisticsList.get(0);
                  OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,totalAmount,null);
@@ -39,7 +39,7 @@ public enum OrderRentVehicleReceivedStatisticsSignEnum{
              Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
              List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
              orderMap.forEach((K,V)->{
-                 List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = V.stream().map(x -> (OrderRentVehicleReceivedStatistics) x).collect(Collectors.toList());
+                 List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
                  Integer totalQuantity = orderRentVehicleReceivedStatisticsList.stream().map(x -> x.getTotalQuantity()).reduce(0, (x, y) -> x+y);
                  OrderRentVehicleReceivedStatistics orderReceivedStatistics = orderRentVehicleReceivedStatisticsList.get(0);
                  OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,null,totalQuantity);
@@ -55,7 +55,7 @@ public enum OrderRentVehicleReceivedStatisticsSignEnum{
              Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
              List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
              orderMap.forEach((K,V)->{
-                 List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = V.stream().map(x -> (OrderRentVehicleReceivedStatistics) x).collect(Collectors.toList());
+                 List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
                  Integer avgQuantity = orderRentVehicleReceivedStatisticsList.stream().map(x -> x.getTotalQuantity()).reduce(0, (x, y) -> x+y)/V.size();
                  OrderRentVehicleReceivedStatistics orderReceivedStatistics = orderRentVehicleReceivedStatisticsList.get(0);
                  OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,null,avgQuantity);
@@ -71,7 +71,7 @@ public enum OrderRentVehicleReceivedStatisticsSignEnum{
              Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
              List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
              orderMap.forEach((K,V)->{
-                 List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = V.stream().map(x -> (OrderRentVehicleReceivedStatistics) x).collect(Collectors.toList());
+                 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);
@@ -87,7 +87,7 @@ public enum OrderRentVehicleReceivedStatisticsSignEnum{
              Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
              List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
              orderMap.forEach((K,V)->{
-                 List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = V.stream().map(x -> (OrderRentVehicleReceivedStatistics) x).collect(Collectors.toList());
+                 List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
                  BigDecimal realAvgAmount = orderRentVehicleReceivedStatisticsList.stream().map(x -> x.getRealAmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y)).divide(new BigDecimal(V.size()), RoundingMode.HALF_UP);
                  OrderRentVehicleReceivedStatistics orderReceivedStatistics = orderRentVehicleReceivedStatisticsList.get(0);
                  OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,realAvgAmount,null);

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

@@ -16,77 +16,74 @@ import java.util.stream.Collectors;
  * @data 2019/11/11 10:36
  */
 public enum OrderTourReceivedStatisticsSignEnum {
-     TOUR_TOTAL_AMOUNT("tta","旅游订单总额"){
-          @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<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = transFormOrderTourReceivedStatistics(V);
-                    BigDecimal totalAmount = orderTourReceivedStatisticsList.stream().map(x -> x.getTotalAmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
-                    OrderTourReceivedStatistics orderReceivedStatistics = orderTourReceivedStatisticsList.get(0);
-                    OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,totalAmount,null);
-                    orderReceivedStatisticsVos.add(receivedStatisticsVo);
-               });
-               resultMap.put(getSign(),orderReceivedStatisticsVos);
-               return resultMap;
-          }
-     },
-     TOUR_TOTAL_QUANTITY("ttq","旅游订单量"){
-          @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<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = transFormOrderTourReceivedStatistics(V);
-                    Integer totalQuantity = orderTourReceivedStatisticsList.stream().map(x -> x.getTotalQuantity()).reduce(0, (x, y) -> x+y);
-                    OrderTourReceivedStatistics orderReceivedStatistics = orderTourReceivedStatisticsList.get(0);
-                    OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,null,totalQuantity);
-                    orderReceivedStatisticsVos.add(receivedStatisticsVo);
-               });
-               resultMap.put(getSign(),orderReceivedStatisticsVos);
-               return resultMap;
-          }
-     },
-     TOUR_AVG_QUANTITY("tavgq","旅游订单平均量"){
-          @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<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = transFormOrderTourReceivedStatistics(V);
-                    Integer avgQuantity = orderTourReceivedStatisticsList.stream().map(x -> x.getTotalQuantity()).reduce(0, (x, y) -> x+y)/V.size();
-                    OrderTourReceivedStatistics orderReceivedStatistics = orderTourReceivedStatisticsList.get(0);
-                    OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics,null,avgQuantity);
-                    orderReceivedStatisticsVos.add(receivedStatisticsVo);
-               });
-               resultMap.put(getSign(),orderReceivedStatisticsVos);
-               return resultMap;
-          }
-     };
-
-     private static List<OrderTourReceivedStatistics> transFormOrderTourReceivedStatistics(List<OrderReceivedStatisticsBase> V) {
-          return V.stream().map(x -> (OrderTourReceivedStatistics) x).collect(Collectors.toList());
-     }
-
-     private String sign;
+    TOUR_TOTAL_AMOUNT("tta", "旅游订单总额") {
+        @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<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
+                BigDecimal totalAmount = orderTourReceivedStatisticsList.stream().map(x -> x.getTotalAmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
+                OrderTourReceivedStatistics orderReceivedStatistics = orderTourReceivedStatisticsList.get(0);
+                OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics, totalAmount, null);
+                orderReceivedStatisticsVos.add(receivedStatisticsVo);
+            });
+            resultMap.put(getSign(), orderReceivedStatisticsVos);
+            return resultMap;
+        }
+    },
+    TOUR_TOTAL_QUANTITY("ttq", "旅游订单量") {
+        @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<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
+                Integer totalQuantity = orderTourReceivedStatisticsList.stream().map(x -> x.getTotalQuantity()).reduce(0, (x, y) -> x + y);
+                OrderTourReceivedStatistics orderReceivedStatistics = orderTourReceivedStatisticsList.get(0);
+                OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics, null, totalQuantity);
+                orderReceivedStatisticsVos.add(receivedStatisticsVo);
+            });
+            resultMap.put(getSign(), orderReceivedStatisticsVos);
+            return resultMap;
+        }
+    },
+    TOUR_AVG_QUANTITY("tavgq", "旅游订单平均量") {
+        @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<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
+                Integer avgQuantity = orderTourReceivedStatisticsList.stream().map(x -> x.getTotalQuantity()).reduce(0, (x, y) -> x + y) / V.size();
+                OrderTourReceivedStatistics orderReceivedStatistics = orderTourReceivedStatisticsList.get(0);
+                OrderReceivedStatisticsVo receivedStatisticsVo = ReceivedStatisticsEnum.createOrderReceivedStatistics(orderReceivedStatistics, null, avgQuantity);
+                orderReceivedStatisticsVos.add(receivedStatisticsVo);
+            });
+            resultMap.put(getSign(), orderReceivedStatisticsVos);
+            return resultMap;
+        }
+    };
+    private String sign;
     private String desc;
-    private static  Map<String,OrderTourReceivedStatisticsSignEnum> orderTourReceivedStatisticsSignEnumMap;
+    private static Map<String, OrderTourReceivedStatisticsSignEnum> orderTourReceivedStatisticsSignEnumMap;
+
     static {
         orderTourReceivedStatisticsSignEnumMap = EnumSet.allOf(OrderTourReceivedStatisticsSignEnum.class).stream().collect(Collectors.toMap(OrderTourReceivedStatisticsSignEnum::getSign, Function.identity()));
     }
 
-     OrderTourReceivedStatisticsSignEnum(String sign, String desc) {
-          this.sign = sign;
-          this.desc = desc;
-     }
+    OrderTourReceivedStatisticsSignEnum(String sign, String desc) {
+        this.sign = sign;
+        this.desc = desc;
+    }
 
-     /**
-      * 统计项
-      * @param orderMap
-      * @return
-      */
-     abstract Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object,List<OrderReceivedStatisticsBase>> orderMap);
+    /**
+     * 统计项
+     *
+     * @param orderMap
+     * @return
+     */
+    abstract Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap);
 
     public static Map<String, List<OrderReceivedStatisticsVo>> orderMemberstatisticsMap(Map<Object, List<OrderReceivedStatisticsBase>> orderTourstatisticsMap, List<String> signs) {
         Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>(signs.size());
@@ -97,19 +94,20 @@ public enum OrderTourReceivedStatisticsSignEnum {
         }
         return resultMap;
     }
-     public String getSign() {
-          return sign;
-     }
 
-     public void setSign(String sign) {
-          this.sign = sign;
-     }
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
 
-     public String getDesc() {
-          return desc;
-     }
+    public String getDesc() {
+        return desc;
+    }
 
-     public void setDesc(String desc) {
-          this.desc = desc;
-     }
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
 }

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

@@ -75,6 +75,16 @@ public enum ReceivedStatisticsEnum {
         return statisticsEnumMap.get(wayCode);
     }
 
+    /**
+     * 类型转换
+     * @param source
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> convertToTargetBean(List<? extends  OrderReceivedStatisticsBase> source){
+       return source.stream().map(x -> (T) x).collect(Collectors.toList());
+    }
+
     public static OrderReceivedStatisticsVo createOrderReceivedStatistics(OrderReceivedStatisticsBase orderReceivedStatisticsBase, BigDecimal amount,Integer quantity){
         return OrderReceivedStatisticsVo.builder()
                 .date(orderReceivedStatisticsBase.getDate())

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderTourReceivedStatistics.java

 package com.xxfc.platform.order.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.persistence.*;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
 
 /**
  * 旅游订单统计