Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
#	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/OrderAccountBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java
#	xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

ace-common/src/main/java/com/github/wxiaoqi/security/common/enumconstant/LevelEnum.java

+package com.github.wxiaoqi.security.common.enumconstant;
+
+
+import java.util.ArrayList;
+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/13 17:23
+ */
+public enum LevelEnum {
+    DIAMOND(3, "钻石"),
+    GOLD(2, "黄金"),
+    GENERAL(1, "普通");
+
+    LevelEnum(Integer level, String desc) {
+        this.level = level;
+        this.desc = desc;
+    }
+
+
+    public static LevelEnum getLevelEnumByLevel(Integer level) {
+        return levelMap.get(level);
+    }
+
+    private Integer level;
+    private String desc;
+    private static Map<Integer, LevelEnum> levelMap;
+    public static List<Integer> levels;
+
+    static {
+        levelMap = EnumSet.allOf(LevelEnum.class).stream().collect(Collectors.toMap(LevelEnum::getLevel, Function.identity()));
+        levels = new ArrayList<>(levelMap.keySet());
+    }
+
+    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;
+    }
+}

ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/GlobalExceptionHandler.java

@@ -94,7 +94,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
         response.setStatus(500);
         logger.error(ex.getMessage(),ex);
         Throwable cause = ex.getCause();
