Merge branch 'master' into feature-delay-add

# Conflicts:
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

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

@@ -40,6 +40,15 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
     private Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
     @Value("${spring.application.name}")
     private String applicationName;
+
+    @Value("${email.log.account}")
+    private  String emailLogAccount;
+
+    @Value("${email.log.title}")
+    private String emailLogTitle;
+
+    @Value("${email.log.host}")
+    private String emailLogHost;
     /**
      * 在controller里面内容执行之前，校验一些参数不匹配啊，Get post方法不对啊之类的
      */
@@ -77,15 +86,6 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
         if(0 == ex.getStatus()) {
             response.setStatus(500);
         }
-        Map<String, String> map = new HashMap<>();
-        map.put("toUser", "jiaoruizhen@126.com");
-        map.put("subject", "服务器异常");
-        map.put("content", ex.toString() + ":" +ex.getMessage());
-        try {
-            HttpUtils.doPost("http://10.5.52.3:8765","/api/universal/mail/app/unauth/send", map);
-        } catch (Exception e) {
-            logger.error(e.getMessage());
-        }
         return new BaseResponse(ex.getStatus(), ex.getMessage());
     }
 
@@ -94,27 +94,27 @@ 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);
             Map<String, String> map = new HashMap<>();
-            map.put("toUser", "jiaoruizhen@126.com");
-            map.put("subject", "服务器异常");
+            map.put("toUser", emailLogAccount);
+            map.put("subject", emailLogTitle);
             map.put("content", initCommonLogPrePart()+ ":" +stringWriter.toString());
             try {
-                HttpUtils.doPost("http://10.5.52.3:8765","/api/universal/mail/app/unauth/send", map);
+                HttpUtils.doPost(emailLogHost,"/api/universal/mail/app/unauth/send", map);
             } catch (Exception e) {
                 logger.error(e.getMessage());
             }
             return new BaseResponse(5000, "Server exception: " + ex.getMessage());
         }
         Map<String, String> map = new HashMap<>();
-        map.put("toUser", "jiaoruizhen@126.com");
-        map.put("subject", "服务器异常");
+        map.put("toUser", emailLogAccount);
+        map.put("subject", emailLogTitle);
         map.put("content", initCommonLogPrePart()+ ":" + ex.toString() + ":" + ex.getMessage());
         try {
-            HttpUtils.doPost("http://10.5.52.3:8765","/api/universal/mail/app/unauth/send", map);
+            HttpUtils.doPost(emailLogHost,"/api/universal/mail/app/unauth/send", map);
         } catch (Exception e) {
             logger.error(e.getMessage());
         }

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

@@ -26,10 +26,19 @@ public class PlatformExceptionHandler {
     @Value("${spring.application.name}")
     private String applicationName;
 
+    @Value("${email.log.account}")
+    private  String emailLogAccount;
+
+    @Value("${email.log.title}")
+    private String emailLogTitle;
+
+    @Value("${email.log.host}")
+    private String emailLogHost;
+
     @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());
@@ -40,16 +49,16 @@ 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);
             Map<String, String> map = new HashMap<>();
-            map.put("toUser", "jiaoruizhen@126.com");
-            map.put("subject", "服务器异常");
+            map.put("toUser", emailLogAccount);
+            map.put("subject", emailLogTitle);
             map.put("content", initCommonLogPrePart()+ ":" +stringWriter.toString());
             try {
-                HttpUtils.doPost("http://10.5.52.3:8765","/api/universal/mail/app/unauth/send", map);
+                HttpUtils.doPost(emailLogHost,"/api/universal/mail/app/unauth/send", map);
             } catch (Exception ex) {
                 log.error(ex.getMessage());
             }
@@ -57,11 +66,11 @@ public class PlatformExceptionHandler {
         }
         log.error("Server exception: ", e);
         Map<String, String> map = new HashMap<>();
-        map.put("toUser", "jiaoruizhen@126.com");
-        map.put("subject", "服务器异常");
+        map.put("toUser", emailLogAccount);
+        map.put("subject", emailLogTitle);
         map.put("content", initCommonLogPrePart()+ ":" + e.toString() + ":" + e.getMessage());
         try {
-            HttpUtils.doPost("http://10.5.52.3:8765","/api/universal/mail/app/unauth/send", map);
+            HttpUtils.doPost(emailLogHost,"/api/universal/mail/app/unauth/send", map);
         } catch (Exception ex) {
             log.error(ex.getMessage());
         }
