订单统计

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

@@ -57,7 +57,7 @@ public enum  OrderReceivedStatisticsSignEnum {
                List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
                orderMap.forEach((K,V)->{
                     List<OrderReceivedStatistics> orderReceivedStatisticsList = V.stream().map(x -> (OrderReceivedStatistics) x).collect(Collectors.toList());
-                    Integer avgQuantity = orderReceivedStatisticsList.stream().map(x -> x.getAvgQuantity()).reduce(0, (x, y) -> x+y)/V.size();
+                    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);
                     orderReceivedStatisticsVos.add(receivedStatisticsVo);
@@ -89,7 +89,7 @@ public enum  OrderReceivedStatisticsSignEnum {
                List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
                orderMap.forEach((K,V)->{
                     List<OrderReceivedStatistics> orderReceivedStatisticsList = V.stream().map(x -> (OrderReceivedStatistics) x).collect(Collectors.toList());
-                    BigDecimal realAvgAmount = orderReceivedStatisticsList.stream().map(x -> x.getRealAvgAmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y)).divide(new BigDecimal(V.size()));
+                    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);
                     orderReceivedStatisticsVos.add(receivedStatisticsVo);

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

@@ -58,7 +58,7 @@ public enum OrderRentVehicleReceivedStatisticsSignEnum{
              List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
              orderMap.forEach((K,V)->{
                  List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = V.stream().map(x -> (OrderRentVehicleReceivedStatistics) x).collect(Collectors.toList());
-                 Integer avgQuantity = orderRentVehicleReceivedStatisticsList.stream().map(x -> x.getAvgQuantity()).reduce(0, (x, y) -> x+y)/V.size();
+                 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);
                  orderReceivedStatisticsVos.add(receivedStatisticsVo);
@@ -90,7 +90,7 @@ public enum OrderRentVehicleReceivedStatisticsSignEnum{
              List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
              orderMap.forEach((K,V)->{
                  List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = V.stream().map(x -> (OrderRentVehicleReceivedStatistics) x).collect(Collectors.toList());
-                 BigDecimal realAvgAmount = orderRentVehicleReceivedStatisticsList.stream().map(x -> x.getRealAvgAmount()).reduce(BigDecimal.ZERO, (x, y) -> x.add(y)).divide(new BigDecimal(V.size()), RoundingMode.HALF_UP);
+                 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);
                  orderReceivedStatisticsVos.add(receivedStatisticsVo);

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

@@ -24,7 +24,7 @@ public enum OrderTourReceivedStatisticsSignEnum {
                Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
                List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
                orderMap.forEach((K,V)->{
-                    List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = V.stream().map(x -> (OrderTourReceivedStatistics) x).collect(Collectors.toList());
+                    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);
@@ -40,7 +40,7 @@ public enum OrderTourReceivedStatisticsSignEnum {
                Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
                List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
                orderMap.forEach((K,V)->{
-                    List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = V.stream().map(x -> (OrderTourReceivedStatistics) x).collect(Collectors.toList());
+                    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);
@@ -56,8 +56,8 @@ public enum OrderTourReceivedStatisticsSignEnum {
                Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
                List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
                orderMap.forEach((K,V)->{
-                    List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = V.stream().map(x -> (OrderTourReceivedStatistics) x).collect(Collectors.toList());
-                    Integer avgQuantity = orderTourReceivedStatisticsList.stream().map(x -> x.getAvgQuantity()).reduce(0, (x, y) -> x+y)/V.size();
+                    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);
@@ -66,7 +66,12 @@ public enum OrderTourReceivedStatisticsSignEnum {
                return resultMap;
           }
      };
-    private String sign;
+
+     private static List<OrderTourReceivedStatistics> transFormOrderTourReceivedStatistics(List<OrderReceivedStatisticsBase> V) {
+          return V.stream().map(x -> (OrderTourReceivedStatistics) x).collect(Collectors.toList());
+     }
+
+     private String sign;
     private String desc;
 
      OrderTourReceivedStatisticsSignEnum(String sign, String desc) {

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

@@ -21,21 +21,6 @@ import lombok.Data;
 public class OrderMemberReceivedStatistics extends OrderReceivedStatisticsBase implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /**
-     *
-     */
-    @Id
-    @GeneratedValue(generator = "JDBC")
-    @ApiModelProperty("")
-    private Long id;
-
-    /**
-     * 订单总额
-     */
-    @Column(name = "total_amount")
-    @ApiModelProperty(value = "订单总额")
-    private BigDecimal totalAmount;
-
     /**
      * 普通会员订单总额
      */
@@ -78,27 +63,6 @@ public class OrderMemberReceivedStatistics extends OrderReceivedStatisticsBase i
     @ApiModelProperty(value = "钻石会员订单总量")
     private Integer totalDiamondQuantity;
 
-    /**
-     * 是否完成 1 完成  0 未完成
-     */
-    @Column(name = "is_finish")
-    @ApiModelProperty(value = "是否完成 1 完成  0 未完成")
-    private Integer isFinish;
-
-    /**
-     * '支付来源 1--app；2--小程序',
-     */
-    @Column(name = "order_origin")
-    @ApiModelProperty(value = " '支付来源 1--app；2--小程序',")
-    private Integer orderOrigin;
-
-    /**
-     * 支付方式 '1:微信公众号支付 2.支付宝即时到账,3,银联'
-     */
-    @Column(name = "pay_way")
-    @ApiModelProperty(value = "支付方式 '1:微信公众号支付 2.支付宝即时到账,3,银联'")
-    private Integer payWay;
-
     /**
      * 公司id
      */

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

@@ -4,6 +4,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -14,6 +17,15 @@ import java.util.Date;
  */
 @Data
 public class OrderReceivedStatisticsBase {
+
+    /**
+     *
+     */
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    @ApiModelProperty("")
+    protected Long id;
+
     /**
      *  年份
      */
@@ -41,4 +53,33 @@ public class OrderReceivedStatisticsBase {
     @Column(name = "week_of_year")
     @ApiModelProperty(value = "1周年的第几周")
     protected Integer weekOfYear;
+
+    /**
+     * 订单总额
+     */
+    @Column(name = "total_amount")
+    @ApiModelProperty(value = "订单总额")
+    protected BigDecimal totalAmount;
+
+
+    /**
+     * 是否完成 1 完成  0 未完成
+     */
+    @Column(name = "is_finish")
+    @ApiModelProperty(value = "是否完成 1 完成  0 未完成")
+    protected Integer isFinish;
+
+    /**
+     * '支付来源 1--app；2--小程序',
+     */
+    @Column(name = "order_origin")
+    @ApiModelProperty(value = " '支付来源 1--app；2--小程序',")
+    protected Integer orderOrigin;
+
+    /**
+     * 支付方式 '1:微信公众号支付 2.支付宝即时到账,3,银联'
+     */
+    @Column(name = "pay_way")
+    @ApiModelProperty(value = "支付方式 '1:微信公众号支付 2.支付宝即时到账,3,银联'")
+    protected Integer payWay;
 }

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

@@ -21,21 +21,6 @@ import lombok.Data;
 public class OrderRentVehicleReceivedStatistics extends OrderReceivedStatisticsBase implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /**
-     *
-     */
-    @Id
-    @GeneratedValue(generator = "JDBC")
-    @ApiModelProperty("")
-    private Long id;
-
-    /**
-     * 订单总额
-     */
-    @Column(name = "total_amount")
-    @ApiModelProperty(value = "订单总额")
-    private BigDecimal totalAmount;
-
     /**
      * 订单总量
      */
@@ -43,13 +28,6 @@ public class OrderRentVehicleReceivedStatistics extends OrderReceivedStatisticsB
     @ApiModelProperty(value = "订单总量")
     private Integer totalQuantity;
 
-    /**
-     * 订单平均量
-     */
-    @Column(name = "avg_quantity")
-    @ApiModelProperty(value = "订单平均量")
-    private Integer avgQuantity;
-
     /**
      * 实际收入
      */
@@ -57,34 +35,6 @@ public class OrderRentVehicleReceivedStatistics extends OrderReceivedStatisticsB
     @ApiModelProperty(value = "实际收入")
     private BigDecimal realAmount;
 
-    /**
-     * 实际平均收入
-     */
-    @Column(name = "real_avg_amount")
-    @ApiModelProperty(value = "实际平均收入")
-    private BigDecimal realAvgAmount;
-
-    /**
-     * 是否完成 1 完成  0 未完成
-     */
-    @Column(name = "is_finish")
-    @ApiModelProperty(value = "是否完成 1 完成  0 未完成")
-    private Integer isFinish;
-
-    /**
-     * '支付来源 1--app；2--小程序',
-     */
-    @Column(name = "order_origin")
-    @ApiModelProperty(value = " '支付来源 1--app；2--小程序',")
-    private Integer orderOrigin;
-
-    /**
-     * 支付方式 '1:微信公众号支付 2.支付宝即时到账,3,银联'
-     */
-    @Column(name = "pay_way")
-    @ApiModelProperty(value = "支付方式 '1:微信公众号支付 2.支付宝即时到账,3,银联'")
-    private Integer payWay;
-
     /**
      * 公司id
      */

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

@@ -21,21 +21,6 @@ import lombok.Data;
 public class OrderTourReceivedStatistics extends OrderReceivedStatisticsBase implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /**
-     *
-     */
-    @Id
-    @GeneratedValue(generator = "JDBC")
-    @ApiModelProperty("")
-    private Long id;
-
-    /**
-     * 订单总额
-     */
-    @Column(name = "total_amount")
-    @ApiModelProperty(value = "订单总额")
-    private BigDecimal totalAmount;
-
     /**
      * 订单总量
      */
@@ -43,34 +28,6 @@ public class OrderTourReceivedStatistics extends OrderReceivedStatisticsBase imp
     @ApiModelProperty(value = "订单总量")
     private Integer totalQuantity;
 
-    /**
-     * 订单平均量
-     */
-    @Column(name = "avg_quantity")
-    @ApiModelProperty(value = "订单平均量")
-    private Integer avgQuantity;
-
-    /**
-     * 是否完成 1 完成  0 未完成
-     */
-    @Column(name = "is_finish")
-    @ApiModelProperty(value = "是否完成 1 完成  0 未完成")
-    private Integer isFinish;
-
-    /**
-     * '支付来源 1--app；2--小程序',
-     */
-    @Column(name = "order_origin")
-    @ApiModelProperty(value = " '支付来源 1--app；2--小程序',")
-    private Integer orderOrigin;
-
-    /**
-     * 支付方式 '1:微信公众号支付 2.支付宝即时到账,3,银联'
-     */
-    @Column(name = "pay_way")
-    @ApiModelProperty(value = "支付方式 '1:微信公众号支付 2.支付宝即时到账,3,银联'")
-    private Integer payWay;
-
     /**
      * 公司id
      */