Merge branch 'staff-statistics' into dev

# Conflicts:
#	ace-common/src/main/java/com/github/wxiaoqi/security/common/enumconstant/LevelEnum.java
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/OrderDTO.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java
#	xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
#	xx-order/xx-order-server/src/main/resources/mapper/OrderAccountMapper.xml
#	xx-order/xx-order-server/src/test/java/ServiceTest.java
#	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 org.assertj.core.util.Lists;
 
+import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
@@ -15,9 +15,9 @@ import java.util.stream.Collectors;
  * @data 2019/11/13 17:23
  */
 public enum LevelEnum {
-    DIAMOND(3,"钻石"),
-    GOLD(2,"黄金"),
-    GENERAL(1,"普通");
+    DIAMOND(3, "钻石"),
+    GOLD(2, "黄金"),
+    GENERAL(1, "普通");
 
     LevelEnum(Integer level, String desc) {
         this.level = level;
@@ -25,18 +25,18 @@ public enum LevelEnum {
     }
 
 
-    public static LevelEnum getLevelEnumByLevel(Integer level){
+    public static LevelEnum getLevelEnumByLevel(Integer level) {
         return levelMap.get(level);
     }
 
     private Integer level;
     private String desc;
-    private static  Map<Integer, LevelEnum> levelMap;
+    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 = Lists.newArrayList(levelMap.keySet());
+        levels = new ArrayList<>(levelMap.keySet());
     }
 
     public Integer getLevel() {
@@ -55,4 +55,3 @@ public enum LevelEnum {
         this.desc = desc;
     }
 }
-

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 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/UserDetailBo.java → ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/bo/UserStaffBo.java

@@ -4,6 +4,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 /**
  * @author libin
  * @version 1.0
@@ -13,10 +16,18 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class UserDetailBo {
-     private Integer userId;
-     private String userName;
-     private String phone;
-     private Integer postionId;
-     private String postionName;
+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 Integer userPostionId;
+    private Integer companyId;
+}

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;
 
@@ -163,4 +168,17 @@ public interface UserFeign {
     boolean isCollectionByTypeAndTypeId(@RequestParam("userId") Integer userId,
                                         @RequestParam(value = "type") int type,
                                         @RequestParam("id") Integer typId);
+    @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,18 @@ 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.findAllStaffsByCompanyIdAndPostionIdWithPage(staffStatisticsFindDTO));
+    }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

+package com.github.wxiaoqi.security.admin.rest.admin;
+
+import com.github.wxiaoqi.security.admin.biz.StaffStatisticsBiz;
+import com.github.wxiaoqi.security.admin.dto.StaffStatisticsFindDTO;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import 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);
+       }
+}

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

@@ -66,7 +66,7 @@
             #{userId}
         </foreach>
 
-  </select>
+    </select>
 
 
     <select id="getUserIdByUsername" resultType="java.lang.Integer" parameterType="java.lang.String">
@@ -200,7 +200,6 @@
         <if test="memberLevel == -1">
             and m.member_level in (select level from base_user_member_level)
         </if>
-
         <if test="registrationTimeBegin !=null  ">
             and l.createtime &gt;= #{registrationTimeBegin}
         </if>
@@ -235,4 +234,47 @@
         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="findAllStaffsByCompanyIdAndPostionIdWithPage"
+            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
+        <if test="userPostionId!=null">
+          and  aud.`position_id`=#{userPostionId}
+        </if>
+        <if test="companyId!=null">
+          and  aupt.`company_id`=#{companyId}
+        </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">
@@ -151,4 +151,27 @@ FROM
         </if>) AS audd ON audd.userid = ausw.user_id
       ORDER BY ausw.crt_time DESC
     </select>
+
+    <select id="statisticsStatffSellerWaterByUserIdsAndTime"
+            resultType="com.github.wxiaoqi.security.admin.dto.AppUserSellingWaterDTO">
+        SELECT
+   `auswu`.user_id, ( IFNULL(auswu.upIncome,0) - IFNULL(auswd.dowIncome,0) ) AS `commission`
+   FROM
+    ( SELECT `user_id` as `userId`, IFNULL(SUM( commission ),0) AS upIncome FROM `app_user_selling_water` where STATUS = 0 and waiting=1
+    AND `crt_time` between #{startTime} and #{endTime}
+    <if test="userIds!=null and userIds.size!=0">
+        AND `user_id` IN <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+         #{userId}
+    </foreach>
+    </if> group by user_id) AS `auswu`
+     left join
+    ( SELECT `user_id`,IFNULL(SUM( commission ),0) AS `dowIncome` FROM `app_user_selling_water` where STATUS = 1 and waiting=1
+     and `crt_time` between #{startTime} and #{endTime}
+    <if test="userIds!=null and userIds.size!=0">
+        AND `user_id` IN <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+        #{userId}
+    </foreach>
+    </if> group by user_id) AS `auswd`
+    on auswd.user_id=auswu.user_id
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -46,7 +46,7 @@ public class StaffStatistics implements Serializable {
     protected String weekOfYear;
 
     @ApiModelProperty("员工所属公司id")
-    @Column(name = "compnay_id")
+    @Column(name = "company_id")
     private Integer companyId;
 
     @ApiModelProperty("公司名称")
@@ -96,4 +96,8 @@ public class StaffStatistics implements Serializable {
     @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/dto/OrderDTO.java

@@ -35,6 +35,9 @@ public class OrderDTO {
     private JSONObject data;
     private Integer damageSafe;
     private BigDecimal deposit;
+    private Integer userId;
+    private Integer postionId;
+
     /**
      * 费用其他明细 租车使用
      */

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

@@ -23,5 +23,5 @@ public class StaffStatisticsFindDTO extends PageParam {
      private Date endDate;
      private String companyName;
      private Integer userPostionId;
-     private List<String> companyIds;
+     private List<Integer> companyIds;
 }

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

@@ -135,8 +135,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
     }
 
     public List<OrderListVo> listOrder(Map<String, Object> paramMap) {
-
-        return mapper.listOrder(paramMap);
+        List<OrderListVo> orderListVos = mapper.listOrder(paramMap);
+        return orderListVos;
     }
 
     public List<OrderPageVO> getRentVehicle(Map<String, Object> paramMap) {
@@ -854,11 +854,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
             switch (sign) {
                 case 2:
                     sendMsgDTO.setRoutKey(KEY_ORDER_CANCEL);
-//                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_CANCEL, JSONUtil.toJsonStr(orderMQDTO));
                     break;
                 case 4:
                     sendMsgDTO.setRoutKey(KEY_ORDER_PAY);
-//                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_PAY, JSONUtil.toJsonStr(orderMQDTO));
                     break;
                 case 6:
                     sendMsgDTO.setRoutKey(KEY_ORDER_FINLISH);
@@ -890,6 +888,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
     public UserFeign getUserFeign() {
         return userFeign;
     }
+
     /**
      * 订单查询类
      */
@@ -912,11 +911,16 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         return Lists.newArrayList();
     }
 
-    public List<OrderDTO> selectOrdersByTypeAndTime(List<Integer> types, Date startDate, Date endDate) {
-        List<OrderDTO>  orderDTOS = mapper.selectOrdersByTypeAndTime(types,startDate,endDate);
+    public List<OrderDTO> selectOrdersByTypeAndTime(List<Integer> types,Integer hasPay, Date startDate, Date endDate) {
+        List<OrderDTO>  orderDTOS = mapper.selectOrdersByTypeAndTime(types,hasPay,startDate,endDate);
         return CollectionUtils.isEmpty(orderDTOS)?Collections.EMPTY_LIST:orderDTOS;
     }
 
+    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);
     }

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

@@ -655,8 +655,20 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
      * @param endDate
      * @return
      */
-    public List<OrderAccountBo> selectByTypeAndDate(Integer orderType,Date startDate, Date endDate) {
+    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;
+    }
 }