@@ -83,7 +92,6 @@ public class PlatformExceptionHandler {
         HttpServletRequest request = servletRequestAttributes.getRequest();//获取request
         StringBuilder stringBuilder = new StringBuilder();
         //request 获得头部
-        stringBuilder.append(request.getHeader("app"));
         LocalDateTime startTime= LocalDateTime.now();//开始时间
         stringBuilder.append("》》" +startTime.toString());
         stringBuilder.append("》》" +request.getServletPath());
@@ -91,4 +99,5 @@ public class PlatformExceptionHandler {
         return stringBuilder.toString();
     }
 
+
 }

ace-common/src/main/java/com/github/wxiaoqi/security/common/msg/auth/PageResult.java

@@ -5,6 +5,10 @@ import lombok.Data;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * 手动给集合分页
+ * @author Administrator
+ */
 @Data
 public class PageResult<M> {
     /** 页码 */

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;
 
@@ -158,4 +163,26 @@ public interface UserFeign {
                                                     @RequestParam(value = "cono",required = false) String cono,
                                                     @RequestParam(value = "reason",required = false) String reason,
                                                     @RequestParam(value = "isSuccess") Boolean isSuccess);
+
+    /**
+     * 通过公司id,获取员工的下级用户id
+     * @param parentCompanyId
+     * @return
+     */
+    @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/AppUserPositionTempBiz.java

@@ -345,4 +345,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
     }
 
 
+    public List<Integer> getUserIdByParentCompany(List<Integer> parentCompanyId) {
+       return mapper.getUserIdByParentCompany(parentCompanyId);
+    }
 }

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;
@@ -26,4 +28,9 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
 
     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/AppUserPositionTempMapper.java

@@ -3,8 +3,12 @@ package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
 import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 /**
  * 用户身份职位表
  * 
@@ -17,4 +21,6 @@ public interface AppUserPositionTempMapper extends Mapper<AppUserPositionTemp> {
 
     @Insert("INSERT IGNORE INTO `app_user_position_temp`(`user_id`,`phone`,`name`,`position_id`,`crt_time`)VALUES(#{userId},#{phone},#{name},#{positionId},#{crtTime})")
     void insertWithIgnoreRepeat(AppUserPositionTemp appUserPositionTemp);
+
+    List<Integer> getUserIdByParentCompany(@Param("parentCompanyId") List<Integer> parentCompanyId);
 }

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;
@@ -342,7 +343,7 @@ public class AppUserController extends CommonBaseController{
     }
 
     @PostMapping("/bind")
-    private ObjectRestResponse accountBinding(@RequestBody AccountBindDTO accountBindDTO, HttpServletRequest request){
+    public ObjectRestResponse accountBinding(@RequestBody AccountBindDTO accountBindDTO, HttpServletRequest request){
          try {
              IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
             return appUserLoginBiz.bindAccount(accountBindDTO, Integer.valueOf(infoFromToken.getId()), request);
@@ -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

@@ -13,11 +13,13 @@ import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -169,4 +171,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/AppUserPositionController.java

@@ -107,4 +107,10 @@ public class AppUserPositionController {
        return ObjectRestResponse.succ(dataVO);
     }
 
+
+    @GetMapping("/userid")
+    public List<Integer> getUserIdByParentCompany(@RequestParam("parentCompanyId") List<Integer> parentCompanyId){
+     return appUserPositionTempBiz.getUserIdByParentCompany(parentCompanyId);
+    }
+
 }

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/resources/mapper/AppUserDetailMapper.xml

@@ -234,5 +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/AppUserPositionTempMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.github.wxiaoqi.security.admin.mapper.AppUserPositionTempMapper">
+    <select id="getUserIdByParentCompany" resultType="Integer">
+        SELECT
+        r.uid
+        FROM
+        app_user_position_temp pt
+        LEFT JOIN app_user_detail d ON pt.user_id = d.userid
+        LEFT JOIN (
+        SELECT
+        parent_id AS pid,
+        user_id AS uid
+        FROM
+        app_user_relation
+        WHERE
+        is_del = 0
+        ) r ON d.userid = r.pid
+        WHERE
+        pt.is_del = 0
+        <if test="parentCompanyId != null and parentCompanyId.size() !=0">
+            AND pt.company_id IN
+            <foreach collection="parentCompanyId" index="index" item="pid" open="(" separator="," close=")">
+                #{pid}
+            </foreach>
+        </if>
+
+    </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">
@@ -150,4 +150,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 lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/23 14:39
+ */
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class CompanyPerformanceBo {
+
+     private Date date;
+     private Integer year;
+     private String month;
+     private String weekOfYear;
+     private Integer companyId;
+     private String companyName;
+     private BigDecimal memberAmount;
+     private BigDecimal rentVehilceAmount;
+     private BigDecimal travelAmount;
+     private BigDecimal noDeductibleAmount;
+     private BigDecimal depositAmount;
+     private Integer rentDays;
+     private BigDecimal extralAmount;
+     private Integer  departureNum;
+     private Integer   arrivalNum;
+     private String startDate;
+     private String endDate;
+     private String dateStr;
+
+     public BigDecimal getMemberAmount() {
+          return memberAmount==null?BigDecimal.ZERO:memberAmount;
+     }
+
+     public BigDecimal getRentVehilceAmount() {
+          return rentVehilceAmount==null?BigDecimal.ZERO:rentVehilceAmount;
+     }
+
+     public BigDecimal getTravelAmount() {
+          return travelAmount==null?BigDecimal.ZERO:travelAmount;
+     }
+
+     public BigDecimal getNoDeductibleAmount() {
+          return noDeductibleAmount==null?BigDecimal.ZERO:noDeductibleAmount;
+     }
+
+     public BigDecimal getDepositAmount() {
+          return depositAmount==null?BigDecimal.ZERO:depositAmount;
+     }
+
+     public Integer getRentDays() {
+          return rentDays==null?0:rentDays;
+     }
+
+     public BigDecimal getExtralAmount() {
+          return extralAmount==null?BigDecimal.ZERO:extralAmount;
+     }
+
+     public Integer getDepartureNum() {
+          return departureNum==null?0:departureNum;
+     }
+
+     public Integer getArrivalNum() {
+          return arrivalNum==null?0:arrivalNum;
+     }
+}

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

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

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

