Merge branch 'order_received_statistics'

# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderViolationBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/CollectorsUtil.java

+package com.github.wxiaoqi.security.common.util;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collector;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 
+ * @data 2019/11/20 19:59
+ */
+public class CollectorsUtil {
+    static final Set<Collector.Characteristics> CH_NOID = Collections.emptySet();
+
+    private CollectorsUtil() {
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <I, R> Function<I, R> castingIdentity() {
+        return i -> (R) i;
+    }
+
+    /**
+     * Simple implementation class for {@code Collector}.
+     *
+     * @param <T>
+     *            the type of elements to be collected
+     * @param <R>
+     *            the type of the result
+     */
+    static class CollectorImpl<T, A, R> implements Collector<T, A, R> {
+        private final Supplier<A> supplier;
+        private final BiConsumer<A, T> accumulator;
+        private final BinaryOperator<A> combiner;
+        private final Function<A, R> finisher;
+        private final Set<Characteristics> characteristics;
+
+        CollectorImpl(Supplier<A> supplier, BiConsumer<A, T> accumulator, BinaryOperator<A> combiner,
+                      Function<A, R> finisher, Set<Characteristics> characteristics) {
+            this.supplier = supplier;
+            this.accumulator = accumulator;
+            this.combiner = combiner;
+            this.finisher = finisher;
+            this.characteristics = characteristics;
+        }
+
+        CollectorImpl(Supplier<A> supplier, BiConsumer<A, T> accumulator, BinaryOperator<A> combiner,
+                      Set<Characteristics> characteristics) {
+            this(supplier, accumulator, combiner, castingIdentity(), characteristics);
+        }
+
+        @Override
+        public BiConsumer<A, T> accumulator() {
+            return accumulator;
+        }
+
+        @Override
+        public Supplier<A> supplier() {
+            return supplier;
+        }
+
+        @Override
+        public BinaryOperator<A> combiner() {
+            return combiner;
+        }
+
+        @Override
+        public Function<A, R> finisher() {
+            return finisher;
+        }
+
+        @Override
+        public Set<Characteristics> characteristics() {
+            return characteristics;
+        }
+    }
+
+    public static <T> Collector<T, ?, BigDecimal> summingBigDecimal(ToBigDecimalFunction<? super T> mapper) {
+        return new CollectorImpl<>(() -> new BigDecimal[1], (a, t) -> {
+            if (a[0] == null) {
+                a[0] = BigDecimal.ZERO;
+            }
+            a[0] = a[0].add(mapper.applyAsBigDecimal(t));
+        }, (a, b) -> {
+            a[0] = a[0].add(b[0]);
+            return a;
+        }, a -> a[0], CH_NOID);
+    }
+}

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/ToBigDecimalFunction.java

+package com.github.wxiaoqi.security.common.util;
+
+import java.math.BigDecimal;
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/20 20:25
+ */
+@FunctionalInterface
+public interface ToBigDecimalFunction<T> {
+    BigDecimal applyAsBigDecimal(T value);
+}

ace-modules/ace-generator/src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.jdbc.Driver
-        url: jdbc:mysql://10.5.52.4:3307/xxfc_uccn?useUnicode=true&characterEncoding=UTF-8
+        url: jdbc:mysql://10.5.52.3:3306/xxfc_order?useUnicode=true&characterEncoding=UTF-8
         username: root
         password: sslcloud123*()
     jackson:

ace-modules/ace-generator/src/main/resources/generator.properties

 #\u4EE3\u7801\u751F\u6210\u5668\uFF0C\u914D\u7F6E\u4FE1\u606F
 
 #\u5305\u540D
-package=com.xxfc.platform.uccn
+package=com.xxfc.platform.order
 #\u4F5C\u8005
 author=libin
 #Email

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/Utils/OrderDateUtils.java

 package com.xxfc.platform.order.Utils;
 
+import org.joda.time.DateTime;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -108,4 +112,51 @@ public class OrderDateUtils {
         cal.setTimeInMillis(System.currentTimeMillis());
         return cal.get(Calendar.YEAR);
     }
+
+        public static LocalDate dateToLocalDate(Date date) {
+            return LocalDate.from(date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
+        }
+
+        public static Date localDateToDate(LocalDate localDate) {
+            return Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+        }
+
+        /**
+         * 获取当天的开始时间
+         * @return
+         */
+        public static long getStartOfDay() {
+            return getStartOfDay(new Date());
+        }
+
+        /**
+         * 获取某天的开始时间
+         * @param date
+         * @return
+         */
+        public static long getStartOfDay(Date date) {
+            DateTime dateTime = new DateTime(date);
+            DateTime startOfDay = dateTime.withTimeAtStartOfDay();
+            return startOfDay.getMillis();
+        }
+
+        /**
+         * 获取当天的结束时间
+         * @return
+         */
+        public static long getEndOfDay() {
+            return getEndOfDay(new Date());
+        }
+
+        /**
+         * 获取某天的结束时间
+         * @param date
+         * @return
+         */
+        public static long getEndOfDay(Date date) {
+            DateTime dateTime = new DateTime(date);
+            DateTime endOfDay = dateTime.millisOfDay().withMaximumValue();
+            return endOfDay.getMillis();
+        }
+
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/bo/CompanyPerformanceBo.java

+package com.xxfc.platform.order.bo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/23 14:39
+ */
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class CompanyPerformanceBo {
+
+     private Date date;
+     private Integer year;
+     private String month;
+     private String weekOfYear;
+     private Integer companyId;
+     private String companyName;
+     private BigDecimal memberAmount;
+     private BigDecimal rentVehilceAmount;
+     private BigDecimal travelAmount;
+     private BigDecimal noDeductibleAmount;
+     private BigDecimal depositAmount;
+     private Integer rentDays;
+     private BigDecimal extralAmount;
+     private Integer  departureNum;
+     private Integer   arrivalNum;
+     private String startDate;
+     private String endDate;
+     private String dateStr;
+
+     public BigDecimal getMemberAmount() {
+          return memberAmount==null?BigDecimal.ZERO:memberAmount;
+     }
+
+     public BigDecimal getRentVehilceAmount() {
+          return rentVehilceAmount==null?BigDecimal.ZERO:rentVehilceAmount;
+     }
+
+     public BigDecimal getTravelAmount() {
+          return travelAmount==null?BigDecimal.ZERO:travelAmount;
+     }
+
+     public BigDecimal getNoDeductibleAmount() {
+          return noDeductibleAmount==null?BigDecimal.ZERO:noDeductibleAmount;
+     }
+
+     public BigDecimal getDepositAmount() {
+          return depositAmount==null?BigDecimal.ZERO:depositAmount;
+     }
+
+     public Integer getRentDays() {
+          return rentDays==null?0:rentDays;
+     }
+
+     public BigDecimal getExtralAmount() {
+          return extralAmount==null?BigDecimal.ZERO:extralAmount;
+     }
+
+     public Integer getDepartureNum() {
+          return departureNum==null?0:departureNum;
+     }
+
+     public Integer getArrivalNum() {
+          return arrivalNum==null?0:arrivalNum;
+     }
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/bo/FeeTypeBo.java

+package com.xxfc.platform.order.bo;
+
+import cn.hutool.json.JSONObject;
+import com.xxfc.platform.order.contant.enumerate.AccountTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.DeductionTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.StatisticsStatusEnum;
+import com.xxfc.platform.order.pojo.account.OrderAccountBo;
+import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/27 16:10
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class FeeTypeBo implements Serializable {
+   private static final long serialVersionUID = 1L;
+   private BigDecimal noDeductibleRefundAmount = BigDecimal.ZERO;
+   private BigDecimal noDeductibleAmount = BigDecimal.ZERO;
+   private BigDecimal totalAmount = BigDecimal.ZERO;
+   private BigDecimal orderRefundAmount = BigDecimal.ZERO;
+   private BigDecimal depositAmount = BigDecimal.ZERO;
+   private BigDecimal depositRefundAmount = BigDecimal.ZERO;
+   private BigDecimal lateFeeAmount = BigDecimal.ZERO;
+   private BigDecimal breakRulesRegulationAmount = BigDecimal.ZERO;
+   private BigDecimal lossSpecifiedAmount = BigDecimal.ZERO;
+   private BigDecimal extraAmount = BigDecimal.ZERO;
+
+
+}
+

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

+package com.xxfc.platform.order.contant.enumerate;
+
+import com.xxfc.platform.order.entity.OrderReceivedStatistics;
+import com.xxfc.platform.order.entity.OrderReceivedStatisticsBase;
+import com.xxfc.platform.order.pojo.vo.OrderReceivedStatisticsVo;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/11 10:36
+ */
+public enum  OrderReceivedStatisticsSignEnum {
+     ORDER_TOTAL_AMOUNT("aa_ota","订单总额"){
+          @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 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);
+                    orderReceivedStatisticsVos.add(receivedStatisticsVo);
+               });
+               resultMap.put(getSign(),orderReceivedStatisticsVos);
+               return resultMap;
+          }
+     },
+     ORDER_TOTAL_QUANTITY("ab_otq","订单量"){
+          @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);
+                    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);
+                    orderReceivedStatisticsVos.add(receivedStatisticsVo);
+               });
+               resultMap.put(getSign(),orderReceivedStatisticsVos);
+               return resultMap;
+          }
+     },
+     ORDER_AVG_QUANTITY("ac_oavgq","订单arpu"){
+          @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);
+                    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);
+               });
+               resultMap.put(getSign(),orderReceivedStatisticsVos);
+               return resultMap;
+          }
+     };
+     private String sign;
+     private String desc;
+     private static  Map<String,OrderReceivedStatisticsSignEnum> orderReceivedStatisticsSignEnumMap;
+
+     static {
+          orderReceivedStatisticsSignEnumMap = EnumSet.allOf(OrderReceivedStatisticsSignEnum.class).stream().collect(Collectors.toMap(OrderReceivedStatisticsSignEnum::getSign, Function.identity()));
+     }
+
+     OrderReceivedStatisticsSignEnum(String sign, String desc) {
+          this.sign = sign;
+          this.desc = desc;
+     }
+     /**
+      * 统计项
+      * @param orderMap
+      * @return
+      */
+     abstract Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object,List<OrderReceivedStatisticsBase>> orderMap);
+
+     public static  Map<String, List<OrderReceivedStatisticsVo>> orderReceivedStatistics(Map<Object,List<OrderReceivedStatisticsBase>> orderMap,List<String> signs){
+          Map<String,List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>(signs.size());
+          for (String sign : signs) {
+               OrderReceivedStatisticsSignEnum orderReceivedStatisticsSignEnum = orderReceivedStatisticsSignEnumMap.get(sign);
+               Map<String, List<OrderReceivedStatisticsVo>> wrapToMap = orderReceivedStatisticsSignEnum.wrapToMap(orderMap);
+               resultMap.putAll(wrapToMap);
+          }
+          return resultMap;
+     }
+
+     public String getSign() {
+          return sign;
+     }
+
+     public void setSign(String sign) {
+          this.sign = sign;
+     }
+
+     public String getDesc() {
+          return desc;
+     }
+
+     public void setDesc(String desc) {
+          this.desc = desc;
+     }
+
+}

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