\ 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/jobhandler/SaffStatisticsJobHandler.java

+package com.xxfc.platform.order.jobhandler;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.vo.WalletPostionVo;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.order.biz.StaffStatisticsBiz;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.IJobHandler;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 员工业绩统计job
+ * @data 2019/11/26 10:12
+ */
+@Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@Slf4j
+public class SaffStatisticsJobHandler extends IJobHandler {
+    private final StaffStatisticsBiz staffStatisticsBiz;
+    private final VehicleFeign vehicleFeign;
+    private final UserFeign userFeign;
+    @Override
+    public ReturnT<String> execute(String arg) throws Exception {
+        //1.查询公司
+        Map<Integer, String> companyMap = vehicleFeign.findCompanyMap();
+        Date date= null;
+         if (StringUtils.hasText(arg)){
+             date = DateUtil.parse(arg,"yyyy-MM-dd");
+         }else {
+             date = DateUtil.yesterday().toJdkDate();
+         }
+        Date startDate = DateUtil.beginOfDay(date).toJdkDate();
+        Date endDate = DateUtil.endOfDay(date).toJdkDate();
+        ObjectRestResponse<List<WalletPostionVo>> response = userFeign.findAllPostions();
+
+
+        Map<Integer, String> postionMap = response.getData().stream().collect(Collectors.toMap(WalletPostionVo::getId, WalletPostionVo::getName));
+        staffStatisticsBiz.staffStatisticsJob(startDate,endDate,companyMap,postionMap);
+        return ReturnT.SUCCESS;
+    }
+}

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