+package com.xxfc.platform.order.contant.enumerate;
+
+/**
+ * 账目类型
+ * @author Administrator
+ */
+
+public enum BookkeepingTypeEnum {
+    ENTER(0,"入账"),OUT(1,"出账");
+
+    private Integer code;
+    private String msg;
+    BookkeepingTypeEnum(int code, String msg) {
+        this.code=code;
+        this.msg=msg;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

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

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

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

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

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

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

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/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/Achievement.java

+package com.xxfc.platform.order.pojo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+@ApiModel("订单业绩明细表")
+public class Achievement implements Serializable {
+    private static final Map<Integer, String> orderTypeMap = new HashMap<>();
+    private static final Map<Integer, String> payWayMap = new HashMap<>();
+
+    static {
+        orderTypeMap.put(1, "租车");
+        orderTypeMap.put(2, "旅游");
+        orderTypeMap.put(3, "会员");
+        payWayMap.put(null, "微信");
+        payWayMap.put(1, "微信支付");
+        payWayMap.put(2, "支付宝支付");
+        payWayMap.put(3, "银联支付");
+    }
+
+    @ApiModelProperty(value = "下单用户真实姓名")
+    private String realname;
+    @ApiModelProperty(value = "用户手机号")
+    private String username;
+    @ApiModelProperty(value = "上级姓名")
+    private String parentRealname;
+    @ApiModelProperty(value = "上级职位")
+    private String positionName;
+    @ApiModelProperty(value = "上级手机号")
+    private String parentUsername;
+    @ApiModelProperty(value = "订单所属公司id")
+    private Integer companyId;
+    @ApiModelProperty(value = "订单所属公司名")
+    private String companyName;
+    @ApiModelProperty(value = "优惠价格")
+    private BigDecimal favorablePrice = BigDecimal.ZERO;
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    @Column(name = "crt_time")
+    private String crtTime;
+    @ApiModelProperty(value = "订单号")
+    private String no;
+    @ApiModelProperty(value = "订单类型")
+    private Integer type;
+    @Column(name = "order_amount")
+    @ApiModelProperty("订单总额")
+    private BigDecimal orderAmount = BigDecimal.ZERO;
+    @ApiModelProperty(value = "实际订单额")
+    @Column(name = "real_amount")
+    private BigDecimal realAmount = BigDecimal.ZERO;
+    @Column(name = "pay_way")
+    @ApiModelProperty(value = "支付方式")
+    private Integer payWay;
+
+    public void setCrtTime(Date crtTime) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        this.crtTime = dateFormat.format(crtTime);
+    }
+
+    public String getType() {
+        return orderTypeMap.get(type);
+    }
+
+    public String getPayWay() {
+        return payWayMap.get(payWay);
+    }
+}

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

+package com.xxfc.platform.order.pojo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 总业绩查询条件
+ * @author Administrator
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel
+public class QueryCriteria {
+
+    @ApiModelProperty(value ="开始时间" )
+    private Date startDate;
+
+    @ApiModelProperty(value = "结束时间")
+    private Date endDate;
+
+    @ApiModelProperty(value = "订单类型:1-租车 2-旅游 3-会员 null-全部")
+    private Integer orderType;
+
+    @ApiModelProperty(value = "业绩所属公司")
+    private Integer companyId;
+
+    @ApiModelProperty(value = "支付方式: 1-微信支付 2-支付宝支付 3-银联支付 null-全部")
+    private Integer paymentMethod;
+
+    @ApiModelProperty(value = "账目类型:  0-入账 1-出账")
+    private Integer type = 0;
+
+    @ApiModelProperty("权限公司id")
+    private List<Integer>  jurisdiction;
+
+    @ApiModelProperty(value = "当前页数")
+    private Integer page=1;
+
+    @ApiModelProperty(value = "每页条数")
+    private Integer limit=10;
+ }
+

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

+package com.xxfc.platform.order.pojo;
+
+import com.alibaba.fastjson.JSON;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ReturnOrderAmount implements Serializable {
+    private static final long serialVersionUID = -8445943548965154778L;
+
+    private static final Map<Integer, String> orderTypeMap = new HashMap<>();
+
+    static {
+        orderTypeMap.put(1, "租车");
+        orderTypeMap.put(2, "旅游");
+        orderTypeMap.put(3, "会员");
+    }
+
+    @ApiModelProperty(value = "时间")
+    private Long time;
+    @ApiModelProperty(value = "订单号")
+    private String no;
+    @ApiModelProperty(value = "订单类型")
+    private Integer type;
+    @ApiModelProperty(value = "订单明细")
+    private String accountDetail;
+    @ApiModelProperty(value = "用户姓名")
+    private String realname;
+    @ApiModelProperty(value = "手机号")
+    private String username;
+    @ApiModelProperty(value = "退款说明")
+    private String refundInstruction;
+    @ApiModelProperty(value = "退款明细")
+    private BigDecimal refundAmount = BigDecimal.ZERO;
+    @ApiModelProperty("退还类型")
+    @Column(name = "account_type")
+    private Integer accountType;
+
+    public OrderAccountDetail getAccountDetail() {
+        return StringUtils.hasText(accountDetail) ? JSON.parseObject(accountDetail, OrderAccountDetail.class) : new OrderAccountDetail();
+    }
+
+    public String getType() {
+        return orderTypeMap.get(type);
+    }
+    public Integer getTypeInt() {
+     return this.type;
+    }
+
+    public String getTime() {
+        Date date = new Date(this.time);
+       return  new SimpleDateFormat("yyyy-MM-dd").format(date);
+
+    }
+}

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

+package com.xxfc.platform.order.pojo;
+
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 总业绩报表类
+ *
+ * @author Administrator
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TotalOrderRevenue {
+    @ApiModelProperty(value = "总订单数")
+    private Integer orderSum;
+    @ApiModelProperty(value = "应收总额")
+    private BigDecimal totalReceivables=BigDecimal.ZERO;
+    @ApiModelProperty(value = "优惠金额")
+    private BigDecimal discount=BigDecimal.ZERO;
+    @ApiModelProperty(value = "实收金额")
+    private BigDecimal actual=BigDecimal.ZERO;
+    @ApiModelProperty(value = "数据明细")
+    private  PageInfo<Achievement> achievements;
+
+}

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;
+    private Integer companyId;
+
+    private String groupFiled;
+
+    private long startIndex;
+
+    private long endInex;
+
+    public long getStartIndex() {
+        return getPage()==null?0:getPage()==0?0:(getPage()-1)*getLimit();
+    }
+
+    public long getEndInex() {
+        return getLimit()==null?20:getLimit()==0?20:getLimit();
+    }
+}

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