+package com.xxfc.platform.order.contant.enumerate;
+
+import com.xxfc.platform.order.entity.OrderReceivedStatisticsBase;
+import com.xxfc.platform.order.entity.OrderRentVehicleReceivedStatistics;
+import com.xxfc.platform.order.pojo.vo.OrderReceivedStatisticsVo;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/11 10:36
+ */
+public enum OrderRentVehicleReceivedStatisticsSignEnum{
+     RENT_VEHICLE_TOTAL_AMOUNT("ba_rvta","租车订单总额"){
+         @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 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);
+                 orderReceivedStatisticsVos.add(receivedStatisticsVo);
+             });
+             resultMap.put(getSign(),orderReceivedStatisticsVos);
+             return resultMap;
+         }
+     },
+     RENT_VEHICLE_TOTAL_QUANTITY("bb_rvtq","租车订单量") {
+         @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);
+                 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);
+                 orderReceivedStatisticsVos.add(receivedStatisticsVo);
+             });
+             resultMap.put(getSign(),orderReceivedStatisticsVos);
+             return resultMap;
+         }
+     },
+     RENT_VEHICLE_AVG_QUANTITY("bc_rvavgq","租车订单arpu") {
+         @Override
+         Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
+             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
+             AtomicReference<Integer> divisorAtomicReference = new AtomicReference<>();
+             List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
+             orderMap.forEach((K,V)->{
+                 List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
+                 Integer divisor = divisorAtomicReference.get();
+                 if (Objects.isNull(divisor)){
+                     divisor = orderRentVehicleReceivedStatisticsList.get(0).getDivisor();
+                     divisorAtomicReference.set(divisor);
+                 }
+                 Integer avgQuantity = orderRentVehicleReceivedStatisticsList.stream().map(x -> x.getTotalQuantity()).reduce(0, (x, y) -> x+y)/divisor;
+                 OrderRentVehicleReceivedStatistics orderReceivedStatistics = orderRentVehicleReceivedStatisticsList.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,OrderRentVehicleReceivedStatisticsSignEnum> orderRentVehicleReceivedStatisticsSignEnumMap;
+
+    static {
+        orderRentVehicleReceivedStatisticsSignEnumMap = EnumSet.allOf(OrderRentVehicleReceivedStatisticsSignEnum.class).stream().collect(Collectors.toMap(OrderRentVehicleReceivedStatisticsSignEnum::getSign, Function.identity()));
+    }
+
+     OrderRentVehicleReceivedStatisticsSignEnum(String sign, String desc) {
+          this.sign = sign;
+          this.desc = desc;
+     }
+    /**
+     * 统计项
+     * @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>> orderRentVehiclestatisticsMap, List<String> signs) {
+        Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>(signs.size());
+        for (String sign : signs) {
+            OrderRentVehicleReceivedStatisticsSignEnum orderRentVehicleReceivedStatisticsSignEnum = orderRentVehicleReceivedStatisticsSignEnumMap.get(sign);
+            Map<String, List<OrderReceivedStatisticsVo>> wrapToMap = orderRentVehicleReceivedStatisticsSignEnum.wrapToMap(orderRentVehiclestatisticsMap);
+            resultMap.putAll(wrapToMap);
+        }
+        return resultMap;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+}
+

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

+package com.xxfc.platform.order.contant.enumerate;
+
+import com.xxfc.platform.order.entity.OrderReceivedStatisticsBase;
+import com.xxfc.platform.order.entity.OrderTourReceivedStatistics;
+import com.xxfc.platform.order.pojo.vo.OrderReceivedStatisticsVo;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/11 10:36
+ */
+public enum OrderTourReceivedStatisticsSignEnum {
+    TOUR_TOTAL_AMOUNT("ca_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("cb_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("cd_tavgq", "旅游订单arpu") {
+        @Override
+        Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
+            Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
+            AtomicReference<Integer> divisorAtomicReference = new AtomicReference<>();
+            List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = new ArrayList<>();
+            orderMap.forEach((K, V) -> {
+                List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = ReceivedStatisticsEnum.convertToTargetBean(V);
+                Integer divisor = divisorAtomicReference.get();
+                if (Objects.isNull(divisor)){
+                     divisor = orderTourReceivedStatisticsList.get(0).getDivisor();
+                    divisorAtomicReference.set(divisor);
+                }
+                Integer avgQuantity = orderTourReceivedStatisticsList.stream().map(x -> x.getTotalQuantity()).reduce(0, (x, y) -> x + y) / divisor;
+                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;
+
+    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;
+    }
+
+    /**
+     * 统计项
+     *
+     * @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());
+        for (String sign : signs) {
+            OrderTourReceivedStatisticsSignEnum orderTourReceivedStatisticsSignEnum = orderTourReceivedStatisticsSignEnumMap.get(sign);
+            Map<String, List<OrderReceivedStatisticsVo>> wrapToMap = orderTourReceivedStatisticsSignEnum.wrapToMap(orderTourstatisticsMap);
+            resultMap.putAll(wrapToMap);
+        }
+        return resultMap;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+
+    public String getDesc() {
+        return 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

+package com.xxfc.platform.order.contant.enumerate;
+
+import com.xxfc.platform.order.entity.OrderReceivedStatisticsBase;
+import com.xxfc.platform.order.pojo.vo.OrderReceivedStatisticsVo;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/11 15:25
+ */
+public enum ReceivedStatisticsEnum {
+    DAY(1, "按日统计") {
+        @Override
+        Map<Object, List<OrderReceivedStatisticsBase>> wrapMap(List<? extends OrderReceivedStatisticsBase> orderReceivedStatisticsBases) {
+            if (CollectionUtils.isEmpty(orderReceivedStatisticsBases)) {
+                return Collections.EMPTY_MAP;
+            }
+            return orderReceivedStatisticsBases.stream().peek(x -> {
+                ((OrderReceivedStatisticsBase) x).setDivisor(1);
+            }).collect(Collectors.groupingBy(OrderReceivedStatisticsBase::getDate, Collectors.toList()));
+        }
+    },
+    WEEK(2, "按周统计") {
+        @Override
+        Map<Object, List<OrderReceivedStatisticsBase>> wrapMap(List<? extends OrderReceivedStatisticsBase> orderReceivedStatisticsBases) {
+            if (CollectionUtils.isEmpty(orderReceivedStatisticsBases)) {
+                return Collections.EMPTY_MAP;
+            }
+            return orderReceivedStatisticsBases.stream().peek(x -> ((OrderReceivedStatisticsBase) x).setDivisor(7)).collect(Collectors.groupingBy(OrderReceivedStatisticsBase::getWeekOfYear, Collectors.toList()));
+        }
+    },
+    MONTH(3, "按月统计") {
+        @Override
+        Map<Object, List<OrderReceivedStatisticsBase>> wrapMap(List<? extends OrderReceivedStatisticsBase> orderReceivedStatisticsBases) {
+            if (CollectionUtils.isEmpty(orderReceivedStatisticsBases)) {
+                return Collections.EMPTY_MAP;
+            }
+            return orderReceivedStatisticsBases.stream().peek(x -> {
+                OrderReceivedStatisticsBase orderReceivedStatisticsBase = (OrderReceivedStatisticsBase) x;
+                orderReceivedStatisticsBase.setDate(null);
+                orderReceivedStatisticsBase.setWeekOfYear(null);
+                LocalDate localDate = LocalDate.of(Integer.valueOf(orderReceivedStatisticsBase.getYear()),
+                        Integer.valueOf(orderReceivedStatisticsBase.getMonth().replace(orderReceivedStatisticsBase.getYear(), "")), 1);
+                int lastDay = localDate.with(TemporalAdjusters.lastDayOfMonth()).getDayOfMonth();
+                orderReceivedStatisticsBase.setDivisor(lastDay);
+            }).collect(Collectors.groupingBy(OrderReceivedStatisticsBase::getMonth, Collectors.toList()));
+        }
+    };
+    private int wayCode;
+    private String value;
+    private static Map<Integer, ReceivedStatisticsEnum> statisticsEnumMap;
+
+    static {
+        statisticsEnumMap = EnumSet.allOf(ReceivedStatisticsEnum.class).stream().collect(Collectors.toMap(ReceivedStatisticsEnum::getWayCode, Function.identity()));
+    }
+
+    ReceivedStatisticsEnum(int wayCode, String value) {
+        this.wayCode = wayCode;
+        this.value = value;
+    }
+
+    /**
+     * 统计方式
+     *
+     * @param orderReceivedStatisticsBases
+     * @return
+     */
+    abstract Map<Object, List<OrderReceivedStatisticsBase>> wrapMap(List<? extends OrderReceivedStatisticsBase> orderReceivedStatisticsBases);
+
+    public static Map<Object, List<OrderReceivedStatisticsBase>> orderstatistics(List<? extends OrderReceivedStatisticsBase> orderReceivedStatisticsBases, int wayCode) {
+        ReceivedStatisticsEnum statisticsEnum = createInstance(wayCode);
+        return statisticsEnum.wrapMap(orderReceivedStatisticsBases);
+    }
+
+    private static ReceivedStatisticsEnum createInstance(int wayCode) {
+        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())
+                .month(orderReceivedStatisticsBase.getMonth())
+                .weekOfYear(orderReceivedStatisticsBase.getWeekOfYear())
+                .year(orderReceivedStatisticsBase.getYear())
+                .orderNum(quantity)
+                .orderAmount(amount)
+                .build();
+    }
+
+    public int getWayCode() {
+        return wayCode;
+    }
+
+    public void setWayCode(int wayCode) {
+        this.wayCode = wayCode;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

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

 package com.xxfc.platform.order.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.assertj.core.util.Lists;
 import tk.mybatis.mapper.annotation.Version;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
 
 /**
  *

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

+package com.xxfc.platform.order.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 会员订单统计
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-11-08 18:03:42
+ */
+@Data
+@Table(name = "order_member_received_statistics")
+public class OrderMemberReceivedStatistics extends OrderReceivedStatisticsBase implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 普通会员订单总额
+     */
+    @Column(name = "toal_common_ammount")
+    @ApiModelProperty(value = "普通会员订单总额")
+    private BigDecimal toalCommonAmmount;
+
+    /**
+     * 普通会员订单总量
+     */
+    @Column(name = "total_common_quantity")
+    @ApiModelProperty(value = "普通会员订单总量")
+    private Integer totalCommonQuantity;
+
+    /**
+     * 黄金会员订单总额
+     */
+    @Column(name = "total_gold_amount")
+    @ApiModelProperty(value = "黄金会员订单总额")
+    private BigDecimal totalGoldAmount;
+
+    /**
+     * 黄金会员订单总量
+     */
+    @Column(name = "total_gold_quantity")
+    @ApiModelProperty(value = "黄金会员订单总量")
+    private Integer totalGoldQuantity;
+
+    /**
+     * 钻石会员订单总额
+     */
+    @Column(name = "total_diamond_ammount")
+    @ApiModelProperty(value = "钻石会员订单总额")
+    private BigDecimal totalDiamondAmmount;
+
+    /**
+     * 钻石会员订单总量
+     */
+    @Column(name = "total_diamond_quantity")
+    @ApiModelProperty(value = "钻石会员订单总量")
+    private Integer totalDiamondQuantity;
+
+}

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

+package com.xxfc.platform.order.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ *  全部订单统计
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-11-08 18:03:42
+ */
+@Data
+@Table(name = "order_received_statistics")
+@ApiModel("订单统计")
+public class OrderReceivedStatistics extends OrderReceivedStatisticsBase implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@Column(name = "member_amount")
+	@ApiModelProperty("会员费")
+	private BigDecimal memberAmount;
+
+	@Column(name = "member_refund_amount")
+	@ApiModelProperty("会员退款费")
+	private BigDecimal memberRefundAmout;
+
+	@Column(name = "member_quantity")
+	@ApiModelProperty("会员订单量")
+	private Integer memberQuantity;
+
+	@Column(name = "travel_amount")
+	@ApiModelProperty("旅游费")
+	private BigDecimal travelAmount;
+
+	@Column(name = "travel_refund_amount")
+	@ApiModelProperty("旅游退款费")
+	private BigDecimal travelRefundAmount;
+
+	@Column(name = "travel_quantity")
+	@ApiModelProperty("旅游订单量")
+	private Integer travelQuantity;
+
+	@Column(name = "rent_vehicle_amount")
+	@ApiModelProperty("租车费")
+	private BigDecimal rentVehicleAmount;
+
+	@Column(name = "rent_vehicle_refund_amount")
+	@ApiModelProperty("租车退款费")
+	private BigDecimal rentVehicleRefundAmount;
+
+	@Column(name = "rent_vehicle_quantity")
+	@ApiModelProperty("租车订单量")
+	private Integer rentVehicleQuantity;
+
+	@Column(name = "no_deductible_amount")
+	@ApiModelProperty("不计免赔费")
+	private BigDecimal noDeductibleAmount;
+
+	@Column(name = "no_deductible_refund_amount")
+	@ApiModelProperty("不计免赔退款费用")
+	private BigDecimal noDeductibleRefundAmount;
+
+	@Column(name = "deposit_amount")
+	@ApiModelProperty("押金")
+	private BigDecimal depositAmount;
+
+	@Column(name = "deposit_refund_amount")
+	@ApiModelProperty("押金退款")
+	private BigDecimal depositRefundAmount;
+
+	@Column(name = "break_rules_regulation_amount")
+	@ApiModelProperty("违章金")
+	private BigDecimal breakRulesRegulationAmount;
+
+	@Column(name = "loss_specified_amount")
+	@ApiModelProperty("定损金")
+	private BigDecimal lossSpecifiedAmount;
+
+
+}

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

+package com.xxfc.platform.order.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 租车订单统计
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-11-08 18:03:42
+ */
+@Data
+@Table(name = "order_rent_vehicle_received_statistics")
+public class OrderRentVehicleReceivedStatistics extends OrderReceivedStatisticsBase implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Column(name = "deposit_amount")
+    @ApiModelProperty("押金")
+    private BigDecimal depositAmount;
+
+    @Column(name = "deposit_refund_amount")
+    @ApiModelProperty("押金退款")
+    private BigDecimal depositRefundAmount;
+
+    @Column(name = "break_rules_regulation_amount")
+    @ApiModelProperty("违章金")
+    private BigDecimal breakRulesRegulationAmount;
+
+    @Column(name = "loss_specified_amount")
+    @ApiModelProperty("定损金")
+    private BigDecimal lossSpecifiedAmount;
+
+    @Column(name = "no_deductible_amount")
+    @ApiModelProperty("不计免赔费用")
+    private BigDecimal noDeductibleAmount;
+
+    @Column(name = "no_deductible_refund_amount")
+    @ApiModelProperty("不计免赔费用")
+    private BigDecimal noDeductibleRefundAmount;
+
+}

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

+package com.xxfc.platform.order.entity;
+
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.io.Serializable;
+
+
+/**
+ * 旅游订单统计
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-11-08 18:03:42
+ */
+@Data
+@Table(name = "order_tour_received_statistics")
+public class OrderTourReceivedStatistics extends OrderReceivedStatisticsBase implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+}

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

+package com.xxfc.platform.order.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+@Table(name = "order_vehicle_service_statistics")
+@Data
+public class OrderVehicleServiceStatistics {
+    @Id
+    private Integer id;
+
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    /**
+     * 出车服务次数
+     */
+    @Column(name = "departure_num")
+    private Integer departureNum;
+
+    /**
+     * 收车服务次数
+     */
+    @Column(name = "arrival_num")
+    private Integer arrivalNum;
+
+    @Column(name = "count_year")
+    private String countYear;
+
+    @Column(name = "count_month")
+    private String countMonth;
+
+    @Column(name = "count_date")
+    private Date countDate;
+
+    @Column(name = "count_week")
+    private String countWeek;
+
+    /**
+     * 租车使用天数
+     */
+    @Column(name = "rent_num")
+    private Integer rentNum;
+
+}
\ No newline at end of file

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

+package com.xxfc.platform.order.pojo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CountVehicleServiceNumVo {
+	//年
+	private String countYear;
+	//年月
+	private String countMonth;
+	//年周
+	private String countWeek;
+	//天
+	private String countDay;
+	//日期
+	private Date countDate;
+	//公司ID
+	private Integer companyId;
+	//出车服务次数
+	private Integer departureNum;
+	//收车服务次数
+	private Integer arrivalNum;
+	//租车天数
+	private Integer rentNum;
+
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/account/OrderAccountDTO.java

 package com.xxfc.platform.order.pojo.account;
 
+import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xxfc.platform.order.entity.OrderAccount;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.util.StringUtils;
 
 import javax.persistence.Column;
 import javax.persistence.GeneratedValue;
@@ -112,6 +114,7 @@ public class   OrderAccountDTO implements Serializable {
     private String oneDay;
 
 
+
     @Override
     public String toString() {
         final StringBuffer sb = new StringBuffer("OrderAccountDTO{");

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

+package com.xxfc.platform.order.pojo.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/23 14:36
+ */
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class CompanyPerformanceFindDTO extends PageParam {
+
+    private Date startDate;
+
+    private Date endDate;
+
+    @ApiModelProperty("统计方式 1:日 2:周 3：月")
+    @NotNull(message = "统计方式不能为null")
+    private Integer statisticalWay;
+    private String companyName;
+    private Integer companyId;
+
+    private String groupFiled;
+
+    private long startIndex;
+
+    private long endInex;
+
+    public long getStartIndex() {
+        return getPage()==null?0:getPage()==0?0:(getPage()-1)*getLimit();
+    }
+
+    public long getEndInex() {
+        return getLimit()==null?20:getLimit()==0?20:getLimit();
+    }
+}

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

@@ -41,7 +41,7 @@ public class OrderDTO {
     /**
      * 费用其他明细 租车使用
      */
-    protected String costDetailExtend;
+    protected String costDetail;
     /**
      * 会员相关
      */
@@ -55,6 +55,6 @@ public class OrderDTO {
     }
 
     public JSONObject getData() {
-       return StringUtils.hasText(costDetailExtend)?JSONUtil.parseObj(costDetailExtend):new JSONObject();
+       return StringUtils.hasText(costDetail)?JSONUtil.parseObj(costDetail):new JSONObject();
     }
 }

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

+package com.xxfc.platform.order.pojo.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/11 9:49
+ */
+@Data
+@ApiModel("统计查询")
+public class OrderReceivedStatisticsFindDTO {
+      @ApiModelProperty("统计的开始时间 yyyy-MM-dd")
+      private Date startDate;
+      @ApiModelProperty("统计的结束时间 yyyy-MM-dd")
+      private Date endDate;
+      @ApiModelProperty("统计方式 1:日 2:周 3：月")
+      @NotNull(message = "统计方式不能为null")
+      private Integer statisticalWay;
+      @ApiModelProperty("订单状态 0:未完成 1:已完成")
+      private Integer orderState;
+      @ApiModelProperty("订单来源 1:app 2:小程序 3:后台")
+      private Integer orderOrigin;
+      @ApiModelProperty("支付方式 1:微信公众号支付 2:支付宝即时到账,3:银联")
+      private Integer payWay;
+      @ApiModelProperty("统计项标识")
+      @NotNull(message = "统计标识不能为null")
+      private List<String> statisticalSigns;
+      private List<Integer> companyId;
+}

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

+package com.xxfc.platform.order.pojo.order;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/20 19:11
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class CompanyAmountBo {
+    private Integer companyId;
+    private BigDecimal amount;
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/vo/OrderReceivedStatisticsVo.java

+package com.xxfc.platform.order.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/11 10:09
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderReceivedStatisticsVo {
+    private String year;
+    @ApiModelProperty("日期-->日统计方式")
+    private Date date;
+    @ApiModelProperty("第几周---->周统计方式")
+    private String weekOfYear;
+    @ApiModelProperty("月统计")
+    private String month;
+    @ApiModelProperty("订单总额|实际收入|平均收入")
+    private BigDecimal orderAmount;
+    @ApiModelProperty("订单总量|订单平均量")
+    private Integer orderNum;
+}

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

@@ -13,7 +13,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication(scanBasePackages = {
         "com.xxfc.platform",
         "com.github.wxiaoqi.security.common.handler",
-        "com.github.wxiaoqi.security.common.log"
+        "com.github.wxiaoqi.security.common.log",
+        "com.github.wxiaoqi.security.common.support"
 })
 @EnableDiscoveryClient
 @EnableScheduling

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

@@ -915,7 +915,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         return Lists.newArrayList();
     }
 
-    public List<OrderDTO> selectOrdersByTypeAndTime(List<Integer> types,Integer hasPay, Date startDate, Date endDate) {
+    public List<OrderDTO> selectOrdersByTypeAndTime(List<Integer> types, Integer hasPay, Date startDate, Date endDate) {
         List<OrderDTO>  orderDTOS = mapper.selectOrdersByTypeAndTime(types,hasPay,startDate,endDate);
         return CollectionUtils.isEmpty(orderDTOS)?Collections.EMPTY_LIST:orderDTOS;
     }
@@ -929,6 +929,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         return mapper.selectAllRentVehicleOrder(paramMap);
     }
 
+    public List<OrderPageVO> selectAllCountOrder(Map<String, Object> paramMap) {
+        return mapper.selectAllCountOrder(paramMap);
+    }
+
 
     public List<Achievement> entryStatisticalData(QueryCriteria queryCriteria) {
        return mapper.selectTotalStatistical(queryCriteria);

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

@@ -432,10 +432,10 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             oad.setDepositAmount(oad.getDepositAmount().subtract(illegalReserve).subtract(csv.getDamagesAmount()));
 
             //设置违约金
-                //设置原来算出的违约金及描述
+            //设置原来算出的违约金及描述
             csv.setViolateAmount(inProgressVO.getViolateAmount());
             csv.setViolateDesc("");
-                //处理更改之后的违约金及描述
+            //处理更改之后的违约金及描述
             handleCrosstownDetail(crosstown, oad, csv);
 
             if(StrUtil.isBlank(csv.getViolateDesc())) {
@@ -444,10 +444,10 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
 
             //退款
             BigDecimal refundAmont = oad.getDepositAmount().add(oad.getOrderAmount());
-                    //crosstown.getRestDeposit().subtract(illegalReserve);
+            //crosstown.getRestDeposit().subtract(illegalReserve);
             //原退款的钱
             BigDecimal originalRefundAmount = oad.getOriginDepositAmount().add(oad.getOriginOrderAmount());
-                    //crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
+            //crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
 
             String refundDesc = "退还车辆押金："+ refundAmont.toString();
 
@@ -660,7 +660,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
      * @return
      */
     public List<OrderAccountBo> selectByTypeAndDate(Integer orderType, Date startDate, Date endDate) {
-         List<OrderAccountBo> accountBos = mapper.selectOrderAccountByOrderTypeAndStartTimeAndEndTime(orderType,startDate.getTime(),endDate.getTime());
+        List<OrderAccountBo> accountBos = mapper.selectOrderAccountByOrderTypeAndStartTimeAndEndTime(orderType,startDate.getTime(),endDate.getTime());
         return CollectionUtils.isEmpty(accountBos)? Collections.EMPTY_LIST:accountBos;
     }
 

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

+package com.xxfc.platform.order.biz;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.google.common.collect.Lists;
+import com.xxfc.platform.order.bo.FeeTypeBo;
+import com.xxfc.platform.order.contant.enumerate.StatisticsStatusEnum;
+import com.xxfc.platform.order.entity.OrderTourReceivedStatistics;
+import com.xxfc.platform.order.mapper.OrderTourReceivedStatisticsMapper;
+import com.xxfc.platform.order.pojo.account.OrderAccountBo;
+import com.xxfc.platform.order.pojo.dto.OrderDTO;
+import com.xxfc.platform.order.pojo.dto.OrderReceivedStatisticsFindDTO;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.*;
+/**
+ * @author libin
+ * @version 1.0 旅游统计
+ * @description
+ * @data 2019/11/28 9:57
+ */
+@Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@Slf4j
+public class OrderTourReceivedStatisticsBiz extends BaseBiz<OrderTourReceivedStatisticsMapper, OrderTourReceivedStatistics> {
+    private final BaseOrderBiz baseOrderBiz;
+    private final OrderAccountBiz orderAccountBiz;
+
+    public List<OrderTourReceivedStatistics> selectOrderReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderTourReceivedStatistics(orderReceivedStatisticsFindDTO);
+    }
+
+    /**
+     * 订单统计批量插入旅游统计表
+     * zuoyihang
+     * 2019-11-12
+     *
+     * @param startDate 开始时间
+     * @param endDate   结束时间
+     */
+    public List<OrderTourReceivedStatistics> orderTourInsertStatisticsNew(Date startDate, Date endDate, Map<Integer, String> companyMap) {
+        List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = new ArrayList();
+        List<String> stisticsActiveState = new ArrayList<>();
+
+        //根据旅游类型 时间查询
+        List<OrderDTO> orderDTOS = baseOrderBiz.selectOrdersByTypeAndTime(Arrays.asList(StatisticsStatusEnum.ORDER_TOUR_TYPE),null, startDate, endDate);
+        //数据处理 状态组合 按支付状态分组 而后按组合状态
+        Map<Boolean, Map<String, List<OrderDTO>>> stateGroupMap = StatisticsStatusEnum.processOrdersWithState(stisticsActiveState, orderDTOS);
+
+        //订单账目信息
+        List<OrderAccountBo> orderAccountBoList = orderAccountBiz.selectByTypeAndDate(StatisticsStatusEnum.ORDER_TOUR_TYPE, startDate, endDate);
+        //账目数据整理 状态组合
+        Map<String, List<OrderAccountBo>> orderMap = StatisticsStatusEnum.processOrderAccountsWithState(stisticsActiveState,orderAccountBoList);
+
+        //已经支付订单
+        Set<Map.Entry<String, List<OrderAccountBo>>> orderSet = orderMap.entrySet();
+        for (Map.Entry<String, List<OrderAccountBo>> orderEntry : orderSet) {
+            String orderKey = orderEntry.getKey();
+            List<OrderAccountBo> orderAccountBos = orderEntry.getValue();
+            //创建并设置旅游统计对象默认值
+            OrderTourReceivedStatistics orderTourReceivedStatistics = StatisticsStatusEnum.wrapStatisticsObject(startDate, orderKey, companyMap, new OrderTourReceivedStatistics());
+            //账目处理
+            FeeTypeBo feeTypeBo = StatisticsStatusEnum.getFeeTyBoByOrderAccounts(orderAccountBos);
+            //旅游订单量
+            Integer totalQuantity = stateGroupMap == null ?
+                    0 : stateGroupMap.get(Boolean.TRUE) == null ?
+                    0 : stateGroupMap.get(Boolean.TRUE).get(orderKey) == null ?
+                    0 : stateGroupMap.get(Boolean.TRUE).get(orderKey).size();
+            orderTourReceivedStatistics.setTotalQuantity(totalQuantity);
+
+            //复制对应的金额（订单支付金额、退款金额、违约金）
+            BeanUtils.copyProperties(feeTypeBo,orderTourReceivedStatistics);
+            orderTourReceivedStatisticsList.add(orderTourReceivedStatistics);
+        }
+
+        //未支付订单
+        Map<String, List<OrderDTO>> noPayOrderRentvehicleMap = stateGroupMap == null ?
+                Collections.EMPTY_MAP : stateGroupMap.get(Boolean.FALSE) == null ?
+                Collections.EMPTY_MAP : stateGroupMap.get(Boolean.FALSE);
+        List<OrderTourReceivedStatistics> noPayOrderTourReceivedStatisticsList = createNoPayOrderTourReceivedStatisticsListList(startDate, noPayOrderRentvehicleMap, companyMap);
+        orderTourReceivedStatisticsList.addAll(noPayOrderTourReceivedStatisticsList);
+
+        //创建剩余状态组合旅游统计对象
+        List<OrderTourReceivedStatistics> otherStatisticsStateGroupList = createOtherStatisticsStateGroupList(startDate, stisticsActiveState, companyMap);
+        orderTourReceivedStatisticsList.addAll(otherStatisticsStateGroupList);
+        //保存
+        StatisticsStatusEnum.insertReceivedStatisticsBatch(orderTourReceivedStatisticsList,mapper);
+
+        return orderTourReceivedStatisticsList;
+    }
+
+    /**
+     *创建未支付
+     * @param startDate 统计的时间
+     * @param noPayOrdersMap 未支付单map
+     * @param companyMap 公司map
+     */
+    private List<OrderTourReceivedStatistics> createNoPayOrderTourReceivedStatisticsListList(Date startDate, Map<String, List<OrderDTO>> noPayOrdersMap, Map<Integer, String> companyMap) {
+
+        List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = new ArrayList<>();
+        if (noPayOrdersMap == null || noPayOrdersMap.isEmpty()) {
+            return orderTourReceivedStatisticsList;
+        }
+        //遍历未支付单
+        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();
+            //创建旅游统计对象并设置默认值
+            OrderTourReceivedStatistics orderTourReceivedStatistics = StatisticsStatusEnum.wrapStatisticsObject(startDate, noPayOrderStateGroup, companyMap, new OrderTourReceivedStatistics());
+            //订单总金额
+            BigDecimal totalNoPayAmount = noPayOrders.stream().map(OrderDTO::getRealAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
+            orderTourReceivedStatistics.setTotalQuantity(noPayOrders.size());
+            orderTourReceivedStatistics.setTotalAmount(totalNoPayAmount);
+            orderTourReceivedStatisticsList.add(orderTourReceivedStatistics);
+        }
+        return orderTourReceivedStatisticsList;
+    }
+
+    /**
+     * 创建剩余状态数据
+     *
+     * @param startDate             时间
+     * @param statisticsStateGroups 状态组合 集合
+     * @param companyMap            公司ids
+     * @return
+     */
+    private List<OrderTourReceivedStatistics> createOtherStatisticsStateGroupList(Date startDate,
+                                                                                  List<String> statisticsStateGroups,
+                                                                                  Map<Integer, String> companyMap) {
+        List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = new ArrayList<>();
+        //获取剩余状态组合
+        List<Integer> companyIds = Objects.isNull(companyMap) ? Collections.EMPTY_LIST : Lists.newArrayList(companyMap.keySet());
+        List<String> otherStatisticsStateGroup = StatisticsStatusEnum.getOtherStatisticsStateGroup(companyIds, statisticsStateGroups);
+        //创建租车统计克隆对象
+        OrderTourReceivedStatistics orderTourReceivedStatistics = new OrderTourReceivedStatistics();
+        //统计对象的生成
+        otherStatisticsStateGroup.stream().peek(stateGroup -> {
+            OrderTourReceivedStatistics orderTourReceivedStatisticsClone = StatisticsStatusEnum.wrapStatisticsObject(startDate, stateGroup, companyMap, ObjectUtil.cloneByStream(orderTourReceivedStatistics));
+            orderTourReceivedStatisticsList.add(orderTourReceivedStatisticsClone);
+        }).count();
+        return orderTourReceivedStatisticsList;
+    }
+}
\ No newline at end of file

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

@@ -101,7 +101,7 @@ public class OrderViolationBiz extends BaseBiz<OrderViolationMapper, OrderViolat
 
         String filePath = ovUpload + realFileRelPath;
 
- //       FileUtils.copyInputStreamToFile(file.getInputStream(), new File(filePath));
+        FileUtils.copyInputStreamToFile(file.getInputStream(), new File(filePath));
         return ObjectRestResponse.succ(filePath);
     }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/OrderReceivedStatisticsJobHandler.java

+package com.xxfc.platform.order.jobhandler;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.xxfc.platform.order.biz.OrderMemberReceivedStatisticsBiz;
+import com.xxfc.platform.order.biz.OrderReceivedStatisticsBiz;
+import com.xxfc.platform.order.biz.OrderRentVehicleReceivedStatisticsBiz;
+import com.xxfc.platform.order.biz.OrderTourReceivedStatisticsBiz;
+import com.xxfc.platform.order.entity.OrderMemberReceivedStatistics;
+import com.xxfc.platform.order.entity.OrderRentVehicleReceivedStatistics;
+import com.xxfc.platform.order.entity.OrderTourReceivedStatistics;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.IJobHandler;
+import com.xxl.job.core.handler.annotation.JobHandler;
+import com.xxl.job.core.log.XxlJobLogger;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 订单统计 定时任务
+ * @data 2019/11/11 11:09
+ */
+@JobHandler(value = "orderReceivedStatisticsJobHandler")
+@Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class OrderReceivedStatisticsJobHandler extends IJobHandler {
+
+    private final OrderReceivedStatisticsBiz orderReceivedStatisticsBiz;
+    private final OrderRentVehicleReceivedStatisticsBiz orderRentVehicleReceivedStatisticsBiz;
+    private final OrderTourReceivedStatisticsBiz orderTourReceivedStatisticsBiz;
+    private final OrderMemberReceivedStatisticsBiz orderMemberReceivedStatisticsBiz;
+    private final VehicleFeign vehicleFeign;
+
+    @Override
+    public ReturnT<String> execute(String arg) throws Exception {
+        DateTime yesterday = DateUtil.yesterday();
+        if (StringUtils.hasText(arg)){
+             try {
+                 yesterday = DateUtil.parse(arg, "yyyy-MM-dd");
+             }catch (Exception ex){
+                 XxlJobLogger.log(ex);
+                 yesterday = DateUtil.yesterday();
+             }
+        }
+
+        Date startDate = DateUtil.beginOfDay(yesterday).toJdkDate();
+        Date endDate = DateUtil.endOfDay(yesterday).toJdkDate();
+        Map<Integer, String> companyMap = vehicleFeign.findCompanyMap();
+
+        //旅游订单
+        List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = orderTourReceivedStatisticsBiz.orderTourInsertStatisticsNew(startDate,endDate,companyMap);
+        //租车订单
+        List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = orderRentVehicleReceivedStatisticsBiz.orderRentVehicleReceivedStatistics(startDate, endDate, companyMap);
+        //会员订单
+        List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = orderMemberReceivedStatisticsBiz.orderMemberReceivedStatistics(startDate, endDate, companyMap);
+        //订单
+        orderReceivedStatisticsBiz.orderReceivedStatistics(orderMemberReceivedStatisticsList,
+                orderTourReceivedStatisticsList,
+                orderRentVehicleReceivedStatisticsList,
+                startDate);
+        return new ReturnT<>(ReturnT.SUCCESS_CODE,"订单统计成功执行");
+    }
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java

@@ -36,7 +36,7 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
 	public OrderPageVO getOrderDetail(String no);
 
 	public List<OrderPageVO> selectAllRentVehicleOrder(Map<String, Object> paramMap);
-
+	public List<OrderPageVO> selectAllCountOrder(Map<String, Object> paramMap);
 	public List<OrderPageVO> selectAllTourOrder(Map<String, Object> paramMap);
 
 	List<MemberOrderBo> findMemberOrders(MemberOrderFindDTO memberOrderFindDTO);
@@ -44,9 +44,9 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
 	public List<BgOrderListVo> getAllOrderList(Map<String, Object> paramMap);
 
     List<OrderDTO> selectOrdersByTypeAndTime(@Param("types") List<Integer> types,
-											 @Param("hasPay") Integer hasPay,
-											 @Param("startDate") Date startDate,
-											 @Param("endDate") Date endDate);
+                                             @Param("hasPay") Integer hasPay,
+                                             @Param("startDate") Date startDate,
+                                             @Param("endDate") Date endDate);
 
     List<OrderDTO> selectBaeOrderByOrderIds(@Param("orderIds") List<Integer> orderIds);
     List<Achievement> selectTotalStatistical(QueryCriteria queryCriteria);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java

@@ -11,12 +11,11 @@ import tk.mybatis.mapper.common.Mapper;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 
 /**
  * 订单帐目
- * 
+ *
  * @author zhoujw
  * @email 18178966185@163.com
  * @date 2019-09-09 15:51:16
@@ -33,5 +32,5 @@ public interface OrderAccountMapper extends Mapper<OrderAccount> {
                                                   @Param("endDate") Date endDate,
                                                   @Param("staffUserIds") List<Integer> staffUserIds);
 
-    List<ReturnOrderAmount> outStatisticalData(@Param("queryCriteria")QueryCriteria queryCriteria,@Param("startTime") Long startTime,@Param("endTime")Long endTime);
+    List<ReturnOrderAmount> outStatisticalData(@Param("queryCriteria")QueryCriteria queryCriteria, @Param("startTime") Long startTime, @Param("endTime")Long endTime);
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderMemberReceivedStatisticsMapper.java

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.entity.OrderMemberReceivedStatistics;
+import com.xxfc.platform.order.pojo.dto.OrderReceivedStatisticsFindDTO;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.additional.insert.InsertListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * 会员订单统计
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-11-08 18:03:42
+ */
+public interface OrderMemberReceivedStatisticsMapper extends Mapper<OrderMemberReceivedStatistics>, InsertListMapper<OrderMemberReceivedStatistics> {
+
+    List<OrderMemberReceivedStatistics> selectOrderMemberReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+
+    void inserMemberReceivedtList(@Param("orderMembers") List<OrderMemberReceivedStatistics> orderMemberReceivedStatistics);
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderReceivedStatisticsMapper.java

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.bo.CompanyPerformanceBo;
+import com.xxfc.platform.order.entity.OrderReceivedStatistics;
+import com.xxfc.platform.order.pojo.dto.CompanyPerformanceFindDTO;
+import com.xxfc.platform.order.pojo.dto.OrderReceivedStatisticsFindDTO;
+import tk.mybatis.mapper.additional.insert.InsertListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ *  全部订单统计
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-11-08 18:03:42
+ */
+public interface OrderReceivedStatisticsMapper extends Mapper<OrderReceivedStatistics>, InsertListMapper<OrderReceivedStatistics> {
+
+    List<OrderReceivedStatistics> selectOrderReceivedStatisticsList(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+
+    List<CompanyPerformanceBo> selectCompanyPerformanceWithDay(CompanyPerformanceFindDTO companyPerformanceFindDTO);
+
+    List<CompanyPerformanceBo> selectCompanyPerformanceWithMonth(CompanyPerformanceFindDTO companyPerformanceFindDTO);
+
+    List<CompanyPerformanceBo> selectCompanyPerformanceWithWeek(CompanyPerformanceFindDTO companyPerformanceFindDTO);
+
+    int selectCountByDate(CompanyPerformanceFindDTO companyPerformanceFindDTO);
+    int selectCountByMonth(CompanyPerformanceFindDTO companyPerformanceFindDTO);
+    int selectCountByWeekOfYear(CompanyPerformanceFindDTO companyPerformanceFindDTO);
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderRentVehicleReceivedStatisticsMapper.java

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.entity.OrderRentVehicleReceivedStatistics;
+import com.xxfc.platform.order.pojo.dto.OrderReceivedStatisticsFindDTO;
+import tk.mybatis.mapper.additional.insert.InsertListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * 租车订单统计
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-11-08 18:03:42
+ */
+public interface OrderRentVehicleReceivedStatisticsMapper extends Mapper<OrderRentVehicleReceivedStatistics>, InsertListMapper<OrderRentVehicleReceivedStatistics> {
+
+    List<OrderRentVehicleReceivedStatistics> selectOrderRentVehicleReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderTourReceivedStatisticsMapper.java

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.entity.OrderTourReceivedStatistics;
+import com.xxfc.platform.order.pojo.dto.OrderReceivedStatisticsFindDTO;
+import tk.mybatis.mapper.additional.insert.InsertListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * 旅游订单统计
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-11-08 18:03:42
+ */
+public interface OrderTourReceivedStatisticsMapper extends Mapper<OrderTourReceivedStatistics>, InsertListMapper<OrderTourReceivedStatistics> {
+
+    List<OrderTourReceivedStatistics> selectOrderTourReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderVehicleServiceStatisticsMapper.java

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.entity.OrderVehicleServiceStatistics;
+import com.xxfc.platform.order.pojo.CountVehicleServiceNumVo;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 出车、收车服务次数统计
+ */
+public interface OrderVehicleServiceStatisticsMapper extends Mapper<OrderVehicleServiceStatistics> {
+	List<CountVehicleServiceNumVo> countVehicleServiceNum(Map<String, Object> param);
+
+	OrderVehicleServiceStatistics selectByCompanyIdAndDate(OrderVehicleServiceStatistics orderVehicleServiceStatistics);
+}
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderTourController.java

@@ -11,8 +11,10 @@ import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.order.biz.OrderTourDetailBiz;
+import com.xxfc.platform.order.biz.OrderTourReceivedStatisticsBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderTourDetail;
+import com.xxfc.platform.order.entity.OrderTourReceivedStatistics;
 import com.xxfc.platform.order.pojo.order.add.AddTourDTO;
 import com.xxfc.platform.order.pojo.order.TourBO;
 import com.xxfc.platform.order.pojo.price.TourPriceVO;
@@ -31,16 +33,21 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
 
 @Controller
 @RequestMapping("orderTour")
 @IgnoreClientToken
-@Api(value="旅游订单",tags={"旅游订单"})
-public class OrderTourController extends BaseController<OrderTourDetailBiz,OrderTourDetail> {
+@Api(value = "旅游订单", tags = {"旅游订单"})
+public class OrderTourController extends BaseController<OrderTourDetailBiz, OrderTourDetail> {
 
     @Autowired
     OrderTourService orderTourService;
 
+    @Autowired
+    OrderTourReceivedStatisticsBiz orderTourReceivedStatisticsBiz;
+
     @Autowired
     TourFeign tourFeign;
 
@@ -50,33 +57,51 @@ public class OrderTourController extends BaseController<OrderTourDetailBiz,Order
     @Autowired
     UserFeign userFeign;
 
-    public AppUserDTO getUserInfo(){
-        return  userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
+    public AppUserDTO getUserInfo() {
+        return userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
+    }
+
+    @RequestMapping(value = "/orderTourStatistics", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "旅游订单统计")
+     public ObjectRestResponse<OrderTourReceivedStatistics> orderTourStatistics() {
+        Date today = new Date();//获取今天的日期
+        Calendar c = Calendar.getInstance();
+        c.setTime(today);
+        c.add(Calendar.DAY_OF_MONTH, 1);
+        Date tomorrow = c.getTime();//这是明天
+        c.setTime(today);
+        c.add(Calendar.DAY_OF_MONTH, -1);
+        Date yesterday = c.getTime();//这是昨天
+        orderTourReceivedStatisticsBiz.orderTourInsertStatisticsNew(yesterday, tomorrow,null
+        );
+        return ObjectRestResponse.succ();
     }
 
-    @RequestMapping(value = "add",method = RequestMethod.POST)
+
+    @RequestMapping(value = "add", method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "确认旅游订单")
-    public ObjectRestResponse<BaseOrder> add(@RequestBody AddTourDTO vo){
+    public ObjectRestResponse<BaseOrder> add(@RequestBody AddTourDTO vo) {
         TourBO bo = BeanUtil.toBean(vo, TourBO.class);
         bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
-        bo.setTickerNo(StrUtil.isNotBlank(vo.getTickerNos())? Arrays.asList(vo.getTickerNos().split(",")):null);
+        bo.setTickerNo(StrUtil.isNotBlank(vo.getTickerNos()) ? Arrays.asList(vo.getTickerNos().split(",")) : null);
         orderTourService.createOrder(bo);
         return ObjectRestResponse.succ(bo.getOrder());
     }
 
-    @RequestMapping(value = "/calculate-price",method = RequestMethod.GET)
+    @RequestMapping(value = "/calculate-price", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "价格计算")
     @IgnoreUserToken
-    public ObjectRestResponse<TourPriceVO> calculatePrice(CalculatePriceVO vo){
+    public ObjectRestResponse<TourPriceVO> calculatePrice(CalculatePriceVO vo) {
         TourBO bo = BeanUtil.toBean(vo, TourBO.class);
         bo.setAppUserDTO(getUserInfo());
         bo.setAdultNum(vo.getNumber());
         bo.setChildNum(vo.getChildNumber());
         TourGood tourGood = tourFeign.usableGet(bo.getGoodId()).getData();
         bo.setTourGood(tourGood);
-        bo.setTickerNo(StrUtil.isNotBlank(vo.getTickerNos())? Arrays.asList(vo.getTickerNos().split(",")):null);
+        bo.setTickerNo(StrUtil.isNotBlank(vo.getTickerNos()) ? Arrays.asList(vo.getTickerNos().split(",")) : null);
         return ObjectRestResponse.succ(orderTourService.calculatePrice(bo));
     }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/CompanyOrderReceivedStatiscsAdminController.java

+package com.xxfc.platform.order.rest.background;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.order.biz.CompanyPerformanceBiz;
+import com.xxfc.platform.order.pojo.dto.CompanyPerformanceFindDTO;
+import com.xxfc.platform.order.bo.CompanyPerformanceBo;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 公司业绩查询
+ * @data 2019/11/23 14:32
+ */
+@Slf4j
+@RestController
+@RequestMapping("/statistics")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class CompanyOrderReceivedStatiscsAdminController {
+
+      private final CompanyPerformanceBiz companyPerformanceBiz;
+
+      @PostMapping("/company_performance")
+      public ObjectRestResponse<PageDataVO<CompanyPerformanceBo>> companyPerformance(@RequestBody CompanyPerformanceFindDTO companyPerformanceFindDTO){
+          PageDataVO<CompanyPerformanceBo> dataVO  = companyPerformanceBiz.selectCompanyPerformancePage(companyPerformanceFindDTO);
+          return ObjectRestResponse.succ(dataVO);
+      }
+
+      @ApiOperation("导出")
+      @PostMapping("/export")
+      public void exportCompanyPerformance(@RequestBody CompanyPerformanceFindDTO companyPerformanceFindDTO, HttpServletResponse response){
+
+          try {
+              String name = DateTimeFormatter.ofPattern("YYYYMMddHHmmss").format(LocalDateTime.now());
+              response.setContentType("application/vnd.ms-excel;charset=utf-8");
+              String filename = String.format("%s-company-statistics.xlsx",name);
+              response.setHeader("Content-Disposition","attachment;filename="+ new String(filename.getBytes(), "iso8859-1"));
+              ServletOutputStream outputStream = response.getOutputStream();
+              companyPerformanceBiz.exportOrderReceivedStatisticsData(companyPerformanceFindDTO,outputStream);
+              response.setCharacterEncoding("UTF-8");
+          }catch (Exception ex){
+              log.error("导出数据失败【{}】",ex);
+              throw  new BaseException("导出数据失败");
+          }
+      }
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderReceivedStatisticsAdminController.java

+package com.xxfc.platform.order.rest.background;
+
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.common.annotation.BeanValid;
+import com.github.wxiaoqi.security.common.annotation.SimpleValid;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.order.biz.OrderReceivedStatisticsBiz;
+import com.xxfc.platform.order.pojo.dto.OrderReceivedStatisticsFindDTO;
+import com.xxfc.platform.order.pojo.vo.OrderReceivedStatisticsVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 订单统计
+ * @data 2019/11/11 9:14
+ */
+@Slf4j
+@Api(tags = "订单统计")
+@RestController
+@RequestMapping("admin/order/received_statistics")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class OrderReceivedStatisticsAdminController {
+    private final OrderReceivedStatisticsBiz orderReceivedStatisticsBiz;
+
+     @ApiOperation("订单统计")
+     @PostMapping("")
+     public ObjectRestResponse<Map<String, List<OrderReceivedStatisticsVo>>> orderReceivedStatistics(@RequestBody @SimpleValid OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO, UserDTO userDTO){
+         orderReceivedStatisticsFindDTO.setCompanyId(Arrays.asList(userDTO.getCompanyId()));
+         Map<String, List<OrderReceivedStatisticsVo>> orderReceivedStatisticsPageVo = orderReceivedStatisticsBiz.getOrderReceivedStatisticsResult(orderReceivedStatisticsFindDTO);
+         return ObjectRestResponse.succ(orderReceivedStatisticsPageVo);
+     }
+
+    @ApiOperation("订单统计excel导出下载")
+    @PostMapping(value = "/export",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ObjectRestResponse<Void> exportOrderReceivedStatistics(@RequestBody @BeanValid OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO,UserDTO userDTO, HttpServletResponse response){
+        try {
+            orderReceivedStatisticsFindDTO.setCompanyId(Arrays.asList(userDTO.getCompanyId()));
+            String name = DateTimeFormatter.ofPattern("YYYYMMddHHmmss").format(LocalDateTime.now());
+            response.setContentType("application/vnd.ms-excel;charset=utf-8");
+            String filename = String.format("%s-OrderReceivedStatistics.xlsx",name);
+            response.setHeader("Content-Disposition","attachment;filename="+ new String(filename.getBytes(), "iso8859-1"));
+            ServletOutputStream outputStream = response.getOutputStream();
+            orderReceivedStatisticsBiz.exportOrderReceivedStatisticsData(orderReceivedStatisticsFindDTO,outputStream);
+            response.setCharacterEncoding("UTF-8");
+            return ObjectRestResponse.succ();
+        }catch (Exception ex){
+             log.error("导出数据失败【{}】",ex);
+            throw  new BaseException("导出数据失败");
+        }
+    }
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/VehicleServiceNumController.java

+package com.xxfc.platform.order.rest.background;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.order.biz.OrderVehicleServiceStatisticsBiz;
+import com.xxfc.platform.order.entity.OrderVehicleServiceStatistics;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(value = "/vehicle/serviceNum")
+public class VehicleServiceNumController extends BaseController<OrderVehicleServiceStatisticsBiz, OrderVehicleServiceStatistics> {
+
+	@GetMapping(value = "/app/unauth/addAll")
+	public void addAll() {
+		baseBiz.addAll();
+	}
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderMemberService.java

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.enumconstant.LevelEnum;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -412,57 +413,27 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
         BigDecimal totalAmount = baseOrders.stream().filter(x->x.getHasPay()==1).map(MemberOrderBo::getOrderAmount).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
         memberOrderStatisticsBo.setTotalAmount(totalAmount);
 
-        List<MemberOrderBo> diamondOrders = baseOrderMap.get(levelEnum.DIAMOND.getLevel());
+        List<MemberOrderBo> diamondOrders = baseOrderMap.get(LevelEnum.DIAMOND.getLevel());
         memberOrderStatisticsBo.setDiamondOrderNum(diamondOrders==null?0:diamondOrders.size());
-        List<MemberOrderBo> diamondHashPayOrders =  baseOrderHasPayMap.get(levelEnum.DIAMOND.getLevel());
+        List<MemberOrderBo> diamondHashPayOrders =  baseOrderHasPayMap.get(LevelEnum.DIAMOND.getLevel());
         diamondHashPayOrders = diamondHashPayOrders==null?Collections.EMPTY_LIST:diamondHashPayOrders;
         BigDecimal diamondAmount = diamondHashPayOrders.stream().map(MemberOrderBo::getOrderAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
         memberOrderStatisticsBo.setTotalDiamondAmount(diamondAmount);
 
-        List<MemberOrderBo> goldOrders = baseOrderMap.get(levelEnum.GOLD.getLevel());
+        List<MemberOrderBo> goldOrders = baseOrderMap.get(LevelEnum.GOLD.getLevel());
         memberOrderStatisticsBo.setGoldOrderNum(goldOrders==null?0:goldOrders.size());
-        List<MemberOrderBo> goldHasPayOrders = baseOrderHasPayMap.get(levelEnum.GOLD.getLevel());
+        List<MemberOrderBo> goldHasPayOrders = baseOrderHasPayMap.get(LevelEnum.GOLD.getLevel());
         goldHasPayOrders = goldHasPayOrders==null?Collections.EMPTY_LIST:goldHasPayOrders;
         BigDecimal goldAmount = goldHasPayOrders.stream().map(MemberOrderBo::getOrderAmount).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
         memberOrderStatisticsBo.setTotalGoldAmount(goldAmount);
 
-        List<MemberOrderBo> generalOrders = baseOrderMap.get(levelEnum.GENERAL.getLevel());
+        List<MemberOrderBo> generalOrders = baseOrderMap.get(LevelEnum.GENERAL.getLevel());
         memberOrderStatisticsBo.setGeneralOrderNum(generalOrders==null?0:generalOrders.size());
-        List<MemberOrderBo> generalHasPayOrders = baseOrderHasPayMap.get(levelEnum.GENERAL.getLevel());
+        List<MemberOrderBo> generalHasPayOrders = baseOrderHasPayMap.get(LevelEnum.GENERAL.getLevel());
         generalHasPayOrders = generalHasPayOrders==null?Collections.EMPTY_LIST:generalHasPayOrders;
         BigDecimal generalAmount = generalHasPayOrders.stream().map(MemberOrderBo::getOrderAmount).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
         memberOrderStatisticsBo.setTotalGeneralAmount(generalAmount);
 
         return memberOrderStatisticsBo;
     }
-    private enum  levelEnum{
-        DIAMOND(3,"钻石"),
-        GOLD(2,"黄金"),
-        GENERAL(1,"普通");
-
-        levelEnum(Integer level,String desc) {
-            this.level = level;
-            this.desc = desc;
-        }
-
-        private Integer level;
-        private String desc;
-
-        public Integer getLevel() {
-            return level;
-        }
-
-        public void setLevel(Integer level) {
-            this.level = level;
-        }
-
-        public String getDesc() {
-            return desc;
-        }
-
-        public void setDesc(String desc) {
-            this.desc = desc;
-        }
-    }
-
 }

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

@@ -151,9 +151,6 @@
             <if test="no != null and no != '' ">
                 and no like CONCAT ("%", #{no}, "%")
             </if>
-            <if test="oneNo != null and oneNo != '' ">
-                and no =#{oneNo}
-            </if>
             <if test="name != null">
                 and b.name like CONCAT ("%", #{name}, "%")
             </if>
@@ -295,7 +292,6 @@
         order by crtTime desc
     </select>
 
-
     <select id="getTourList" parameterType="Map" resultMap="orderPageMap">
         select b.*
         from base_order b
@@ -319,6 +315,33 @@
         order by b.crt_time desc
     </select>
 
+    <select id="selectAllCountOrder" parameterType="Map" resultMap="orderPageMap">
+        SELECT bo.* from base_order bo
+        LEFT JOIN order_rent_vehicle_detail orv on bo.id = orv.order_id
+        where bo.type = 1 and (bo.status >= 4 or bo.status = -1)
+        and
+        (
+        (
+        orv.start_time &gt; #{startTime}
+        AND orv.start_time &lt; #{startTime}
+        AND orv.end_time &gt; #{endTime}
+        )
+        OR (
+        orv.start_time &lt; #{startTime}
+        AND orv.end_time &gt; #{endTime}
+        )
+        OR (
+        orv.start_time &lt; #{startTime}
+        AND orv.end_time &gt; #{endTime}
+        AND orv.end_time &lt; #{endTime}
+        )
+        OR (
+        orv.start_time &gt; #{startTime}
+        AND orv.end_time &lt; #{endTime}
+        )
+        )
+    </select>
+
     <select id="getOrderDetail" parameterType="java.lang.String" resultMap="orderPageMap">
         select *
         from base_order
@@ -329,7 +352,7 @@
         select b.*
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
-        where b.type = 2 and b.status &gt;= 4
+        where b.type = 1 and (b.status &gt;= 4 or b.status = -1)
         <if test="startTime != null and status == 1">
             and r.start_time between #{startTime} and #{endTime}
         </if>
@@ -412,11 +435,10 @@
     </select>
 
     <select id="selectOrdersByTypeAndTime" resultType="com.xxfc.platform.order.pojo.dto.OrderDTO">
-        select bo.id,bo.type,bo.status,bo.order_amount,bo.real_amount,bo.order_origin,bo.parent_user_id as `userId`,bo.parent_postion_id as `postionId`,
-        bo.has_pay,bo.pay_way,omd.memberLevel,IFNULL(IFNULL(orvd.start_company_id,otd.start_company_id),`parent_user_company_id`) AS `companyId`,orvd.deposit,orvd.cost_detail_extend AS `costDetailExtend` 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`
-        from `base_order` where 1=1
+        select bo.id,bo.type,bo.status,bo.order_amount,bo.real_amount,bo.order_origin,bo.parent_user_id as `userId`,bo.parent_position_id as `postionId`,
+        bo.has_pay,bo.pay_way,omd.memberLevel,IFNULL(IFNULL(orvd.start_company_id,otd.start_company_id),`parent_user_company_id`) AS `companyId`,
+        orvd.deposit,orvd.cost_detail AS `costDetail`
+        from (select * from `base_order` where 1=1
          <if test="hasPay!=null">
            and   `has_pay`=#{hasPay}
          </if>
@@ -426,7 +448,7 @@
                                                                                                       separator=",">
         #{type}
     </foreach> ) AS `bo`
-        LEFT JOIN (select `order_id`,`start_company_id`,`deposit`,`cost_detail_extend` from `order_rent_vehicle_detail`) AS `orvd` ON
+        LEFT JOIN (select `order_id`,`start_company_id`,`deposit`,`cost_detail` from `order_rent_vehicle_detail`) AS `orvd` ON
         orvd.order_id=bo.id
         LEFT JOIN (select `order_id`,`start_company_id` from `order_tour_detail`) AS `otd` ON otd.order_id=bo.id
         LEFT JOIN (select `order_id`,`member_level` AS `memberLevel` from `order_member_detail`) AS `omd` ON

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

@@ -84,7 +84,7 @@
             bo.pay_way,
             bo.has_pay,
             IFNULL(brvd.start_company_id,IFNULL(otd.start_company_id,bo.parent_user_company_id)) AS `companyId`,
-            brvd.cost_detail_extend AS `costDetailExtend`,
+            brvd.cost_detail AS `costDetail`,
             brvd.damage_safe AS `damageSafe`,
             omd.member_level AS `memberLevel`
 
@@ -92,38 +92,38 @@
             `order_account` AS `oa`
             LEFT JOIN `base_order` AS `bo` ON bo.id = oa.order_id
             LEFT  JOIN `order_rent_vehicle_detail` AS `brvd` ON brvd.order_id=oa.order_id
-             LEFT JOIN `order_tour_detail` as `otd` ON otd.order_id=oa.order_id
+            LEFT JOIN `order_tour_detail` AS `otd` ON otd.order_id=oa.order_id
             LEFT JOIN `order_member_detail` AS `omd` ON omd.order_id=oa.order_id
-            WHERE bo.type=#{orderType} AND `oa`.account_status=1 AND oa.`crt_time` BETWEEN #{startTime} AND #{endTime}
+            WHERE bo.type=#{orderType} AND (`oa`.account_status=1 or(bo.pay_way=0 AND bo.has_pay=1 AND oa.account_status=0)) AND oa.`crt_time` BETWEEN #{startTime} AND #{endTime}
     </select>
 
     <select id="selectByDateAndStatffIds" resultType="com.xxfc.platform.order.pojo.account.OrderAccountBo">
-            oa.*,
-            bo.id,
-            bo.`status`,
-            bo.order_origin,
-            bo.pay_way,
-            bo.has_pay,
-            bo.parent_user_id as `userId`,
-            bo.parent_position_id as `postionId`,
-            IFNULL(brvd.start_company_id,IFNULL(otd.start_company_id,bo.parent_user_company_id)) AS `companyId`,
-            brvd.cost_detail_extend AS `costDetailExtend`,
-            brvd.damage_safe AS `damageSafe`,
-            omd.member_level AS `memberLevel`
+        oa.*,
+        bo.id,
+        bo.`status`,
+        bo.order_origin,
+        bo.pay_way,
+        bo.has_pay,
+        bo.parent_user_id as `userId`,
+        bo.parent_position_id as `postionId`,
+        IFNULL(brvd.start_company_id,IFNULL(otd.start_company_id,bo.parent_user_company_id)) AS `companyId`,
+        brvd.cost_detail_extend AS `costDetailExtend`,
+        brvd.damage_safe AS `damageSafe`,
+        omd.member_level AS `memberLevel`
 
         FROM
-            `order_account` AS `oa`
-            LEFT JOIN `base_order` AS `bo` ON bo.id = oa.order_id
-            LEFT  JOIN `order_rent_vehicle_detail` AS `brvd` ON brvd.order_id=oa.order_id
-            LEFT JOIN `order_tour_detail` as `otd` ON otd.order_id=oa.order_id
-            LEFT JOIN `order_member_detail` AS `omd` ON omd.order_id=oa.order_id
-            WHERE  `oa`.account_status=1
-            AND oa.`crt_time` BETWEEN #{startDate} AND #{endDate}
-             <if test="staffUserIds!=null and staffUserIds.size>0">
-                and bo.id IN <foreach collection="staffUserIds" item="staffId" open="(" close=")" separator=",">
-                  #{staffId}
-             </foreach>
-             </if>
+        `order_account` AS `oa`
+        LEFT JOIN `base_order` AS `bo` ON bo.id = oa.order_id
+        LEFT  JOIN `order_rent_vehicle_detail` AS `brvd` ON brvd.order_id=oa.order_id
+        LEFT JOIN `order_tour_detail` as `otd` ON otd.order_id=oa.order_id
+        LEFT JOIN `order_member_detail` AS `omd` ON omd.order_id=oa.order_id
+        WHERE  `oa`.account_status=1
+        AND oa.`crt_time` BETWEEN #{startDate} AND #{endDate}
+        <if test="staffUserIds!=null and staffUserIds.size>0">
+            and bo.id IN <foreach collection="staffUserIds" item="staffId" open="(" close=")" separator=",">
+            #{staffId}
+        </foreach>
+        </if>
 
     </select>
 </mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.xxfc.platform.order.mapper.OrderMemberReceivedStatisticsMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.order.entity.OrderMemberReceivedStatistics" id="orderMemberReceivedStatisticsMap">
+        <result property="id" column="id"/>
+        <result property="year" column="year"/>
+        <result property="month" column="month"/>
+        <result property="date" column="date"/>
+        <result property="weekOfYear" column="week_of_year"/>
+        <result property="companyName" column="company_name"/>
+        <result property="extraAmount" column="extra_amount"/>
+        <result property="lateFeeAmount" column="late_fee_amount"/>
+        <result property="orderRefundAmount" column="order_refund_amount"/>
+        <result property="companyName" column="company_name"/>
+        <result property="totalAmount" column="total_amount"/>
+        <result property="toalCommonAmmount" column="toal_common_ammount"/>
+        <result property="totalCommonQuantity" column="total_common_quantity"/>
+        <result property="totalGoldAmount" column="total_gold_amount"/>
+        <result property="totalGoldQuantity" column="total_gold_quantity"/>
+        <result property="totalDiamondAmmount" column="total_diamond_ammount"/>
+        <result property="totalDiamondQuantity" column="total_diamond_quantity"/>
+        <result property="orderOrigin" column="order_origin"/>
+        <result property="hasPay" column="has_pay"/>
+        <result property="payWay" column="pay_way"/>
+        <result property="companyId" column="company_id"/>
+        <result property="crtTime" column="crt_time"/>
+    </resultMap>
+
+    <select id="selectOrderMemberReceivedStatistics" resultMap="orderMemberReceivedStatisticsMap">
+        select  * from  `order_member_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `is_finish`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+    </select>
+
+    <delete id="inserMemberReceivedtList">
+
+    </delete>
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.xxfc.platform.order.mapper.OrderRentVehicleReceivedStatisticsMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.order.entity.OrderRentVehicleReceivedStatistics" id="orderRentVehicleReceivedStatisticsMap">
+        <result property="id" column="id"/>
+        <result property="year" column="year"/>
+        <result property="month" column="month"/>
+        <result property="date" column="date"/>
+        <result property="weekOfYear" column="week_of_year"/>
+        <result property="totalAmount" column="total_amount"/>
+        <result property="totalQuantity" column="total_quantity"/>
+        <result property="hasPay" column="has_pay"/>
+        <result property="orderOrigin" column="order_origin"/>
+        <result property="payWay" column="pay_way"/>
+        <result property="companyId" column="company_id"/>
+        <result property="crtTime" column="crt_time"/>
+    </resultMap>
+    <select id="selectOrderRentVehicleReceivedStatistics" resultMap="orderRentVehicleReceivedStatisticsMap">
+        select * from `order_rent_vehicle_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `is_finish`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+    </select>
+
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.xxfc.platform.order.mapper.OrderTourReceivedStatisticsMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.order.entity.OrderTourReceivedStatistics" id="orderTourReceivedStatisticsMap">
+        <result property="id" column="id"/>
+        <result property="year" column="year"/>
+        <result property="month" column="month"/>
+        <result property="date" column="date"/>
+        <result property="weekOfYear" column="week_of_year"/>
+        <result property="companyName" column="company_name"/>
+        <result property="extraAmount" column="extra_amount"/>
+        <result property="lateFeeAmount" column="late_fee_amount"/>
+        <result property="orderRefundAmount" column="order_refund_amount"/>
+        <result property="totalAmount" column="total_amount"/>
+        <result property="totalQuantity" column="total_quantity"/>
+        <result property="hasPay" column="has_pay"/>
+        <result property="orderOrigin" column="order_origin"/>
+        <result property="payWay" column="pay_way"/>
+        <result property="companyId" column="company_id"/>
+        <result property="crtTime" column="crt_time"/>
+    </resultMap>
+
+    <select id="selectOrderTourReceivedStatistics" resultMap="orderTourReceivedStatisticsMap">
+       select * from  `order_tour_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `is_finish`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+    </select>
+
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xxfc.platform.order.mapper.OrderVehicleServiceStatisticsMapper" >
+  <!--统计车辆服务次数-->
+  <select id="countVehicleServiceNum" parameterType="Map" resultType="com.xxfc.platform.order.pojo.CountVehicleServiceNumVo">
+      SELECT tmp1.countYear,tmp1.countMonth,tmp1.countDay, tmp1.companyId, tmp1.countWeek, tmp1.countNum as departureNum, tmp2.countNum as arrivalNum from (
+      SELECT YEAR(FROM_UNIXTIME(o.crt_time/1000)) as countYear, MONTH(FROM_UNIXTIME(o.crt_time/1000)) AS countMonth, DAY(FROM_UNIXTIME(o.crt_time/1000)) AS countDay, WEEK(FROM_UNIXTIME(o.crt_time/1000))as countWeek, o1.start_company_id as companyId, count(*) as countNum from order_vehicle_crosstown o
+      LEFT JOIN order_rent_vehicle_detail o1 on o.order_id = o1.order_id
+      where o.type = 1
+      <if test="startTime != null">
+       and o.crt_time &gt;= #{startTime} and o.crt_time &lt;= #{endTime}
+      </if>
+      GROUP BY companyId, countYear,countMonth,countDay,countWeek
+      ) tmp1
+      LEFT JOIN
+      (SELECT YEAR(FROM_UNIXTIME(o.crt_time/1000)) as countYear, MONTH(FROM_UNIXTIME(o.crt_time/1000)) AS countMonth, DAY(FROM_UNIXTIME(o.crt_time/1000)) AS countDay, WEEK(FROM_UNIXTIME(o.crt_time/1000))as countWeek, o1.end_company_id as companyId, count(*) as countNum from order_vehicle_crosstown o
+      LEFT JOIN order_rent_vehicle_detail o1 on o.order_id = o1.order_id
+      where (o.type = 2 or o.type = 3)
+      <if test="startTime != null">
+        and o.crt_time &gt;= #{startTime} and o.crt_time &lt;= #{endTime}
+      </if>
+      GROUP BY companyId, countYear,countMonth,countDay,countWeek
+      ) tmp2 on tmp1.companyId = tmp2.companyId
+  </select>
+
+    <select id="selectByCompanyIdAndDate" resultType="com.xxfc.platform.order.entity.OrderVehicleServiceStatistics" parameterType="com.xxfc.platform.order.entity.OrderVehicleServiceStatistics">
+        select * from order_vehicle_service_statistics where company_id = #{companyId} and count_date = #{countDate}
+    </select>
+
+</mapper>
\ No newline at end of file

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

+import cn.hutool.core.date.DateField;
+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.OrderStatisticsBiz;
+import com.xxfc.platform.order.biz.*;
 import com.xxfc.platform.order.jobhandler.BaseOrderStatisticsJobHandler;
-import com.xxfc.platform.order.jobhandler.SaffStatisticsJobHandler;
+import com.xxfc.platform.order.jobhandler.OrderReceivedStatisticsJobHandler;
 import com.xxfc.platform.order.pojo.HomePageOrderData;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.SneakyThrows;
 import org.joda.time.DateTime;
 import org.junit.Test;
@@ -14,7 +16,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * @author libin
@@ -36,12 +41,21 @@ public class ServiceTest {
     private BaseOrderStatisticsJobHandler handler;
 
     @Autowired
-    private SaffStatisticsJobHandler statisticsJobHandler;
+    private OrderMemberReceivedStatisticsBiz orderMemberReceivedStatisticsBiz;
 
+    @Autowired
+    private OrderRentVehicleReceivedStatisticsBiz orderRentVehicleReceivedStatisticsBiz;
+
+    @Autowired
+    private OrderReceivedStatisticsJobHandler orderReceivedStatisticsJobHandler;
+    @Autowired
+    private OrderTourReceivedStatisticsBiz orderTourReceivedStatisticsBiz;
+    @Autowired
+    private VehicleFeign vehicleFeign;
     @Test
     public void testSchedu(){
 
-         dailyOrderStatisticsBiz.statisticalOrder(1);
+        dailyOrderStatisticsBiz.statisticalOrder(1);
     }
 
     @Test
@@ -83,9 +97,46 @@ public class ServiceTest {
     }
 
     @Test
-    @SneakyThrows
-    public void testStaffStatisticsJob(){
-        statisticsJobHandler.execute("");
+    public void testMemberStatistics(){
+        Date date = DateTime.parse("2019-11-15").toDate();
+        Date startDate = DateUtil.beginOfDay(date).toJdkDate();
+        Date endDate = DateUtil.endOfDay(date).toJdkDate();
+        Map<Integer, String> companyMap = vehicleFeign.findCompanyMap();
+        orderMemberReceivedStatisticsBiz.orderMemberReceivedStatistics(startDate,endDate,companyMap);
+    }
+
+    @Test
+    public void testRentVehicleStatistics(){
+        Date date = DateTime.parse("2019-11-29").toDate();
+        Date startDate = DateUtil.beginOfDay(date).toJdkDate();
+        Date endDate = DateUtil.endOfDay(date).toJdkDate();
+        Map<Integer, String> companyMap = vehicleFeign.findCompanyMap();
+        orderRentVehicleReceivedStatisticsBiz.orderRentVehicleReceivedStatistics(startDate,endDate,companyMap);
+    }
+
+    @Test
+    public void testTourStatistics(){
+        Date date = DateTime.parse("2019-11-15").toDate();
+        Date startDate = DateUtil.beginOfDay(date).toJdkDate();
+        Date endDate = DateUtil.endOfDay(date).toJdkDate();
+        Map<Integer, String> companyMap = vehicleFeign.findCompanyMap();
+        orderTourReceivedStatisticsBiz.orderTourInsertStatisticsNew(startDate,endDate,companyMap);
     }
 
+    @Test
+    @SneakyThrows
+    public void testOrderReceivedStatisticsJobHandler(){
+        cn.hutool.core.date.DateTime dateTime = DateUtil.parse("2019-11-29", "yyyy-MM-dd");
+     //   cn.hutool.core.date.DateTime offset = DateUtil.offset(dateTime, DateField.DAY_OF_MONTH, 1);
+        orderReceivedStatisticsJobHandler.execute("2019-11-29");
+      /*  LocalDate startLocalDate = LocalDate.of(2019, 10, 1);
+        LocalDate endLocalDate = LocalDate.of(2019,11,29);
+        while (startLocalDate.isBefore(endLocalDate)){
+            String dateStr = startLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            startLocalDate = startLocalDate.plusDays(1);
+            orderReceivedStatisticsJobHandler.execute(dateStr);
+        }
+*/
+
+    }
 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -62,7 +62,10 @@
         </if>
     </select>
     <select id="findCompanyIdsByAreaId" resultType="integer">
-       select `id` from `branch_company` where `zone_id`=#{areaId}
+        select `id` from `branch_company` where `is_del`=0
+        <if test="areaId!=null">
+         and `zone_id`=#{areaId}
+        </if>
    </select>
 
     <select id="findBranchCompanys" resultType="com.xxfc.platform.vehicle.pojo.dto.BranchCompanyListDTO">