@@ -7,7 +7,7 @@ import com.xxfc.platform.order.pojo.dto.MemberOrderFindDTO;
 import com.xxfc.platform.order.pojo.dto.OrderDTO;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
-import org.springframework.data.repository.query.Param;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.Date;
@@ -39,10 +39,12 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
 
 	List<MemberOrderBo> findMemberOrders(MemberOrderFindDTO memberOrderFindDTO);
 
+	public List<BgOrderListVo> getAllOrderList(Map<String, Object> paramMap);
+
     List<OrderDTO> selectOrdersByTypeAndTime(@Param("types") List<Integer> types,
+											 @Param("hasPay") Integer hasPay,
 											 @Param("startDate") Date startDate,
 											 @Param("endDate") Date endDate);
-	public List<BgOrderListVo> getAllOrderList(Map<String, Object> paramMap);
-
 
+    List<OrderDTO> selectBaeOrderByOrderIds(@Param("orderIds") List<Integer> orderIds);
 }

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.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 com.xxfc.platform.order.entity.OrderAccount;
+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.List;
+import java.util.Date;
+import java.util.List;
 
 
 /**
  * 订单帐目
- *
+ * 
  * @author zhoujw
  * @email 18178966185@163.com
  * @date 2019-09-09 15:51:16
@@ -24,4 +25,8 @@ public interface OrderAccountMapper extends Mapper<OrderAccount> {
     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);
 }

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

@@ -24,6 +24,7 @@ import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mqhandler.RabbitProduct;
 import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
+import com.xxfc.platform.order.pojo.dto.OrderDTO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.CancelOrderDTO;
 import com.xxfc.platform.order.pojo.order.OrderAboutParamDTO;
@@ -473,4 +474,12 @@ public class BaseOrderController extends CommonBaseController implements UserRes
 
         return ObjectRestResponse.succ();
     }
+
+    @RequestMapping(value = "/basebase/aaa", method = RequestMethod.GET)
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public ObjectRestResponse<List<OrderDTO>> findOrdersByorderId(@RequestParam(value = "orderIds") String orderIds){
+        return ObjectRestResponse.succ();
+                //ObjectRestResponse.succ(baseOrderBiz.selectBaeOrderByOrderIds(orderIds));
+    }
 }

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

 package com.xxfc.platform.order.rest.background;
 
+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.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.rpc.OrderListBiz;
+import com.xxfc.platform.order.pojo.dto.OrderDTO;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -18,9 +19,18 @@ public class OrderListController {
     @Autowired
     OrderListBiz orderListBiz;
 
+    @Autowired
+    private BaseOrderBiz baseOrderBiz;
+
     @GetMapping("/list")
     public ObjectRestResponse<List<OrderPageVO>> getOrderList(@RequestParam("dateTime")Long dateTime, @RequestParam("type")Integer type, @RequestParam("status")Integer status) {
         return orderListBiz.getOrderList(dateTime, type, status);
     }
 
+    @GetMapping(value = "/basebase/findByOrderIds")
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public ObjectRestResponse<List<OrderDTO>> findOrdersByorderId(@RequestParam(value = "orderIds") List<Integer> orderIds){
+        return  ObjectRestResponse.succ(baseOrderBiz.selectBaeOrderByOrderIds(orderIds));
+    }
 }

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

@@ -116,14 +116,14 @@
     <select id="listOrder" parameterType="Map" resultMap="orderListMap">
         select b.*
         <if test="type==1">
-            ,i.detail as carArticlesJson
+            ,i.detail  as carArticlesJson
         </if>
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
         LEFT JOIN order_tour_detail t on t.order_id = b.id
         LEFT JOIN order_member_detail m on m.order_id = b.id
         <if test="type==1">
-            LEFT JOIN (select * from order_item where type = 104) i on b.id = i.order_id
+            LEFT JOIN (select * from  order_item where type = 104) i on  b.id = i.order_id
         </if>
         <where>
             <if test="crtUser != null">
@@ -329,12 +329,12 @@
         select b.*
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
-        where b.type = 1 and b.status &gt;= 4
+        where b.type = 2 and b.status &gt;= 4
         <if test="startTime != null and status == 1">
             and r.start_time between #{startTime} and #{endTime}
         </if>
         <if test="startTime != null and status == 2">
-            and r.end_time between #{startTime} and #{endTime}
+            and r.start_time between #{startTime} and #{endTime}
         </if>
     </select>
 
@@ -349,7 +349,7 @@
     </select>
 
     <select id="findMemberOrders" resultType="com.xxfc.platform.order.pojo.dto.MemberOrderBo">
-        select bo.*,omd.member_level AS `memberLevel` from (
+    select bo.*,omd.member_level AS `memberLevel` from (
         SELECT
         `id`,
         `no` AS `orderNo`,
@@ -403,19 +403,24 @@
             </foreach>
         </if>
         ) AS `bo`
-        INNER JOIN (select * from `order_member_detail` where 1=1
+        INNER JOIN (select  * from `order_member_detail` where  1=1
         <if test="level!=null">
-            and `member_level`=#{level}
+          and  `member_level`=#{level}
         </if>
         ) AS `omd` ON omd.order_id=bo.id
         ORDER BY bo.`creatTime` DESC
     </select>
 
     <select id="selectOrdersByTypeAndTime" resultType="com.xxfc.platform.order.pojo.dto.OrderDTO">
-        select bo.*,omd.memberLevel,IFNULL(IFNULL(orvd.start_company_id,otd.start_company_id),`parent_user_company_id`) AS `companyId`,orvd.deposit,orvd.cost_detail_extend AS `costDetailExtend` from (select `id`,`type`,`status`,`order_amount` AS `orderAmount`, `real_amount`AS
+        select bo.id,bo.type,bo.status,bo.order_amount,bo.real_amount,bo.order_origin,bo.parent_user_id as `userId`,bo.parent_postion_id as `postionId`,
+        bo.has_pay,bo.pay_way,omd.memberLevel,IFNULL(IFNULL(orvd.start_company_id,otd.start_company_id),`parent_user_company_id`) AS `companyId`,orvd.deposit,orvd.cost_detail_extend AS `costDetailExtend` from (select `id`,`type`,`status`,`order_amount` AS `orderAmount`, `real_amount`AS
         `realAmount`,`order_origin` AS `orderOrigin`, `has_pay` AS `hasPay`,
         `pay_way` AS `payWay`
-        from `base_order` where (`crt_time` between #{startDate} and #{endDate} or `pay_time` between #{startDate} and #{endDate} ) and `type` IN <foreach collection="types"
+        from `base_order` where 1=1
+         <if test="hasPay!=null">
+           and   `has_pay`=#{hasPay}
+         </if>
+      and  (`crt_time` between #{startDate} and #{endDate} or `pay_time` between #{startDate} and #{endDate} ) and `type` IN <foreach collection="types"
                                                                                                       item="type"
                                                                                                       open="(" close=")"
                                                                                                       separator=",">
@@ -427,4 +432,11 @@
         LEFT JOIN (select `order_id`,`member_level` AS `memberLevel` from `order_member_detail`) AS `omd` ON
         omd.order_id=bo.id;
     </select>
+
+    <select id="selectBaeOrderByOrderIds" resultType="com.xxfc.platform.order.pojo.dto.OrderDTO">
+        select `id`,`parent_user_company_id` as `companyId` from `base_order` where id in
+        <foreach collection="orderIds" item="orderId" open="(" close=")" separator=",">
+            #{orderId}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xxfc.platform.order.mapper.OrderAccountMapper">
-    <select id="getOrderAccountByOrderType" parameterType="com.xxfc.platform.order.pojo.Term"
-            resultType="com.xxfc.platform.order.pojo.account.OrderAccountDTO">
+    <select id="getOrderAccountByOrderType" parameterType="com.xxfc.platform.order.pojo.Term"  resultType="com.xxfc.platform.order.pojo.account.OrderAccountDTO">
         SELECT
         <if test="subdivide !=null and subdivide ==1">
             date( FROM_UNIXTIME( a.crt_time / 1000 ) ) as oneDay,
@@ -28,7 +27,7 @@
         AND
         b.type = #{orderType}
         <if test="startTime != null">
-            AND a.crt_time <![CDATA[>= ]]>  #{startTime}
+            AND  a.crt_time <![CDATA[>= ]]>  #{startTime}
         </if>
         <if test="endTime != null">
             AND a.crt_time &gt; endTime
@@ -62,7 +61,7 @@
             bo.order_origin,
             bo.pay_way,
             bo.has_pay,
-            brvd.start_company_id AS `companyId`,
+            IFNULL(brvd.start_company_id,IFNULL(otd.start_company_id,bo.parent_user_company_id)) AS `companyId`,
             brvd.cost_detail_extend AS `costDetailExtend`,
             brvd.damage_safe AS `damageSafe`,
             omd.member_level AS `memberLevel`
@@ -71,7 +70,38 @@
             `order_account` AS `oa`
             LEFT JOIN `base_order` AS `bo` ON bo.id = oa.order_id
             LEFT  JOIN `order_rent_vehicle_detail` AS `brvd` ON brvd.order_id=oa.order_id
+             LEFT JOIN `order_tour_detail` as `otd` ON otd.order_id=oa.order_id
             LEFT JOIN `order_member_detail` AS `omd` ON omd.order_id=oa.order_id
             WHERE bo.type=#{orderType} AND `oa`.account_status=1 AND oa.`crt_time` BETWEEN #{startTime} AND #{endTime}
     </select>
+
+    <select id="selectByDateAndStatffIds" resultType="com.xxfc.platform.order.pojo.account.OrderAccountBo">
+            oa.*,
+            bo.id,
+            bo.`status`,
+            bo.order_origin,
+            bo.pay_way,
+            bo.has_pay,
+            bo.parent_user_id as `userId`,
+            bo.parent_position_id as `postionId`,
+            IFNULL(brvd.start_company_id,IFNULL(otd.start_company_id,bo.parent_user_company_id)) AS `companyId`,
+            brvd.cost_detail_extend AS `costDetailExtend`,
+            brvd.damage_safe AS `damageSafe`,
+            omd.member_level AS `memberLevel`
+
+        FROM
+            `order_account` AS `oa`
+            LEFT JOIN `base_order` AS `bo` ON bo.id = oa.order_id
+            LEFT  JOIN `order_rent_vehicle_detail` AS `brvd` ON brvd.order_id=oa.order_id
+            LEFT JOIN `order_tour_detail` as `otd` ON otd.order_id=oa.order_id
+            LEFT JOIN `order_member_detail` AS `omd` ON omd.order_id=oa.order_id
+            WHERE  `oa`.account_status=1
+            AND oa.`crt_time` BETWEEN #{startDate} AND #{endDate}
+             <if test="staffUserIds!=null and staffUserIds.size>0">
+                and bo.id IN <foreach collection="staffUserIds" item="staffId" open="(" close=")" separator=",">
+                  #{staffId}
+             </foreach>
+             </if>
+
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -2,7 +2,9 @@ import com.xxfc.platform.order.OrderApplication;
 import com.xxfc.platform.order.biz.DailyOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.OrderStatisticsBiz;
 import com.xxfc.platform.order.jobhandler.BaseOrderStatisticsJobHandler;
+import com.xxfc.platform.order.jobhandler.SaffStatisticsJobHandler;
 import com.xxfc.platform.order.pojo.HomePageOrderData;
+import lombok.SneakyThrows;
 import org.joda.time.DateTime;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,6 +35,9 @@ public class ServiceTest {
     @Autowired
     private BaseOrderStatisticsJobHandler handler;
 
+    @Autowired
+    private SaffStatisticsJobHandler statisticsJobHandler;
+
     @Test
     public void testSchedu(){
 
@@ -77,5 +82,10 @@ public class ServiceTest {
         handler.execute("2019-09-29");
     }
 
+    @Test
+    @SneakyThrows
+    public void testStaffStatisticsJob(){
+        statisticsJobHandler.execute("");
+    }
 
 }