+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 costDetail;
+    /**
+     * 会员相关
+     */
+    protected Integer memberLevel;
+
+    protected LevelEnum levelEnum;
+
+
+    public LevelEnum getLevelEnum(){
+        return LevelEnum.getLevelEnumByLevel(this.memberLevel);
+    }
+
+    public JSONObject getData() {
+       return StringUtils.hasText(costDetail)?JSONUtil.parseObj(costDetail):new JSONObject();
+    }
+}

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

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

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

@@ -5,6 +5,8 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
@@ -25,11 +27,14 @@ import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.BaseOrderMapper;
+import com.xxfc.platform.order.pojo.Achievement;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
+import com.xxfc.platform.order.pojo.QueryCriteria;
 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;
@@ -53,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;
@@ -920,4 +926,36 @@ 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<OrderPageVO> selectAllCountOrder(Map<String, Object> paramMap) {
+        return mapper.selectAllCountOrder(paramMap);
+    }
+
+
+    public List<Achievement> entryStatisticalData(QueryCriteria queryCriteria) {
+       return mapper.selectTotalStatistical(queryCriteria);
+    }
+
+
+
+    public PageInfo<Achievement> getAchievementPageInfo(QueryCriteria queryCriteria) {
+        PageHelper.startPage(queryCriteria.getPage(),queryCriteria.getLimit());
+        List<Achievement> achievements = mapper.selectTotalStatistical(queryCriteria);
+        return  PageInfo.of(achievements);
+    }
+
+
 }