-        if(cause != null && cause.toString().contains("Exception")) {
+        if(cause != null && cause.toString().contains("Exception") && !cause.toString().contains("UserTokenException")) {
             StringWriter stringWriter = new StringWriter();
             cause.printStackTrace(new PrintWriter(stringWriter));
             logger.error(cause.getMessage(), ex);

ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/PlatformExceptionHandler.java

@@ -38,7 +38,7 @@ public class PlatformExceptionHandler {
     @ExceptionHandler(value = {BaseException.class})
     public BaseResponse baseExceptionHandler(Exception e) {
         if (e instanceof BaseException){
-             BaseException be = (BaseException) e;
+            BaseException be = (BaseException) e;
             return new BaseResponse(be.getStatus(), StringUtils.isEmpty(be.getSubCode())?"NAN":be.getSubCode(), be.getMessage());
         }
         return new BaseResponse(400,e.getMessage());
@@ -49,7 +49,7 @@ public class PlatformExceptionHandler {
     public ObjectRestResponse<?> exceptionHandler(Exception e){
 
         Throwable cause = e.getCause();
-        if(cause != null && cause.toString().contains("Exception")) {
+        if(cause != null && cause.toString().contains("Exception") && !cause.toString().contains("UserTokenException")) {
             StringWriter stringWriter = new StringWriter();
             cause.printStackTrace(new PrintWriter(stringWriter));
             log.error(cause.getMessage(), e);

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-admin-api/src/main/java/com/github/wxiaoqi/security/admin/bo/StaffStatisticsBo.java

+package com.github.wxiaoqi.security.admin.bo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/26 17:09
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class StaffStatisticsBo {
+
+    private static final long serialVersionUID = 1L;
+    private String name ;
+    private Integer userId;
+    private List<String> companyNames;
+    private List<Integer> compnayIds;
+    private List<String> postionNames;
+    private List<Integer> postionIds;
+    private String phone;
+    private BigDecimal sellAmount = BigDecimal.ZERO;
+    private BigDecimal royaltyAmount = BigDecimal.ZERO;
+    private Integer memberOrderNum = 0;
+    private BigDecimal memberAmount = BigDecimal.ZERO;
+    private Integer rentVehicleOrderNum = 0;
+    private BigDecimal rentVehicleAmount = BigDecimal.ZERO;
+    private Integer travelOrderNum = 0;
+    private BigDecimal travelAmount = BigDecimal.ZERO;
+
+    public List<String> getCompanyNames() {
+        return CollectionUtils.isEmpty(companyNames)? new ArrayList<>():companyNames;
+    }
+
+    public List<Integer> getCompnayIds() {
+        return CollectionUtils.isEmpty(compnayIds)?new ArrayList<>():compnayIds;
+    }
+
+    public List<String> getPostionNames() {
+        return CollectionUtils.isEmpty(postionNames)?new ArrayList<>() :postionNames;
+    }
+
+    public List<Integer> getPostionIds() {
+        return CollectionUtils.isEmpty(postionIds)?new ArrayList<>():postionIds;
+    }
+
+    public BigDecimal getSellAmount() {
+        return rentVehicleAmount.add(travelAmount).add(memberAmount);
+    }
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/bo/StaffStatisticsTotalBo.java

+package com.github.wxiaoqi.security.admin.bo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/26 17:09
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class StaffStatisticsTotalBo {
+    private Integer staffNum;
+    private BigDecimal totalSellAmount;
+    private BigDecimal totalRoyaltyAmount;
+
+    public Integer getStaffNum() {
+        return this.staffNum==null?0:staffNum;
+    }
+
+    public BigDecimal getTotalSellAmount() {
+        return this.totalSellAmount==null?BigDecimal.ZERO:totalSellAmount;
+    }
+
+    public BigDecimal getTotalRoyaltyAmount() {
+        return this.totalRoyaltyAmount==null?BigDecimal.ZERO:totalRoyaltyAmount;
+    }
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/bo/UserStaffBo.java

+package com.github.wxiaoqi.security.admin.bo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/25 14:33
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserStaffBo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private Integer userId;
+    private String realName;
+    private String nickName;
+    private String phone;
+    private Integer postionId;
+    private String postionName;
+    private Integer companyId;
+    private String companyName;
+    /**
+     * 佣金
+     */
+    private BigDecimal commission;
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserSellingWaterDTO.java

@@ -3,6 +3,9 @@ package com.github.wxiaoqi.security.admin.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 /**
  * @author libin
  * @version 1.0
@@ -10,7 +13,8 @@ import lombok.Data;
  * @data 2019/7/11 15:14
  */
 @Data
-public class AppUserSellingWaterDTO {
+public class AppUserSellingWaterDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
     /**
      *  用户id
      */
@@ -35,6 +39,8 @@ public class AppUserSellingWaterDTO {
     @ApiModelProperty(value = "订单id")
     private Integer orderId;
 
+    private Integer orderType;
+
     /**
      *  商品id
      */
@@ -75,7 +81,7 @@ public class AppUserSellingWaterDTO {
      *  售价
      */
     @ApiModelProperty(value = "售价")
-    private Long price;
+    private BigDecimal price;
 
     /**
      *  提成百分比
@@ -89,4 +95,12 @@ public class AppUserSellingWaterDTO {
     @ApiModelProperty(value = "是否入账：0-未入账；1-已入账")
     private Integer waiting;
 
+    private BigDecimal commission;
+
+    private Integer companyId;
+
+    private String companyName;
+
+    private String stateGroup;
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/StaffStatisticsFindDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/26 17:04
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class StaffStatisticsFindDTO  extends PageParam {
+    private Date startDate;
+    private Date endDate;
+    private String companyName;
+    private String postionName;
+    private Integer userPostionId;
+    private Integer companyId;
+    private List<Integer> userIds;
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

 package com.github.wxiaoqi.security.admin.feign;
 
 import com.github.wxiaoqi.security.admin.bo.UserBo;
+import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
+import com.github.wxiaoqi.security.admin.dto.AppUserSellingWaterDTO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
+import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.vo.ImiVo;
+import com.github.wxiaoqi.security.admin.vo.WalletPostionVo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -157,8 +162,6 @@ public interface UserFeign {
     public ObjectRestResponse<Void> withDrawprocess(@RequestParam(value = "orderNo") String orderNo,
                                                     @RequestParam(value = "cono",required = false) String cono,
                                                     @RequestParam(value = "reason",required = false) String reason,
-
-
                                                     @RequestParam(value = "isSuccess") Boolean isSuccess);
 
     @GetMapping("/app/user/collect/exist")
@@ -173,4 +176,19 @@ public interface UserFeign {
      */
     @GetMapping("/postion/admin/userid")
     List<Integer> getUserIdByParentCompany(@RequestParam("parentCompanyId") List<Integer> parentCompanyId);
+
+
+    @GetMapping("/app/user/list_staff")
+    List<UserStaffBo> findAllStaffs();
+
+    @GetMapping("/sellingwater/list_staff_sellerwater")
+    List<AppUserSellingWaterDTO> findStaffSellerWater(@RequestParam(value = "userIds",required = false) List<Integer> userIds,
+                                                      @RequestParam(value = "startDate") Date startDate,
+                                                      @RequestParam(value = "endDate") Date endDate);
+
+    @GetMapping("/postion/admin/postions")
+    ObjectRestResponse<List<WalletPostionVo>> findAllPostions();
+
+    @GetMapping("/public/getUsersByUserIdList")
+    ObjectRestResponse<List<AppUserVo>> getByUserIdList(@RequestParam("userIds") List<Integer> userIds);
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/WalletPostionVo.java

@@ -3,6 +3,8 @@ package com.github.wxiaoqi.security.admin.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author libin
  * @version 1.0
@@ -10,8 +12,8 @@ import lombok.Data;
  * @data 2019/7/17 16:17
  */
 @Data
-public class WalletPostionVo {
-
+public class WalletPostionVo implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键id")
     private Integer id;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java

@@ -2,13 +2,16 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
+import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
 import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
+import com.github.wxiaoqi.security.admin.dto.StaffStatisticsFindDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.mapper.AppUserDetailMapper;
 import com.github.wxiaoqi.security.admin.rpc.service.AppPermissionService;
 import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
@@ -17,10 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
 import java.time.Instant;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -173,4 +173,23 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
     public List<AppUserVo> getUserByUserIds(List<Integer> ids) {
         return mapper.getUserVo(ids);
     }
+
+    public List<UserStaffBo> findAllStaffs() {
+        List<UserStaffBo> userStaffBos = mapper.selectAllStaffs();
+        return CollectionUtils.isEmpty(userStaffBos)? Collections.EMPTY_LIST:userStaffBos;
+    }
+
+    public List<AppUserVo> getUserByUserIdList(List<Integer> userIds) {
+          List<AppUserVo> appUserVos =  mapper.getUserByUserIdList(userIds);
+        return CollectionUtils.isEmpty(appUserVos)?Collections.EMPTY_LIST:appUserVos;
+    }
+
+    public PageDataVO<UserStaffBo> findAllStaffsByCompanyIdAndPostionIdWithPage(StaffStatisticsFindDTO staffStatisticsFindDTO) {
+       return PageDataVO.pageInfo(staffStatisticsFindDTO.getPage(),staffStatisticsFindDTO.getLimit(),()->mapper.findAllStaffsByCompanyIdAndPostionId(staffStatisticsFindDTO));
+    }
+
+    public List<UserStaffBo> findStaffsByIdsAndCompanyAndPostion(StaffStatisticsFindDTO staffStatisticsFindDTO) {
+        List<UserStaffBo> staffBos = mapper.findAllStaffsByCompanyIdAndPostionId(staffStatisticsFindDTO);
+        return CollectionUtils.isEmpty(staffBos)?Collections.EMPTY_LIST:staffBos;
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

 package com.github.wxiaoqi.security.admin.biz;
 
 import com.github.wxiaoqi.security.admin.bo.UserIncomeBo;
-import com.github.wxiaoqi.security.admin.dto.OrderGoodsDTO;
-import com.github.wxiaoqi.security.admin.dto.OrderWaterDTO;
-import com.github.wxiaoqi.security.admin.dto.UserSellingWaterAdminDTO;
-import com.github.wxiaoqi.security.admin.dto.UserSellingWaterFindDTO;
+import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
+import com.github.wxiaoqi.security.admin.dto.*;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
 import com.github.wxiaoqi.security.admin.vo.SellingWalletVo;
@@ -20,6 +18,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
+
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.function.Supplier;
@@ -199,12 +198,12 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 amount = amount.add(commission);
 
             }
-            BigDecimal unbooked=amount;
-            log.info("订单完成计算用户拥金----finishOrderWater----orderId====" + orderId + "---amount==" + amount+"---unbooked=="+unbooked);
-            if(orderType==1){
-                List<OrderGoodsDTO> goodsDTOList =orderWaterDTO.getGoodsDTOList();
-                log.info("租车订单完成-----goodsDTOList==="+goodsDTOList);
-                if (CollectionUtils.isNotEmpty(goodsDTOList)){
+            BigDecimal unbooked = amount;
+            log.info("订单完成计算用户拥金----finishOrderWater----orderId====" + orderId + "---amount==" + amount + "---unbooked==" + unbooked);
+            if (orderType == 1) {
+                List<OrderGoodsDTO> goodsDTOList = orderWaterDTO.getGoodsDTOList();
+                log.info("租车订单完成-----goodsDTOList===" + goodsDTOList);
+                if (CollectionUtils.isNotEmpty(goodsDTOList)) {
                     for (OrderGoodsDTO goodsDto : goodsDTOList) {
                         //商品id
                         Integer goodId = goodsDto.getGoodId();
@@ -214,17 +213,17 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                         sellingWater.setOrderId(orderId);
                         sellingWater.setGoodId(goodId);
                         sellingWater = selectOne(sellingWater);
-                        if (sellingWater == null||sellingWater.getExtract()==null||sellingWater.getExtract()==0) {
+                        if (sellingWater == null || sellingWater.getExtract() == null || sellingWater.getExtract() == 0) {
                             log.info("租车订单完成-----sellingWater---不存在或extract---为空");
                             continue;
                         }
-                        if (price.compareTo(sellingWater.getPrice())>=0){
+                        if (price.compareTo(sellingWater.getPrice()) >= 0) {
                             log.info("租车订单完成-----完成价格大于支付价格");
                             continue;
                         }
-                        price=sellingWater.getPrice().subtract(price);
-                        Integer extract=sellingWater.getExtract();
-                        log.info("租车订单完成-----price====="+price+"---extract===="+extract);
+                        price = sellingWater.getPrice().subtract(price);
+                        Integer extract = sellingWater.getExtract();
+                        log.info("租车订单完成-----price=====" + price + "---extract====" + extract);
                         BigDecimal commission = price.multiply(new BigDecimal(extract + "")).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP);
                         log.info("租车订单完成--------userId===" + userId + "---commission===" + commission);
                         sellingWater.setWaiting(1);
@@ -234,8 +233,8 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                         insertSelective(sellingWater);
                         log.info("租车订单完成计算用户拥成功----payOrderWater--------userId===" + userId);
                         amount = amount.subtract(commission);
-                        }
                     }
+                }
             }
             log.info("订单完成计算用户拥金----finishOrderWater--------orderId===" + orderId + "----amount====" + amount + "--orderType===" + orderType);
             int r = amount.compareTo(BigDecimal.ZERO);
@@ -249,7 +248,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 detail.setSource(1);
                 myWaterBiz.updMyWater(detail);
             }
-            if ((orderType == 1 || orderType == 2)&&unbooked.compareTo(BigDecimal.ZERO)==1 ){
+            if ((orderType == 1 || orderType == 2) && unbooked.compareTo(BigDecimal.ZERO) == 1) {
                 myWaterBiz.updMyWalletUnbooked(userId, unbooked, 2);
             }
         }
@@ -449,7 +448,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         criteria.andEqualTo("userId", leaderId);
         criteria.andEqualTo("orderType", orderType);
         List<AppUserSellingWater> appUserSellingWaters = mapper.selectByExample(example);
-        if (CollectionUtils.isEmpty(appUserSellingWaters)){
+        if (CollectionUtils.isEmpty(appUserSellingWaters)) {
             return Collections.EMPTY_LIST;
         }
         return appUserSellingWaters.stream().map(AppUserSellingWater::getSourceId).collect(Collectors.toList());
@@ -462,6 +461,37 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         return pageDataVO;
     }
 
+    public List<AppUserSellingWaterDTO> findStatffSellerWaterByUserIdsAndTime(List<Integer> userIds, Date startDate, Date endDate) {
+ /*       List<UserStaffBo> userStaffBos = mapper.statisticsStatffSellerWaterByUserIdsAndTime(userIds,startDate.getTime(),endDate.getTime());
+        return CollectionUtils.isEmpty(userStaffBos)?Collections.EMPTY_LIST:userStaffBos;*/
+        List<AppUserSellingWaterDTO> appUserSellingWaterDTOS = new ArrayList<>();
+        Example example = new Example(AppUserSellingWater.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andIn("userId", userIds);
+        if(startDate!=null && endDate!=null){
+            criteria.andBetween("crtTime", startDate.getTime(), endDate.getTime());
+        }
+        if (startDate!=null && endDate==null){
+            criteria.andGreaterThanOrEqualTo("crtTime",startDate.getTime());
+        }
+
+        if(startDate==null && endDate!=null){
+            criteria.andLessThanOrEqualTo("crtTime",endDate.getTime());
+        }
+        criteria.andNotEqualTo("positionId", 6);
+        List<AppUserSellingWater> appUserSellingWaters = mapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(appUserSellingWaters)) {
+            return appUserSellingWaterDTOS;
+        }
+        AppUserSellingWaterDTO appUserSellingWaterDTO = null;
+        for (AppUserSellingWater appUserSellingWater : appUserSellingWaters) {
+            appUserSellingWaterDTO = new AppUserSellingWaterDTO();
+            BeanUtils.copyProperties(appUserSellingWater, appUserSellingWaterDTO);
+            appUserSellingWaterDTOS.add(appUserSellingWaterDTO);
+        }
+        return appUserSellingWaterDTOS;
+    }
+
     private enum SellerWallterStatus {
         CANCEL(2, "取消订单"),
         POST(1, "已入账"),

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
+import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
 import com.github.wxiaoqi.security.admin.dto.AppUserManageDTO;
+import com.github.wxiaoqi.security.admin.dto.StaffStatisticsFindDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
@@ -25,4 +27,10 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
     List<AppUserVo> getUserVo(@Param("list") List<Integer> ids);
 
     List<AppUserManageVo> selectAppUser(AppUserManageDTO appUserManageDTO);
+
+    List<UserStaffBo> selectAllStaffs();
+
+    List<AppUserVo> getUserByUserIdList(@Param("userIds") List<Integer> userIds);
+
+    List<UserStaffBo> findAllStaffsByCompanyIdAndPostionId(StaffStatisticsFindDTO staffStatisticsFindDTO);
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserSellingWaterMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.bo.UserIncomeBo;
+import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
+import com.github.wxiaoqi.security.admin.dto.AppUserSellingWaterDTO;
 import com.github.wxiaoqi.security.admin.dto.UserSellingWaterAdminDTO;
 import com.github.wxiaoqi.security.admin.dto.UserSellingWaterFindDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserSellingWater;
@@ -27,4 +29,8 @@ public interface AppUserSellingWaterMapper extends Mapper<AppUserSellingWater> {
     List<SellingWalletVo> selectSellerWalterByUserIdAndWating(@Param("userId") Integer userId, @Param("wating") Integer wating);
 
     List<UserSellingWaterAdminDTO> selectSellingWaterPage(UserSellingWaterFindDTO userSellingWaterFindDTO);
+
+    List<AppUserSellingWaterDTO> statisticsStatffSellerWaterByUserIdsAndTime(@Param("userIds") List<Integer> userIds,
+                                                                             @Param("startTime") Long startTime,
+                                                                             @Param("endTime") Long endTime);
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.*;
 import com.github.wxiaoqi.security.admin.bo.UserBo;
+import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
 import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
@@ -366,4 +367,9 @@ public class AppUserController extends CommonBaseController{
         return appUserLoginBiz.findUserDetailInfo(userBos);
     }
 
+    @ApiOperation("查询全部员工")
+    @GetMapping("/list_staff")
+    public List<UserStaffBo> findAllStaffs(){
+       return userDetailBiz.findAllStaffs();
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java

@@ -105,7 +105,7 @@ public class PublicController {
         //获取用户基础信息
         AppUserVo userVo = detailBiz.getUserInfoById(userid);
         if (userVo == null) {
-           return null;
+            return null;
         }
         Integer id= userVo.getId();
         Integer positionId=userVo.getPositionId();
@@ -169,5 +169,9 @@ public class PublicController {
         return ObjectRestResponse.succ(appUserVos);
     }
 
-
+    @GetMapping("/getUsersByUserIdList")
+    ObjectRestResponse<List<AppUserVo>> getByUserIdList(@RequestParam("userIds") List<Integer> userIds){
+        List<AppUserVo>  appUserVos =   detailBiz.getUserByUserIdList(userIds);
+       return ObjectRestResponse.succ(appUserVos);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserSellingWaterController.java

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
+import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
+import com.github.wxiaoqi.security.admin.dto.AppUserSellingWaterDTO;
 import com.github.wxiaoqi.security.admin.dto.OrderWaterDTO;
 import com.github.wxiaoqi.security.admin.vo.SellingWalletPagVo;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
@@ -8,10 +10,13 @@ import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @author libin
@@ -72,4 +77,13 @@ public class UserSellingWaterController {
             throw new BaseException(e);
         }
     }
+
+    @ApiOperation("员工佣金")
+    @GetMapping("/list_staff_sellerwater")
+   public List<AppUserSellingWaterDTO> findStaffSellerWater(@RequestParam(value = "userIds",required = false) List<Integer> userIds,
+                                                            @RequestParam(value = "startDate") Date startDate,
+                                                            @RequestParam(value = "endDate") Date endDate){
+       return appUserSellingWaterBiz.findStatffSellerWaterByUserIdsAndTime(userIds,startDate,endDate);
+    }
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/StaffStatisticsAdminController.java

+package com.github.wxiaoqi.security.admin.rest.admin;
+
+import com.github.wxiaoqi.security.admin.biz.StaffStatisticsBiz;
+import com.github.wxiaoqi.security.admin.dto.StaffStatisticsFindDTO;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import lombok.RequiredArgsConstructor;
+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 com.github.wxiaoqi.security.common.exception.BaseException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/26 16:59
+ */
+@RestController
+@RequestMapping("/staff_statistics")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class StaffStatisticsAdminController {
+
+       private final StaffStatisticsBiz staffStatisticsBiz;
+
+       @PostMapping("/page")
+       public ObjectRestResponse<Map<String,Object>> lisetStaffStatisticsWithPage(@RequestBody StaffStatisticsFindDTO staffStatisticsFindDTO){
+           Map<String,Object> result =  staffStatisticsBiz.listStaffStatisticsWithPage(staffStatisticsFindDTO);
+           return ObjectRestResponse.succ(result);
+       }
+
+       @PostMapping("/export")
+       public void exportStaffStatistics(@RequestBody StaffStatisticsFindDTO staffStatisticsFindDTO, 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-staff-statistics.xlsx",name);
+               response.setHeader("Content-Disposition","attachment;filename="+ new String(filename.getBytes(), "iso8859-1"));
+               ServletOutputStream outputStream = response.getOutputStream();
+               staffStatisticsBiz.exportStaffStistics(staffStatisticsFindDTO, outputStream);
+               response.setCharacterEncoding("UTF-8");
+           }catch (Exception ex){
+               throw  new BaseException("导出数据失败");
+           }
+       }
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java

@@ -138,11 +138,12 @@ public class AppUserRest {
      * @return
      */
     @RequestMapping(value = "/user/checkBindWechat")
-    public @ResponseBody JSONObject checkBindWechat(@RequestParam(value="username",defaultValue="")String  username) {
+    public @ResponseBody JSONObject checkBindWechat(@RequestParam(value="username",defaultValue="")String  username,
+                                                    @RequestParam(value="type",defaultValue="0")Integer  type) {
         if (StringUtils.isBlank(username)) {
             return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空");
         }
-        return appPermissionService.checkBindWechat(username);
+        return appPermissionService.checkBindWechat(username,type);
     }
 
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -114,6 +114,9 @@ public class AppPermissionService {
     @Autowired
     private  AppUserPositionTempBiz positionTempBiz;
 
+    @Autowired
+    private  AppUserAlipayBiz alipayBiz;
+
 
     public AppUserInfo validate(String username, String password) {
         AppUserInfo info = new AppUserInfo();
@@ -617,12 +620,20 @@ public class AppPermissionService {
      * @return
      */
 
-    public JSONObject checkBindWechat(String username) {
+    public JSONObject checkBindWechat(String username,Integer type) {
         JSONObject data = new JSONObject();
         try {
             AppUserLogin userLogin = appUserLoginBiz.checkeUserLogin(username);
             if (userLogin != null) {
                 String openid = userLogin.getOpenid();
+                if (type==null||type==0){
+                    openid=userLogin.getWxOpenid();
+                }else if (type==2){
+                    List<AppUserAlipay> list=alipayBiz.getListByUserId(userLogin.getId());
+                    if (list.size()>0){
+                        openid=list.get(0).getTxAlipay();
+                    }
+                }
                 if (StringUtils.isNotBlank(openid)) {
                     data.put("type", 0); // 已存在
                 } else {

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -66,7 +66,7 @@
             #{userId}
         </foreach>
 
-  </select>
+    </select>
 
 
     <select id="getUserIdByUsername" resultType="java.lang.Integer" parameterType="java.lang.String">
@@ -200,7 +200,6 @@
         <if test="memberLevel == -1">
             and m.member_level in (select level from base_user_member_level)
         </if>
-
         <if test="registrationTimeBegin !=null  ">
             and l.createtime &gt;= #{registrationTimeBegin}
         </if>
@@ -235,4 +234,81 @@
         order by l.id ASC
     </select>
 
+    <!--查询非普通用户-->
+    <select id="selectAllStaffs" resultType="com.github.wxiaoqi.security.admin.bo.UserStaffBo">
+select aud.userid as `userId`,aud.realname as `realName`,aud.nickname as `nickName`,aul.username as `phone`,aud.position_id as `postionId`,aup.name as `postionName`,aupt.company_id as `companyId`,aupt.company_name as `companyName`
+from   `app_user_detail` as `aud` left join `app_user_login` as `aul` on aul.id=aud.userid
+    left join `app_user_position_temp` as `aupt` on aupt.user_id=aul.id
+    left join `app_user_position` as `aup`  on aup.id=aud.position_id
+        where  <![CDATA[aud.position_id<>6]]> and aud.isdel=0
+    </select>
+    <select id="getUserByUserIdList" resultMap="AppUserVoMap">
+        select
+        l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*,p.name as
+        jobTitle,buml.name as memberName from app_user_login l
+        left join app_user_detail d
+        on d.userid = l.id
+        left join base_user_member bum
+        on bum.user_id=l.id
+        left join (select level, name from base_user_member_level level where isdel = 0) buml
+        on bum.member_level = buml.level
+        left join (select id, name from app_user_position where is_del=0) p
+        on d.position_id=p.id
+        where l.isdel=0 and
+        d.userid in
+        <foreach collection="userIds" item="userId" index="index" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </select>
+
+    <select id="findAllStaffsByCompanyIdAndPostionId"
+            resultType="com.github.wxiaoqi.security.admin.bo.UserStaffBo">
+        select * from (select aud.userid as `userId`,aud.realname as `realName`,aud.nickname as `nickName`,aul.username as `phone`,aud.position_id
+        as `postionId`,aup.name as `postionName`,aupt.company_id as `companyId`,aupt.company_name as `companyName` from `app_user_detail` as `aud`
+        left join `app_user_login` as `aul` on aul.id=aud.userid
+         left join (select * from `app_user_position_temp` where is_del=0) as `aupt` on aupt.user_id=aul.id
+         left join `app_user_position` as `aup` on aup.id=aud.position_id where <![CDATA[aud.position_id<>6]]> and aud.isdel=0
+          <if test="userPostionId!=null">
+           and  aud.`position_id`=#{userPostionId}
+          </if>
+        <if test="companyId!=null">
+            and  aupt.`company_id`=#{companyId}
+        </if>
+        <if test="userIds!=null and userIds.size>0">
+            and aud.userid in
+            <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+                #{userId}
+            </foreach>
+        </if>) as `saff`
+        left join (
+        select auswp.user_id, IFNULL(auswp.upIncome, 0) - IFNULL(auswd.dowIncome, 0) as `sellAmount`
+        from (select `user_id`, sum(price) as `upIncome`
+        from `app_user_selling_water`
+        where <![CDATA[position_id<>6]]>
+        and status = 0
+        <if test="startDate!=null and endDate!=null">
+          and `crt_time` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+             `crt_time` >=#{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+             `crt_time` <=#{endDate}
+            ]]>
+        </if>
+        group by user_id) as auswp
+        left join (select `user_id`, sum(price) as `dowIncome`
+        from `app_user_selling_water`
+        where <![CDATA[position_id<>6]]>
+        and status = 1
+        group by user_id) as auswd
+        on auswd.user_id = auswp.user_id
+        ) as `sell` on sell.user_id=saff.userId
+        order by sell.sellAmount desc
+    </select>
+
+
 </mapper>
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml

@@ -26,10 +26,10 @@ FROM
 
     <select id="selectTotalIncomeByUserId" resultType="java.math.BigDecimal">
         SELECT
-	( auswu.upIncome - auswd.dowIncome ) AS `income`
+	( IFNULL(auswu.upIncome,0) - IFNULL(auswd.dowIncome,0) ) AS `income`
 FROM
-	( SELECT IFNULL(SUM( commission ),0) AS upIncome FROM `app_user_selling_water` WHERE STATUS = 0 AND `user_id` = #{userId}  ) AS `auswu`,
-	( SELECT IFNULL(SUM( commission ),0) AS `dowIncome` FROM `app_user_selling_water` WHERE STATUS = 1 AND `user_id` = #{userId}  ) AS `auswd`;
+	( SELECT IFNULL(SUM( commission ),0) AS upIncome FROM `app_user_selling_water` WHERE STATUS = 0 AND waiting=1 AND `user_id` = #{userId}  ) AS `auswu`,
+	( SELECT IFNULL(SUM( commission ),0) AS `dowIncome` FROM `app_user_selling_water` WHERE STATUS = 1 AND waiting=1 AND `user_id` = #{userId}  ) AS `auswd`;
     </select>
 
     <select id="selectSellerWalterByUserIdAndWating" resultType="com.github.wxiaoqi.security.admin.vo.SellingWalletVo">
@@ -151,4 +151,27 @@ FROM
         </if>) AS audd ON audd.userid = ausw.user_id
       ORDER BY ausw.crt_time DESC
     </select>
+
+    <select id="statisticsStatffSellerWaterByUserIdsAndTime"
+            resultType="com.github.wxiaoqi.security.admin.dto.AppUserSellingWaterDTO">
+        SELECT
+   `auswu`.user_id, ( IFNULL(auswu.upIncome,0) - IFNULL(auswd.dowIncome,0) ) AS `commission`
+   FROM
+    ( SELECT `user_id` as `userId`, IFNULL(SUM( commission ),0) AS upIncome FROM `app_user_selling_water` where STATUS = 0 and waiting=1
+    AND `crt_time` between #{startTime} and #{endTime}
+    <if test="userIds!=null and userIds.size!=0">
+        AND `user_id` IN <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+         #{userId}
+    </foreach>
+    </if> group by user_id) AS `auswu`
+     left join
+    ( SELECT `user_id`,IFNULL(SUM( commission ),0) AS `dowIncome` FROM `app_user_selling_water` where STATUS = 1 and waiting=1
+     and `crt_time` between #{startTime} and #{endTime}
+    <if test="userIds!=null and userIds.size!=0">
+        AND `user_id` IN <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+        #{userId}
+    </foreach>
+    </if> group by user_id) AS `auswd`
+    on auswd.user_id=auswu.user_id
+    </select>
 </mapper>
\ No newline at end of file

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 com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
+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 Integer rentDays;
+     private BigDecimal extralAmount;
+     private Integer  departureNum;
+     private Integer   arrivalNum;
+     private Date startDate;
+     private Date endDate;
+}

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

 package com.xxfc.platform.order.contant.enumerate;
 
+
+import org.assertj.core.util.Lists;
+
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public enum DeductionTypeEnum {
@@ -22,19 +26,48 @@ public enum DeductionTypeEnum {
      * 类型描述
      */
     private String desc;
+    /**
+     * 违约相关code
+     */
+    public static List<Integer> lateFeeCode;
+    /**
+     * 定损相关code
+     */
+    public static List<Integer> lossSpecifiedCode;
+    /**
+     * 违章相关code
+     */
+    public static List<Integer> breakRulesRegulationCode;
+    /**
+     *消费金额相关code
+     */
+    public static List<Integer> consumerCode;
 
-    private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
-            //Maps.newHashMap();
+    private static Map<Integer, String> codeAndDesc = new HashMap<Integer, String>();
 
-    static{
-        for(DeductionTypeEnum enumE : DeductionTypeEnum.values()){
-            codeAndDesc.put(enumE.getCode(),enumE.getDesc());
+    static {
+        for (DeductionTypeEnum enumE : DeductionTypeEnum.values()) {
+            codeAndDesc.put(enumE.getCode(), enumE.getDesc());
         }
+
+        lateFeeCode = Lists.newArrayList(VIOLATE_CANCEL.getCode(),
+                VIOLATE_ADVANCE.getCode(),
+                VIOLATE_DELAY.getCode(),
+                VIOLATE_CHANGE_C.getCode());
+
+
+        lossSpecifiedCode = Lists.newArrayList(DAMAGES.getCode());
+
+        breakRulesRegulationCode = Lists.newArrayList(
+                VIOLATE_TRAFFIC_DEDUCT.getCode()
+        );
+
+        consumerCode = Lists.newArrayList(CONSUME.getCode());
     }
 
-    DeductionTypeEnum(Integer code, String desc){
-        this.code=code;
-        this.desc=desc;
+    DeductionTypeEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
     }
 
     public Integer getCode() {
@@ -53,7 +86,7 @@ public enum DeductionTypeEnum {
         this.desc = desc;
     }
 
-    public static Boolean exists(Integer code){
+    public static Boolean exists(Integer code) {
         return codeAndDesc.containsKey(code);
     }
 }
\ No newline at end of file

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/contant/enumerate/StatisticsStatusEnum.java

+package com.xxfc.platform.order.contant.enumerate;
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import com.xxfc.platform.order.entity.OrderReceivedStatisticsBase;
+import org.apache.commons.collections4.CollectionUtils;
+import org.assertj.core.util.Lists;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.temporal.WeekFields;
+import java.util.*;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/14 14:28
+ */
+public enum  StatisticsStatusEnum {
+    ;
+    public static final int DEFAULT_COMPANY=1;
+    public static final int ORDER_MEMBER_TYPE=3;
+    public static final int ORDER_RENT_VEHICLE_TYPE=1;
+    public static final int ORDER_TOUR_TYPE=2;
+    public static final int NO_PAY_WAY=0;
+    public static final Integer DEFAULT_SQL_SIZE=1000;
+    public static final String ORDER_AMOUNT="order_amount";
+    public static final String LATEFEE_AMOUNT="late_fee";
+    public static final String ORDER_REFUND_AMOUNT="order_refund_amount";
+    public static final String ORDER_DEPOSIT_AMOUNT="order_deposit_amount";
+    public static final String COMPANY_DEFAULT="欣新房车控股集团";
+    public static final String NO_DEDUCTIBLE_AMOUNT="damageSafeAmount";
+    public static final String  PARMAM_JSON="paramJson";
+    public static final int DAMAGE_SAFE=1;
+    public static List<String> orderStates;
+    public static List<String> orderOrigins;
+    public static List<String> orderPayWays;
+
+    static {
+         // 0 未支付 1 已支付
+        orderStates = Lists.newArrayList("0","1");
+        // 1 app   2 小程序  3 其他
+        orderOrigins = Lists.newArrayList("1","2","3");
+        // 1 微信  2 支付宝  0不需要支付(使用了优惠券之类的)或未支付
+        orderPayWays = Lists.newArrayList("1","2","0");
+    }
+
+    public static List<String> statisticsSateGroupWithCompanys(List<Integer> companyIdList){
+        List<String> orderStatisticsStateGroups = new ArrayList<>();
+        List<String> stateGroup = statisticsStateGroup();
+        for (String stgp : stateGroup) {
+            for (Integer companyId : companyIdList) {
+                 // 公司id-订单来源-支付方式-订单状态
+                orderStatisticsStateGroups.add(String.format("%d-%s",companyId,stgp));
+            }
+        }
+        return orderStatisticsStateGroups;
+    }
+
+    public static List<String> statisticsStateGroup(){
+        List<String> orderStatisticsStateGroups = new ArrayList<>();
+        for (String orderOrigin : orderOrigins) {
+            for (String orderPayWay : orderPayWays) {
+                for (String orderState : orderStates) {
+                    //订单来源-支付方式-订单状态
+                    orderStatisticsStateGroups.add(String.format("%s-%s-%s",orderOrigin,orderPayWay,orderState));
+                }
+            }
+        }
+        return orderStatisticsStateGroups;
+    }
+    public static List<String> getOtherStatisticsStateGroup(List<Integer> companyIdList,List<String> statisticsStates){
+        List<String> stateGroupList = CollectionUtils.isEmpty(companyIdList)?statisticsStateGroup():statisticsSateGroupWithCompanys(companyIdList);
+        stateGroupList.removeAll(statisticsStates);
+        return stateGroupList;
+    }
+
+    public static<T extends OrderReceivedStatisticsBase> T wrapStatisticsObject(Date date, String stateGroup, Map<Integer,String> companyMap, T targetObj){
+        LocalDate localDate =  LocalDate.from(new Date().toInstant().atZone(ZoneId.systemDefault()));
+        String year = String.valueOf(localDate.getYear());
+        String month = String.format("%s%d", year, localDate.getMonthValue());
+        String weekOfYear = String.format("%s%d", year,localDate.get(WeekFields.of(Locale.CHINESE).weekOfYear()));
+        String[] status = stateGroup.split("-");
+        targetObj.setCrtTime(new Date());
+        targetObj.setCompanyId(Integer.valueOf(status[0]));
+        String companyName = Objects.isNull(companyMap)?COMPANY_DEFAULT: StringUtils.hasText(companyMap.get(targetObj.getCompanyId()))?companyMap.get(targetObj.getCompanyId()):COMPANY_DEFAULT;
+        targetObj.setCompanyName(companyName);
+        targetObj.setHasPay(Integer.valueOf(status[3]));
+        targetObj.setOrderOrigin(Integer.valueOf(status[1]));
+        targetObj.setPayWay(Integer.valueOf(status[2]));
+        targetObj.setDate(date);
+        targetObj.setYear(year);
+        targetObj.setMonth(month);
+        targetObj.setWeekOfYear(weekOfYear);
+        targetObj.setExtraAmount(BigDecimal.ZERO);
+        targetObj.setLateFeeAmount(BigDecimal.ZERO);
+        targetObj.setTotalAmount(BigDecimal.ZERO);
+        targetObj.setTotalQuantity(0);
+        targetObj.setOrderRefundAmount(BigDecimal.ZERO);
+        targetObj.setStateGroup(stateGroup);
+        return targetObj;
+    }
+}

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.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")
+public class OrderReceivedStatistics extends OrderReceivedStatisticsBase implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@Column(name = "member_amount")
+	@ApiModelProperty("会员费")
+	private BigDecimal memberAmount;
+
+	@Column(name = "travel_amount")
+	@ApiModelProperty("旅游费")
+	private BigDecimal travelAmount;
+
+	@Column(name = "rent_vehicle_amount")
+	@ApiModelProperty("租车费")
+	private BigDecimal rentVehicleAmount;
+
+	@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/OrderReceivedStatisticsBase.java

+package com.xxfc.platform.order.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/11 15:49
+ */
+@Data
+public class OrderReceivedStatisticsBase implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     *
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY,generator = "JDBC")
+    @ApiModelProperty("")
+    protected Long id;
+
+    /**
+     * 年份
+     */
+    @Column(name = "year")
+    @ApiModelProperty(value = "年份")
+    protected String year;
+
+    /**
+     * 月份
+     */
+    @Column(name = "month")
+    @ApiModelProperty(value = "月份----->201908")
+    protected String month;
+
+    /**
+     * 年月日
+     */
+    @Column(name = "date")
+    @ApiModelProperty(value = "年月日")
+    protected Date date;
+
+    /**
+     * 1周年的第几周
+     */
+    @Column(name = "week_of_year")
+    @ApiModelProperty(value = "1周年的第几周--->201922")
+    protected String weekOfYear;
+
+    /**
+     * 订单总额
+     */
+    @Column(name = "total_amount")
+    @ApiModelProperty(value = "订单总额(不包含押金)")
+    protected BigDecimal totalAmount;
+
+    /**
+     * 订单总量
+     */
+    @Column(name = "total_quantity")
+    @ApiModelProperty(value = "订单总量")
+    protected Integer totalQuantity;
+
+    @Column(name = "has_pay")
+    @ApiModelProperty(value = "是否支付 1已经支付 0未支付")
+    protected Integer hasPay;
+
+    /**
+     * '支付来源 1--app；2--小程序',
+     */
+    @Column(name = "order_origin")
+    @ApiModelProperty(value = " '支付来源 1--app；2--小程序',")
+    protected Integer orderOrigin;
+
+    /**
+     * 支付方式 '1:微信公众号支付 2.支付宝即时到账,3,银联'
+     */
+    @Column(name = "pay_way")
+    @ApiModelProperty(value = "支付方式 '1:微信公众号支付 2.支付宝即时到账,3,银联'")
+    protected Integer payWay;
+
+    @Column(name = "company_id")
+    @ApiModelProperty(value = "分公司id")
+    protected Integer companyId;
+
+    @Column(name = "company_name")
+    @ApiModelProperty("分公司名称")
+    protected String companyName;
+
+    @ApiModelProperty("违约金")
+    @Column(name = "late_fee_amount")
+    protected BigDecimal lateFeeAmount;
+
+    @ApiModelProperty("订单退款")
+    @Column(name = "order_refund_amount")
+    protected BigDecimal orderRefundAmount;
+
+    @ApiModelProperty("额外费用")
+    @Column(name = "extra_amount")
+    protected BigDecimal extraAmount;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "crt_time")
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    protected Date crtTime;
+
+    @Transient
+    protected Integer divisor;
+
+    @Transient
+    private String stateGroup;
+
+}

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/entity/StaffStatistics.java

+package com.xxfc.platform.order.entity;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/25 12:19
+ */
+@Table(name = "staff_statistics")
+@Entity
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Api("员工业绩统计")
+public class StaffStatistics implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    private Long id;
+
+    @Column(name = "year")
+    @ApiModelProperty(value = "年份")
+    protected String year;
+
+    @Column(name = "month")
+    @ApiModelProperty(value = "月份----->201908")
+    protected String month;
+
+    @Column(name = "date")
+    @ApiModelProperty(value = "年月日")
+    protected Date date;
+
+    @Column(name = "week_of_year")
+    @ApiModelProperty(value = "1周年的第几周--->201922")
+    protected String weekOfYear;
+
+    @ApiModelProperty("员工所属公司id")
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    @ApiModelProperty("公司名称")
+    @Column(name = "company_name")
+    private String companyName;
+
+    @ApiModelProperty("员工id")
+    @Column(name = "user_id")
+    private Integer userId;
+
+    @ApiModelProperty("员工身份id")
+    @Column(name = "user_postion_id")
+    private Integer userPostionId;
+
+    @ApiModelProperty("员工身份")
+    @Column(name = "postion_name")
+    private String postionName;
+
+    @ApiModelProperty("租车订单量")
+    @Column(name = "rent_vehicle_order_num")
+    private Integer rentVehicleOrderNum;
+
+    @ApiModelProperty("租车订单总额(不包含押金，不计免赔金额)")
+    @Column(name = "rent_vehicle_amount")
+    private BigDecimal rentVehicleAmount;
+
+    @ApiModelProperty("会员订单量")
+    @Column(name = "member_order_num")
+    private Integer memberOrderNum;
+
+    @ApiModelProperty("会员订单总额")
+    @Column(name = "member_amount")
+    private BigDecimal memberAmount;
+
+    @ApiModelProperty("旅游订单量")
+    @Column(name = "travel_order_num")
+    private Integer travelOrderNum;
+
+    @ApiModelProperty("旅游订单总额")
+    @Column(name = "travel_amount")
+    private BigDecimal travelAmount;
+
+    @ApiModelProperty("销售总额")
+    @Column(name = "sell_amount")
+    private BigDecimal sellAmount;
+
+    @ApiModelProperty("提成")
+    @Column(name = "royalty_amount")
+    private BigDecimal royaltyAmount;
+
+    @ApiModelProperty("创建时间")
+    @Column(name = "crt_time")
+    private Date crtTime;
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

 package com.xxfc.platform.order.feign;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.vo.GoodDataVO;
-import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.pojo.dto.OrderDTO;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
-import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.entity.*;
-import com.xxfc.platform.vehicle.pojo.*;
-import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * Created by ace on 2017/9/15.
@@ -25,4 +23,8 @@ public interface OrderFeign {
 
     @GetMapping("/count/list")
     public ObjectRestResponse<List<OrderPageVO>> getOrderList(@RequestParam("dateTime")Long dateTime, @RequestParam("type")Integer type, @RequestParam("status")Integer status);
+
+
+     @GetMapping(value = "/count/basebase/findByOrderIds")
+     public ObjectRestResponse<List<OrderDTO>> findOrdersByorderId(@RequestParam(value = "orderIds") List<Integer> orderIds);
 }

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

+package com.xxfc.platform.order.pojo.account;
+
+import com.alibaba.fastjson.JSON;
+import com.xxfc.platform.order.pojo.dto.OrderDTO;
+import lombok.Data;
+import org.springframework.util.StringUtils;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/14 19:16
+ */
+@Data
+public class OrderAccountBo extends OrderDTO {
+
+    private Integer accountType;
+    private String accountDetail;
+
+    private OrderAccountDetail accountDetailEntity;
+
+    public OrderAccountDetail getAccountDetailEntity() {
+        return StringUtils.hasText(accountDetail)? JSON.parseObject(accountDetail,OrderAccountDetail.class):new OrderAccountDetail();
+    }
+}

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/bo/StaffStatisticsTotalBo.java

+package com.xxfc.platform.order.pojo.bo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/25 12:44
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class StaffStatisticsTotalBo {
+
+     private Integer staffNum;
+     private BigDecimal totalSellAmount;
+     private BigDecimal totalRoyaltyAmount;
+
+     public Integer getStaffNum() {
+          return this.staffNum==null?0:staffNum;
+     }
+
+     public BigDecimal getTotalSellAmount() {
+          return this.totalSellAmount==null?BigDecimal.ZERO:totalSellAmount;
+     }
+
+     public BigDecimal getTotalRoyaltyAmount() {
+          return this.totalRoyaltyAmount==null?BigDecimal.ZERO:totalRoyaltyAmount;
+     }
+}

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;
+
+}

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

+package com.xxfc.platform.order.pojo.dto;
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.github.wxiaoqi.security.common.enumconstant.LevelEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/13 15:58
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderDTO {
+    protected Integer  id;
+    protected Integer type;
+    protected Integer status;
+    protected BigDecimal orderAmount;
+    protected BigDecimal realAmount;
+    protected Integer orderOrigin;
+    protected Integer payWay;
+    protected Integer companyId;
+    protected String stateGroup;
+    protected Integer hasPay;
+    private JSONObject data;
+    private Integer damageSafe;
+    private BigDecimal deposit;
+    private Integer userId;
+    private Integer postionId;
+
+    /**
+     * 费用其他明细 租车使用
+     */
+    protected String costDetailExtend;
+    /**
+     * 会员相关
+     */
+    protected Integer memberLevel;
+
+    protected LevelEnum levelEnum;
+
+
+    public LevelEnum getLevelEnum(){
+        return LevelEnum.getLevelEnumByLevel(this.memberLevel);
+    }
+
+    public JSONObject getData() {
+       return StringUtils.hasText(costDetailExtend)?JSONUtil.parseObj(costDetailExtend):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/dto/StaffStatisticsFindDTO.java

+package com.xxfc.platform.order.pojo.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/25 12:43
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class StaffStatisticsFindDTO extends PageParam {
+
+     private Date startDate;
+     private Date endDate;
+     private String companyName;
+     private Integer userPostionId;
+     private List<Integer> companyIds;
+}

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-api/src/main/java/com/xxfc/platform/order/pojo/vo/StaffStatisticsVo.java

+package com.xxfc.platform.order.pojo.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/25 12:44
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class StaffStatisticsVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String name ;
+    private List<String> companyNames;
+    private List<String> postionNames;
+    private String phone;
+    private BigDecimal sellAmount = BigDecimal.ZERO;
+    private BigDecimal royaltyAmount = BigDecimal.ZERO;
+    private Integer memberOrderNum = 0;
+    private BigDecimal memberAmount = BigDecimal.ZERO;
+    private Integer rentVehicleOrderNum = 0;
+    private BigDecimal rentVehicleAmount = BigDecimal.ZERO;
+    private Integer travelOrderNum = 0;
+    private BigDecimal travelAmount = BigDecimal.ZERO;
+
+}

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

@@ -34,6 +34,7 @@ import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.dto.MemberOrderBo;
 import com.xxfc.platform.order.pojo.dto.MemberOrderFindDTO;
+import com.xxfc.platform.order.pojo.dto.OrderDTO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
@@ -57,6 +58,7 @@ import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.util.DistanceUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
@@ -856,11 +858,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
             switch (sign) {
                 case 2:
                     sendMsgDTO.setRoutKey(KEY_ORDER_CANCEL);
-//                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_CANCEL, JSONUtil.toJsonStr(orderMQDTO));
                     break;
                 case 4:
                     sendMsgDTO.setRoutKey(KEY_ORDER_PAY);
-//                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_PAY, JSONUtil.toJsonStr(orderMQDTO));
                     break;
                 case 6:
                     sendMsgDTO.setRoutKey(KEY_ORDER_FINLISH);
@@ -918,6 +918,20 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         return Lists.newArrayList();
     }
 
+    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;
+    }
+
+    public List<OrderDTO> selectBaeOrderByOrderIds(List<Integer> orderIds) {
+          List<OrderDTO> orderDTOList = mapper.selectBaeOrderByOrderIds(orderIds);
+        return CollectionUtils.isNotEmpty(orderDTOList)?Collections.EMPTY_LIST:orderDTOList;
+    }
+
+    public List<OrderPageVO> selectAllRentVehicleOrder(Map<String, Object> paramMap) {
+        return mapper.selectAllRentVehicleOrder(paramMap);
+    }
+
 
     public List<Achievement> entryStatisticalData(QueryCriteria queryCriteria) {
        return mapper.selectTotalStatistical(queryCriteria);

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

+package com.xxfc.platform.order.biz;
+
+import cn.hutool.core.date.DateUtil;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.order.contant.enumerate.ReceivedStatisticsEnum;
+import com.xxfc.platform.order.pojo.dto.CompanyPerformanceFindDTO;
+import com.xxfc.platform.order.bo.CompanyPerformanceBo;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/23 14:48
+ */
+@Transactional(rollbackFor = Exception.class)
+@Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class CompanyPerformanceBiz {
+
+     private final OrderReceivedStatisticsBiz orderReceivedStatisticsBiz;
+     private final VehicleFeign vehicleFeign;
+
+    public PageDataVO<CompanyPerformanceBo> selectCompanyPerformancePage(CompanyPerformanceFindDTO companyPerformanceFindDTO) {
+
+        Map<Integer, String> companyMap = vehicleFeign.findCompanyMap();
+        PageDataVO<CompanyPerformanceBo> pageDataVO = new PageDataVO<>();
+        //日统计
+        if (companyPerformanceFindDTO.getStatisticalWay() == ReceivedStatisticsEnum.DAY.getWayCode()) {
+            pageDataVO = orderReceivedStatisticsBiz.selectCompanyPerformanceWithDayPage(companyPerformanceFindDTO);
+        }
+
+        //按周
+        if (companyPerformanceFindDTO.getStatisticalWay() == ReceivedStatisticsEnum.WEEK.getWayCode()) {
+            pageDataVO = orderReceivedStatisticsBiz.selectCompanyPerformanceWithWeekPage(companyPerformanceFindDTO);
+        }
+        //按月
+        if (companyPerformanceFindDTO.getStatisticalWay() == ReceivedStatisticsEnum.MONTH.getWayCode()) {
+            pageDataVO = orderReceivedStatisticsBiz.selectCompanyPerformanceWithMonthPage(companyPerformanceFindDTO);
+
+        }
+        List<CompanyPerformanceBo> data = pageDataVO.getData();
+        if (CollectionUtils.isEmpty(data)) {
+            return pageDataVO;
+        }
+        for (CompanyPerformanceBo companyPerformanceBo : data) {
+            String companyName = companyMap == null ? "" : companyMap.get(companyPerformanceBo.getCompanyId());
+            companyPerformanceBo.setCompanyName(companyName);
+            if (companyPerformanceFindDTO.getStatisticalWay() == ReceivedStatisticsEnum.WEEK.getWayCode()) {
+                Calendar cal = Calendar.getInstance();
+                cal.setFirstDayOfWeek(Calendar.MONDAY);
+                cal.set(Calendar.YEAR, companyPerformanceBo.getYear());
+                cal.set(Calendar.WEEK_OF_YEAR, Integer.valueOf(companyPerformanceBo.getWeekOfYear().replace("" + companyPerformanceBo.getYear(), "")));
+                cal.set(Calendar.DAY_OF_WEEK, cal.getFirstDayOfWeek());
+                Date startDate = cal.getTime();
+                cal.add(Calendar.DAY_OF_WEEK, 6);
+                Date endDate = cal.getTime();
+                companyPerformanceBo.setStartDate(DateUtil.beginOfDay(startDate));
+                companyPerformanceBo.setEndDate(DateUtil.beginOfDay(endDate));
+            }
+        }
+        return pageDataVO;
+    }
+}

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

@@ -22,6 +22,7 @@ import com.xxfc.platform.order.pojo.DedDetailDTO;
 import com.xxfc.platform.order.pojo.QueryCriteria;
 import com.xxfc.platform.order.pojo.ReturnOrderAmount;
 import com.xxfc.platform.order.pojo.Term;
+import com.xxfc.platform.order.pojo.account.OrderAccountBo;
 import com.xxfc.platform.order.pojo.account.OrderAccountDTO;
 import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
@@ -35,6 +36,7 @@ import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.universal.vo.OrderRefundVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.jexl2.MapContext;
 import org.mockito.internal.util.collections.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,9 +44,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
@@ -653,6 +653,30 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
     }
 
+    /**
+     *根据开始与结束时间查询账目
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public List<OrderAccountBo> selectByTypeAndDate(Integer orderType, Date startDate, Date endDate) {
+         List<OrderAccountBo> accountBos = mapper.selectOrderAccountByOrderTypeAndStartTimeAndEndTime(orderType,startDate.getTime(),endDate.getTime());
+        return CollectionUtils.isEmpty(accountBos)? Collections.EMPTY_LIST:accountBos;
+    }
+
+    /**
+     * 根据创建时间与员工id查询
+     * @param startDate
+     * @param endDate
+     * @param staffUserIds
+     * @return
+     */
+    public List<OrderAccountBo> selectByDateAndStatffIds(Date startDate, Date endDate, List<Integer> staffUserIds) {
+        List<OrderAccountBo> orderAccountBos = mapper.selectByDateAndStatffIds(startDate,endDate,staffUserIds);
+        return CollectionUtils.isNotEmpty(orderAccountBos)?Collections.EMPTY_LIST:orderAccountBos;
+    }
+
+
     public List<ReturnOrderAmount> outStatisticalData(QueryCriteria queryCriteria) {
         Long startTime=null;
         Long endTime= null;

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

+package com.xxfc.platform.order.biz;
+
+import com.xxfc.platform.order.pojo.dto.OrderReceivedStatisticsFindDTO;
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.order.entity.OrderTourReceivedStatistics;
+import com.xxfc.platform.order.mapper.OrderTourReceivedStatisticsMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 旅游订单统计
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-11-08 18:03:42
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class OrderTourReceivedStatisticsBiz extends BaseBiz<OrderTourReceivedStatisticsMapper,OrderTourReceivedStatistics> {
+    public List<OrderTourReceivedStatistics> selectOrderReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderTourReceivedStatistics(orderReceivedStatisticsFindDTO);
+    }
+}
\ No newline at end of file

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

+package com.xxfc.platform.order.biz;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.order.Utils.OrderDateUtils;
+import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
+import com.xxfc.platform.order.contant.enumerate.CrosstownTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
+import com.xxfc.platform.order.entity.OrderVehicleServiceStatistics;
+import com.xxfc.platform.order.mapper.OrderVehicleServiceStatisticsMapper;
+import com.xxfc.platform.order.pojo.CountVehicleServiceNumVo;
+import com.xxfc.platform.order.pojo.order.OrderPageVO;
+import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
+import com.xxfc.platform.universal.utils.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Slf4j
+public class OrderVehicleServiceStatisticsBiz extends BaseBiz<OrderVehicleServiceStatisticsMapper, OrderVehicleServiceStatistics> {
+
+	@Autowired
+	BaseOrderBiz baseOrderBiz;
+	@Autowired
+	OrderVehicleCrosstownBiz orderVehicleCrosstownBiz;
+	@Autowired
+	OrderCalculateBiz orderCalculateBiz;
+	Map<Integer, Map<String, Integer>> mapMap = new HashMap<>();
+
+	//获取订单，解析租车天数
+	//根据订单状态，待出行的添加一天，出行中的加一天，已完成的判断订单时间和实际结束时间如果实际结束天数大于订单天数，则需要加一天
+	public void getAllOrder(DateTime dateTime) {
+		Date nowTime = DateTime.now().minusDays(1).toDate();
+		if (dateTime != null) {
+			nowTime = dateTime.minusDays(1).toDate();
+		}
+		String timeStr = DateUtil.dateToStr(nowTime, "yyyy-MM-dd");
+		//以公司ID为key, 日期+次数为value组成map
+		Map<String, Object> param = new HashMap<>();
+		param.put("startTime", OrderDateUtils.getStartOfDay(nowTime));
+		param.put("endTime", OrderDateUtils.getEndOfDay(nowTime));
+		param.put("status", 1);
+		List<OrderPageVO> orderPageVOS = baseOrderBiz.selectAllRentVehicleOrder(param);
+		if (orderPageVOS != null && orderPageVOS.size() > 0) {
+			orderPageVOS.parallelStream().forEach(result -> {
+				if (result.getOrderRentVehicleDetail() != null) {
+					Map<String, Integer> dateNumMap = mapMap.getOrDefault(result.getOrderRentVehicleDetail().getStartCompanyId(), new HashMap<>());
+					if (result.getStatus() == OrderStatusEnum.ORDER_TOSTART.getCode() || result.getStatus() == OrderStatusEnum.ORDER_WAIT.getCode()) {//待出行或者出行中
+						dateNumMap.put(timeStr, dateNumMap.getOrDefault(timeStr, 0) + 1);
+					}
+					if (result.getStatus() == OrderStatusEnum.ORDER_TOSTART.getCode() || result.getStatus() == OrderStatusEnum.ORDER_FIXED_LOSS.getCode()) {//已完成或者定损中
+						//判断租车时间是否小于实际用车时间
+						//实际预定天数
+						Integer bookDays = result.getOrderRentVehicleDetail().getDayNum();
+						//实际使用天数
+						Integer actualUsedDays = result.getOrderRentVehicleDetail().getUsedDay();
+						Long startTime = result.getOrderRentVehicleDetail().getStartTime();
+						if (actualUsedDays == null) {//字段为空，重新计算天数
+							//查询还车时间
+							OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
+							orderVehicleCrosstownDto.setOrderId(result.getId());
+							List<OrderVehicleCrosstownDto> list = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
+							if(list != null && list.size() > 0) {
+								list.parallelStream().forEach(order -> {
+									//获取还车时间
+									if (order.getType() == CrosstownTypeEnum.ARRIVE.getCode() || order.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode() || order.getType() == CrosstownTypeEnum.FIXED_LOSS_NOW.getCode()) {
+										Long endTime = order.getCrtTime();
+										int userUsedDay = orderCalculateBiz.getIncludeDays(startTime, endTime);
+										if (bookDays < userUsedDay) { //实际使用天数>预定天数，还车当天+1
+											dateNumMap.put(timeStr, dateNumMap.getOrDefault(timeStr, 0) + 1);
+										}
+									}
+								});
+							} else { //还车记录不存在，异常数据
+								log.info("还车记录不存在，异常数据, {}", result.toString());
+							}
+						}
+					}
+					mapMap.put(result.getOrderRentVehicleDetail().getStartCompanyId(), dateNumMap);
+				}
+			});
+		}
+		log.info("统计数据，Map = {}", mapMap);
+	}
+
+
+	public void countVehicleServiceNum(DateTime dateTime) {
+		Date nowTime = DateTime.now().minusDays(1).toDate();
+		if (dateTime != null) {
+			nowTime = dateTime.minusDays(1).toDate();
+		}
+		Map<String, Object> map = new HashMap<>();
+		map.put("startTime", OrderDateUtils.getStartOfDay(nowTime));
+		map.put("endTime", OrderDateUtils.getEndOfDay(nowTime));
+		List<CountVehicleServiceNumVo> list = mapper.countVehicleServiceNum(map);
+		if (list != null && list.size() > 0) {
+			list.parallelStream().forEach(result -> {
+				OrderVehicleServiceStatistics orderVehicleServiceStatistics = new OrderVehicleServiceStatistics();
+				log.info(result.toString());
+				BeanUtil.copyProperties(result, orderVehicleServiceStatistics, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+				String dateStr = result.getCountYear() +"-"+ result.getCountMonth() +"-"+ result.getCountDay();
+				DateTime date = DateTime.parse(dateStr);
+				orderVehicleServiceStatistics.setCountDate(date.toDate());
+				orderVehicleServiceStatistics.setCountMonth(result.getCountYear() + result.getCountMonth());
+				orderVehicleServiceStatistics.setCountWeek(result.getCountYear() + result.getCountWeek());
+				add(orderVehicleServiceStatistics);
+			});
+		}
+	}
+
+	public void add(OrderVehicleServiceStatistics orderVehicleServiceStatistics) {
+		if(orderVehicleServiceStatistics != null) {
+			OrderVehicleServiceStatistics oldValue = mapper.selectByCompanyIdAndDate(orderVehicleServiceStatistics);
+			if (oldValue == null) {
+				insertSelectiveRe(orderVehicleServiceStatistics);
+			} else {
+				if (orderVehicleServiceStatistics.getArrivalNum() != null) {
+					orderVehicleServiceStatistics.setArrivalNum(orderVehicleServiceStatistics.getArrivalNum() + oldValue.getArrivalNum());
+				}
+				if (orderVehicleServiceStatistics.getDepartureNum() != null) {
+					orderVehicleServiceStatistics.setDepartureNum(orderVehicleServiceStatistics.getDepartureNum() + oldValue.getDepartureNum());
+				}
+				if (orderVehicleServiceStatistics.getRentNum() != null) {
+					orderVehicleServiceStatistics.setRentNum(orderVehicleServiceStatistics.getRentNum() + oldValue.getRentNum());
+				}
+				BeanUtil.copyProperties(orderVehicleServiceStatistics, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+				updateSelectiveByIdRe(oldValue);
+			}
+		}
+	}
+
+	//添加记录
+	public void addAll() {
+		DateTime dateTime = DateTime.parse("2019-08-01");
+		for(DateTime curDate = dateTime.plusDays(1); curDate.compareTo(DateTime.now()) < 0; curDate = curDate.plusDays(1)) {
+			countVehicleServiceNum(curDate);
+			getAllOrder(curDate);
+		}
+		if (MapUtils.isNotEmpty(mapMap)) {
+			for (Map.Entry<Integer, Map<String, Integer>> entry : mapMap.entrySet()) {
+				if (MapUtils.isNotEmpty(entry.getValue())) {
+					OrderVehicleServiceStatistics orderVehicleServiceStatistics = new OrderVehicleServiceStatistics();
+					orderVehicleServiceStatistics.setCompanyId(entry.getKey());
+					for (Map.Entry<String, Integer> values : entry.getValue().entrySet()) {
+						if (StringUtils.isNotBlank(values.getKey()) && StringUtils.isNotBlank(values.getValue() + "")) {
+							DateTime dateTime1 = DateTime.parse(values.getKey());
+							orderVehicleServiceStatistics.setCountDate(dateTime1.toDate());
+							orderVehicleServiceStatistics.setRentNum(values.getValue());
+							orderVehicleServiceStatistics.setCountYear(dateTime1.getYear() + "");
+							orderVehicleServiceStatistics.setCountMonth(dateTime1.getYear() + "" + dateTime1.getMonthOfYear() + "");
+							orderVehicleServiceStatistics.setCountWeek(dateTime1.getYear() + "" + dateTime1.getWeekOfWeekyear() + "");
+							add(orderVehicleServiceStatistics);
+						}
+					}
+				}
+			}
+		}
+		mapMap.clear();
+	}
+
+	//添加记录
+	@Scheduled(cron = "0 0 2 * * *")
+	public void add() {
+		countVehicleServiceNum(DateTime.now());
+		getAllOrder(DateTime.now());
+		if (MapUtils.isNotEmpty(mapMap)) {
+			for (Map.Entry<Integer, Map<String, Integer>> entry : mapMap.entrySet()) {
+				if (MapUtils.isNotEmpty(entry.getValue())) {
+					OrderVehicleServiceStatistics orderVehicleServiceStatistics = new OrderVehicleServiceStatistics();
+					orderVehicleServiceStatistics.setCompanyId(entry.getKey());
+					for (Map.Entry<String, Integer> values : entry.getValue().entrySet()) {
+						if (StringUtils.isNotBlank(values.getKey()) && StringUtils.isNotBlank(values.getValue() + "")) {
+							DateTime dateTime1 = DateTime.parse(values.getKey());
+							orderVehicleServiceStatistics.setCountDate(dateTime1.toDate());
+							orderVehicleServiceStatistics.setRentNum(values.getValue());
+							orderVehicleServiceStatistics.setCountYear(dateTime1.getYear() + "");
+							orderVehicleServiceStatistics.setCountMonth(dateTime1.getYear() + "" + dateTime1.getMonthOfYear() + "");
+							orderVehicleServiceStatistics.setCountWeek(dateTime1.getYear() + "" + dateTime1.getWeekOfWeekyear() + "");
+							add(orderVehicleServiceStatistics);
+						}
+					}
+				}
+			}
+		}
+		mapMap.clear();
+	}
+
+}

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

@@ -22,7 +22,7 @@ import java.util.Enumeration;
  * @see FeignHeadConfiguration
  * @since JDK1.8
  */
-@Configuration
+//@Configuration
 @Slf4j
 public class FeignHeadConfiguration {
 

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

@@ -6,11 +6,13 @@ import com.xxfc.platform.order.pojo.QueryCriteria;
 import com.xxfc.platform.order.pojo.bg.BgOrderListVo;
 import com.xxfc.platform.order.pojo.dto.MemberOrderBo;
 import com.xxfc.platform.order.pojo.dto.MemberOrderFindDTO;
+import com.xxfc.platform.order.pojo.dto.OrderDTO;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -41,7 +43,12 @@ 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);
 
     List<Achievement> selectTotalStatistical(QueryCriteria queryCriteria);
 
+    List<OrderDTO> selectBaeOrderByOrderIds(@Param("orderIds") List<Integer> orderIds);
 }