\ No newline at end of file

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

@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -17,7 +19,10 @@ import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.OrderAccountMapper;
 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;
@@ -31,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;
@@ -38,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;
@@ -428,10 +432,10 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             oad.setDepositAmount(oad.getDepositAmount().subtract(illegalReserve).subtract(csv.getDamagesAmount()));
 
             //设置违约金
-                //设置原来算出的违约金及描述
+            //设置原来算出的违约金及描述
             csv.setViolateAmount(inProgressVO.getViolateAmount());
             csv.setViolateDesc("");
-                //处理更改之后的违约金及描述
+            //处理更改之后的违约金及描述
             handleCrosstownDetail(crosstown, oad, csv);
 
             if(StrUtil.isBlank(csv.getViolateDesc())) {
@@ -440,10 +444,10 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
 
             //退款
             BigDecimal refundAmont = oad.getDepositAmount().add(oad.getOrderAmount());
-                    //crosstown.getRestDeposit().subtract(illegalReserve);
+            //crosstown.getRestDeposit().subtract(illegalReserve);
             //原退款的钱
             BigDecimal originalRefundAmount = oad.getOriginDepositAmount().add(oad.getOriginOrderAmount());
-                    //crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
+            //crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
 
             String refundDesc = "退还车辆押金："+ refundAmont.toString();
 
@@ -649,4 +653,39 @@ 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;
+        if (queryCriteria.getStartDate()!=null) {
+            startTime=queryCriteria.getStartDate().getTime();
+        }
+        if (queryCriteria.getEndDate()!=null) {
+            endTime= queryCriteria.getEndDate().getTime();
+        }
+        return  mapper.outStatisticalData(queryCriteria,startTime,endTime);
+    }
 }
\ No newline at end of file

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

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

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/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/OrderAccountMapper.java

 package com.xxfc.platform.order.mapper;
 
 import com.xxfc.platform.order.entity.OrderAccount;
+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 org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.Date;
 import java.util.List;
 
 
 /**
  * 订单帐目
- * 
+ *
  * @author zhoujw
  * @email 18178966185@163.com
  * @date 2019-09-09 15:51:16
@@ -19,4 +23,14 @@ import java.util.List;
 public interface OrderAccountMapper extends Mapper<OrderAccount> {
 
     List<OrderAccountDTO> getOrderAccountByOrderType(Term term);
+
+    List<OrderAccountBo> selectOrderAccountByOrderTypeAndStartTimeAndEndTime(@Param("orderType") Integer orderType,
+                                                                             @Param("startTime") long startTime,
+                                                                             @Param("endTime") long endTime);
+
+    List<OrderAccountBo> selectByDateAndStatffIds(@Param("startDate") Date startDate,
+                                                  @Param("endDate") Date endDate,
+                                                  @Param("staffUserIds") List<Integer> staffUserIds);
+
+    List<ReturnOrderAmount> outStatisticalData(@Param("queryCriteria")QueryCriteria queryCriteria, @Param("startTime") Long startTime, @Param("endTime")Long endTime);
 }