历史查询的领导人姓名展示

src/main/java/com/ydtech/modules/admin/controller/SysAgencyLeaderController.java

@@ -143,17 +143,6 @@ public class SysAgencyLeaderController extends BaseController {
     /**
      * 查询所有机构负责人的保费抽成明细
      */
-    @PostMapping("/queryExtractFeeList")
-    @ApiOperation(value = "查询所有机构负责人的保费抽成明细")
-    public HttpResult<BasePageResult<AgencyExtractFeeVo>> queryExtractFeeAll(@RequestBody SysAgencyLeaderPageDto sysAgencyLeaderPageDto) {
-        if (sysAgencyLeaderPageDto.getPageNum() == 0) {
-            sysAgencyLeaderPageDto.setPageNum(1);
-        }
-        if (sysAgencyLeaderPageDto.getPageSize() == 0) {
-            sysAgencyLeaderPageDto.setPageSize(10);
-        }
-        return HttpResult.ok("success", this.sysAgencyLeaderService.queryExtractFeeAll(sysAgencyLeaderPageDto));
-    }
 
     @PostMapping("/queryExtractFeeAll")
     @ApiOperation(value = "优化查询所有机构负责人的保费抽成明细")

src/main/java/com/ydtech/modules/admin/controller/SysPartnerController.java

@@ -118,17 +118,6 @@ public class SysPartnerController extends BaseController {
     /**
      * 所有合伙人的抽层费用
      */
-    @PostMapping("/queryPartnerByPages")
-    @ApiOperation(value = "所有合伙人的抽层费用信息")
-    public HttpResult<BasePageResult<AgencyExtractFeeVo>> queryPartnerByPage(@RequestBody SysPartnerPageDto sysPartnerPageDto) {
-        if (sysPartnerPageDto.getPageNum() == 0) {
-            sysPartnerPageDto.setPageNum(1);
-        }
-        if (sysPartnerPageDto.getPageSize() == 0) {
-            sysPartnerPageDto.setPageSize(10);
-        }
-        return HttpResult.ok(this.sysPartnerService.queryPartnerByPage(sysPartnerPageDto));
-    }
     @PostMapping("/queryPartnerByPage")
     @ApiOperation(value = "优化所有合伙人的抽层费用信息")
     public HttpResult<BasePageResult<AgencyExtractFeeVo>> queryPartnerByPages(@RequestBody SysPartnerPageDto sysPartnerPageDto) {

src/main/java/com/ydtech/modules/admin/service/SysAgencyLeaderService.java

@@ -44,7 +44,6 @@ public interface SysAgencyLeaderService extends IService<SysAgencyLeader> {
 
     AgencyExtractFee queryExtractFee(String userId);
 
-    BasePageResult<AgencyExtractFeeVo> queryExtractFeeAll(SysAgencyLeaderPageDto sysAgencyLeaderPageDto);
     BasePageResult<AgencyExtractFeeVo> queryExtractFeeList(SysAgencyLeaderPageDto sysAgencyLeaderPageDto);
 
     BasePageResult<TeamUserInfoVo> queryTeamUser(TeamUserInfoDto teamUserInfoDto);

src/main/java/com/ydtech/modules/admin/service/SysPartnerService.java

@@ -37,7 +37,6 @@ public interface SysPartnerService extends IService<SysPartner> {
 
     boolean deleteById(String id);
 
-    BasePageResult<AgencyExtractFeeVo> queryPartnerByPage(SysPartnerPageDto sysPartnerPageDto);
     BasePageResult<AgencyExtractFeeVo> queryPartnerByPages(SysPartnerPageDto sysPartnerPageDto);
 
     BasePageResult<SysPartnerAPPPageVo> SysPartnerAPPPage(SysPartnerAPPPageDto sysPartnerAPPPageDto);

src/main/java/com/ydtech/modules/admin/service/impl/SysAgencyLeaderServiceImpl.java

@@ -444,37 +444,6 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                         if (CollectionUtil.isNotEmpty(map)) {
                             bigDecimal = bigDecimal.add(map.get("bigDecimal") == null ? BigDecimal.ZERO : map.get("bigDecimal"));
                         }
-
-//                        List<InsOrders> insOrderList;
-//                        //筛选订单，选择时间
-//                        Date updateTime = sysAgencyLeaders.getUpdateTime();
-//                        if (updateTime == null) {
-//                            //机构下所有订单
-//                            insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-//                                    .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
-//                                    .ge(InsOrders::getCreatetime, sysAgencyLeaders.getCreateTime()));
-//                            agencyExtractFee.setStartTime(sysAgencyLeaders.getCreateTime());
-//                        } else {
-//                            insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-//                                    .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
-//                                    .ge(InsOrders::getCreatetime, updateTime));
-//                            agencyExtractFee.setStartTime(updateTime);
-//                        }
-//                        if (insOrderList.size() > 0) {
-//                            List<String> collect = insOrderList.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
-//                            //查询订单下的所有子订单
-//                            List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
-//                                    .in(InsAreaCompany::getOrderno, collect)
-//                                    .eq(InsAreaCompany::getOrderstatus, 3));
-//                            if (insAreaCompanies.size() > 0) {
-//                                //累加每一个子订单的交强险费用+商业险费用+驾意险费用
-//                                BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//                                BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//                                BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//
-//                                bigDecimal = jqpremium.add(sypremium).add(jypremium);
-//                            }
-//                        }
                     }
                 }
                 agencyExtractFee.setSumpremium(bigDecimal);
@@ -543,36 +512,6 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                 if (CollectionUtil.isNotEmpty(map)) {
                     bigDecimal = bigDecimal.add(map.get("bigDecimal") == null ? BigDecimal.ZERO : map.get("bigDecimal"));
                 }
-
-//                List<InsOrders> insOrderList;
-//                //筛选订单，选择时间
-//                Date updateTime = sysAgencyLeaders.getUpdateTime();
-//                if (updateTime == null) {
-//                    //机构下所有订单
-//                    insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-//                            .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
-//                            .ge(InsOrders::getCreatetime, sysAgencyLeaders.getCreateTime()));
-//                    agencyExtractFee.setStartTime(sysAgencyLeaders.getCreateTime());
-//                } else {
-//                    insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-//                            .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
-//                            .ge(InsOrders::getCreatetime, updateTime));
-//                    agencyExtractFee.setStartTime(updateTime);
-//                }
-//                if (insOrderList.size() > 0) {
-//                    List<String> collect = insOrderList.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
-//                    //查询订单下的所有子订单
-//                    List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
-//                            .in(InsAreaCompany::getOrderno, collect)
-//                            .eq(InsAreaCompany::getOrderstatus, 3));
-//                    if (insAreaCompanies.size() > 0) {
-//                        BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//                        BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//                        BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//
-//                        bigDecimal = jqpremium.add(sypremium).add(jypremium);
-//                    }
-//                }
                 agencyExtractFee.setSumpremium(bigDecimal);
                 BigDecimal multiply = bigDecimal.multiply(new BigDecimal(agencyExtractFee.getProportional())
                         .divide(new BigDecimal("100"))).setScale(2, RoundingMode.DOWN);
@@ -604,94 +543,6 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
         return agencyExtractFee;
     }
 
-    @Override
-    public BasePageResult<AgencyExtractFeeVo> queryExtractFeeAll(SysAgencyLeaderPageDto sysAgencyLeaderPageDto) {
-        List<AgencyExtractFeeVo> agencyExtractFeeList = new ArrayList<>();
-
-        Page<SysAgencyLeader> page = new Page<>(sysAgencyLeaderPageDto.getPageNum(), sysAgencyLeaderPageDto.getPageSize());
-        LambdaQueryWrapper<SysAgencyLeader> wrapper = new LambdaQueryWrapper<>();
-        wrapper.like(StringUtils.isNotEmpty(sysAgencyLeaderPageDto.getUserId()), SysAgencyLeader::getUserId, sysAgencyLeaderPageDto.getUserId());
-        wrapper.like(StringUtils.isNotEmpty(sysAgencyLeaderPageDto.getUserName()), SysAgencyLeader::getUserName, sysAgencyLeaderPageDto.getUserName());
-        wrapper.eq(SysAgencyLeader::getDelFlag, 1);
-        wrapper.orderByDesc(SysAgencyLeader::getId);
-
-        Page<SysAgencyLeader> insOrdersPage = page(page, wrapper);
-        List<SysAgencyLeader> records = insOrdersPage.getRecords();
-        if (records.size() > 0) {
-            for (SysAgencyLeader sysAgencyLeaders : records) {
-                AgencyExtractFeeVo agencyExtractFee = new AgencyExtractFeeVo();
-                //总保费
-                BigDecimal bigDecimal = new BigDecimal("0.00");
-                //已提现抽成费用
-                BigDecimal historyFee = new BigDecimal("0.00");
-
-                agencyExtractFee.setUserId(sysAgencyLeaders.getUserId());
-                agencyExtractFee.setUserName(sysAgencyLeaders.getUserName());
-                agencyExtractFee.setDeptId(sysAgencyLeaders.getDeptId());
-                agencyExtractFee.setDeptName(sysAgencyLeaders.getDeptName());
-                agencyExtractFee.setProportional(sysAgencyLeaders.getProportional());
-                List<InsOrders> insOrderList;
-                //筛选订单，选择时间
-                Date updateTime = sysAgencyLeaders.getUpdateTime();
-                if (updateTime == null) {
-                    //机构下所有订单
-                    insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-                            .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
-                            .ge(InsOrders::getCreatetime, sysAgencyLeaders.getCreateTime()));
-                    agencyExtractFee.setStartTime(sysAgencyLeaders.getCreateTime());
-                } else {
-                    insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-                            .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
-                            .ge(InsOrders::getCreatetime, updateTime));
-                    agencyExtractFee.setStartTime(updateTime);
-                }
-                if (insOrderList.size() > 0) {
-                    List<String> collect = insOrderList.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
-                    //查询订单下的所有子订单
-                    List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
-                            .in(InsAreaCompany::getOrderno, collect)
-                            .eq(InsAreaCompany::getOrderstatus, 3));
-                    if (insAreaCompanies.size() > 0) {
-                        BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-
-                        bigDecimal = jqpremium.add(sypremium).add(jypremium);
-                    }
-                }
-                agencyExtractFee.setSumpremium(bigDecimal);
-                BigDecimal multiply = bigDecimal.multiply(new BigDecimal(agencyExtractFee.getProportional())
-                        .divide(new BigDecimal("100"))).setScale(2, RoundingMode.DOWN);
-                agencyExtractFee.setExtractFee(multiply);
-                // 填充 已提现抽成费用和可提现抽成费用
-                List<SysAgencyFeeApproval> sysAgencyFeeApprovals = sysAgencyFeeApprovalMapper.selectList(new LambdaQueryWrapper<SysAgencyFeeApproval>()
-                        .eq(SysAgencyFeeApproval::getUserId, sysAgencyLeaders.getUserId())
-                        .eq(SysAgencyFeeApproval::getStatus, 1));
-                if (sysAgencyFeeApprovals.size() > 0) {
-                    for (SysAgencyFeeApproval sysAgencyFeeApproval : sysAgencyFeeApprovals) {
-                        historyFee = historyFee.add(sysAgencyFeeApproval.getHistoryFee());
-                    }
-                }
-
-                if (!bigDecimal.equals(new BigDecimal("0.00"))) {
-                    //已提现
-                    agencyExtractFee.setHistoryFee(historyFee);
-                    //可提现 = 总抽成-已提现
-                    agencyExtractFee.setCashFee(multiply.subtract(historyFee));
-                } else {
-                    agencyExtractFee.setHistoryFee(new BigDecimal("0.00"));
-                    agencyExtractFee.setCashFee(multiply.subtract(new BigDecimal("0.00")));
-                }
-                agencyExtractFeeList.add(agencyExtractFee);
-
-            }
-
-        }
-
-        return new BasePageResult<>(sysAgencyLeaderPageDto.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
-                agencyExtractFeeList);
-    }
-
     @Override
     public BasePageResult<AgencyExtractFeeVo> queryExtractFeeList(SysAgencyLeaderPageDto sysAgencyLeaderPageDto) {
         List<AgencyExtractFeeVo> agencyExtractFeeList = new ArrayList<>();
@@ -830,17 +681,6 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                     if (CollectionUtil.isNotEmpty(map)) {
                         bigDecimal = bigDecimal.add(map.get("bigDecimal") == null ? BigDecimal.ZERO : (BigDecimal)map.get("bigDecimal"));
                     }
-//                    List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
-//                            .in(InsAreaCompany::getOrderno, collect)
-//                            .eq(InsAreaCompany::getOrderstatus, 3));
-//                    if (insAreaCompanies.size() > 0) {
-//                        //累加每一个子订单的交强险费用+商业险费用+驾意险费用
-//                        BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//                        BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//                        BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//
-//                        bigDecimal = jqpremium.add(sypremium).add(jypremium);
-//                    }
 
                 }
                 teamInformation.setSumpremium(bigDecimal);
@@ -942,38 +782,6 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
 
                                 bigDecimal = bigDecimal.add(map.get("bigDecimal") == null ? BigDecimal.ZERO : map.get("bigDecimal"));
                             }
-//                            List<InsOrders> insOrderList;
-//                            //筛选订单，选择时间
-//                            Date updateTime = sysAgencyLeader.getUpdateTime();
-//                            if (updateTime == null) {
-//                                //机构下所有订单
-//                                insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-//                                        .likeRight(InsOrders::getDeptid, sysDept.getId())
-//                                        .ge(InsOrders::getCreatetime, sysAgencyLeader.getCreateTime()));
-//                                agencyTeamVo.setStartTime(sysAgencyLeader.getCreateTime());
-//
-//                            } else {
-//                                insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-//                                        .likeRight(InsOrders::getDeptid, sysDept.getId())
-//                                        .ge(InsOrders::getCreatetime, updateTime));
-//                                agencyTeamVo.setStartTime(updateTime);
-//                            }
-//
-//                            if (insOrderList.size() > 0) {
-//                                List<String> collect = insOrderList.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
-//                                //查询订单下的所有子订单
-//                                List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
-//                                        .in(InsAreaCompany::getOrderno, collect)
-//                                        .eq(InsAreaCompany::getOrderstatus, 3));
-//                                if (insAreaCompanies.size() > 0) {
-//                                    BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//                                    BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//                                    BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//
-//                                    bigDecimal = jqpremium.add(sypremium).add(jypremium);
-//
-//                                }
-//                            }
 
                         }
 
@@ -1056,19 +864,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                     Long issueNum = (Long)map.get("issueNum");
                     teamUserInfoVo.setIssueNum(issueNum.intValue());
                 }
-//                List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
-//                        .in(InsAreaCompany::getOrderno, orderNoList)
-//                        .eq(InsAreaCompany::getOrderstatus, 3));
-//                if (insAreaCompanies.size() > 0) {
-//                    //累加每一个子订单的交强险费用+商业险费用+驾意险费用
-//                    BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//                    BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//                    BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//
-//                    bigDecimal = jqpremium.add(sypremium).add(jypremium);
-//                }
 //                //出单笔数
-//                teamUserInfoVo.setIssueNum(insAreaCompanies.size());
                 teamUserInfoVo.setSumpremium(bigDecimal);
                 //报价笔数
                 Long quoteNum = insAreaCompanyMapper.selectCount(new LambdaQueryWrapper<InsAreaCompany>()

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -65,12 +65,6 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     @Resource
     private SysUserMapper sysUserMapper;
 
-    @Resource
-    private InsOrdersMapper insOrdersMapper;
-
-    @Resource
-    private InsAreaCompanyMapper insAreaCompanyMapper;
-
     @Resource
     private SysAgencyFeeApprovalMapper sysAgencyFeeApprovalMapper;
     @Resource
@@ -259,126 +253,6 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         return sysPartnerMapper.updateById(partner) > 0;
     }
 
-    @Override
-    public BasePageResult<AgencyExtractFeeVo> queryPartnerByPage(SysPartnerPageDto sysPartnerPageDto) {
-        List<AgencyExtractFeeVo> agencyExtractFeeList = new ArrayList<>();
-
-        Page<SysPartner> page = new Page<>(sysPartnerPageDto.getPageNum(), sysPartnerPageDto.getPageSize());
-        LambdaQueryWrapper<SysPartner> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(SysPartner::getDelFlag, 1);
-        wrapper.like(StringUtils.isNotEmpty(sysPartnerPageDto.getUserId()), SysPartner::getUserId, sysPartnerPageDto.getUserId());
-        wrapper.like(StringUtils.isNotEmpty(sysPartnerPageDto.getUserName()), SysPartner::getUserName, sysPartnerPageDto.getUserName());
-        wrapper.orderByDesc(SysPartner::getId);
-
-        Page<SysPartner> insOrdersPage = page(page, wrapper);
-        List<SysPartner> sysPartnerList = insOrdersPage.getRecords();
-        if (sysPartnerList.size() > 0) {
-            for (SysPartner sysPartner : sysPartnerList) {
-                AgencyExtractFeeVo agencyExtractFee = new AgencyExtractFeeVo();
-                //总保费
-                BigDecimal bigDecimal = new BigDecimal("0.00");
-                //已提现抽成费用
-                BigDecimal historyFee = new BigDecimal("0.00");
-                //填充查询人的姓名和机构
-                agencyExtractFee.setProportional(sysPartner.getProportional());
-                agencyExtractFee.setUserId(sysPartner.getUserId());
-                agencyExtractFee.setUserName(sysPartner.getUserName());
-                SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>()
-                        .eq(SysUser::getId, sysPartner.getUserId())
-                        .ne(SysUser::getStatus, 0));
-                agencyExtractFee.setDeptId(sysUser.getDeptId());
-                SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
-                        .eq(SysDept::getId, sysUser.getDeptId()).eq(SysDept::getDelFlag, 0));
-                agencyExtractFee.setDeptName(sysDept.getName());
-                //查询所有推荐的机构负责人核算总保费
-                List<SysRelationPerson> sysRelationPeople = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                        .eq(SysRelationPerson::getSuggestId, sysPartner.getUserId()).eq(SysRelationPerson::getType, 1));
-                if (sysRelationPeople.size() > 0) {
-                    List<String> agencyLeaderIds = sysRelationPeople.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
-                    for (String agencyLeaderId : agencyLeaderIds) {
-
-                        SysAgencyLeader sysAgencyLeaders = sysAgencyLeaderMapper.selectOne(new LambdaQueryWrapper<SysAgencyLeader>()
-                                .eq(SysAgencyLeader::getUserId, agencyLeaderId)
-                                .eq(SysAgencyLeader::getDelFlag, 1));
-                        if (sysAgencyLeaders != null) {
-                            agencyExtractFee.setProportional(sysPartner.getProportional());
-                            List<InsOrders> insOrderList;
-                            //筛选订单，选择时间
-                            Date updateTime = sysAgencyLeaders.getUpdateTime();
-                            if (updateTime == null) {
-                                //机构下所有订单
-                                insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-                                        .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
-                                        .ge(InsOrders::getCreatetime, sysAgencyLeaders.getCreateTime()));
-                                agencyExtractFee.setStartTime(sysAgencyLeaders.getCreateTime());
-                            } else {
-                                insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-                                        .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
-                                        .ge(InsOrders::getCreatetime, updateTime));
-                                agencyExtractFee.setStartTime(updateTime);
-                            }
-                            if (insOrderList.size() > 0) {
-                                List<String> collect = insOrderList.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
-                                //查询订单下的所有子订单
-                                List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
-                                        .in(InsAreaCompany::getOrderno, collect)
-                                        .eq(InsAreaCompany::getOrderstatus, 3));
-                                if (insAreaCompanies.size() > 0) {
-                                    //累加每一个子订单的交强险费用+商业险费用+驾意险费用
-                                    BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                    BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                    BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-
-                                    bigDecimal = jqpremium.add(sypremium).add(jypremium);
-                                }
-
-                            }
-                        }
-                    }
-                    agencyExtractFee.setSumpremium(bigDecimal);
-                    if (!bigDecimal.equals(new BigDecimal("0.00"))) {
-
-                        BigDecimal multiply = bigDecimal.multiply(new BigDecimal(agencyExtractFee.getProportional())
-                                .divide(new BigDecimal("100"))).setScale(2, RoundingMode.DOWN);
-                        agencyExtractFee.setExtractFee(multiply);
-                    } else {
-                        agencyExtractFee.setExtractFee(new BigDecimal("0.00"));
-                    }
-                    // 填充 已提现抽成费用和可提现抽成费用
-                    List<SysAgencyFeeApproval> sysAgencyFeeApprovals = sysAgencyFeeApprovalMapper.selectList(new LambdaQueryWrapper<SysAgencyFeeApproval>()
-                            .eq(SysAgencyFeeApproval::getUserId, sysPartner.getUserId())
-                            .eq(SysAgencyFeeApproval::getStatus, 1));
-                    if (sysAgencyFeeApprovals.size() > 0) {
-                        for (SysAgencyFeeApproval sysAgencyFeeApproval : sysAgencyFeeApprovals) {
-                            historyFee = historyFee.add(sysAgencyFeeApproval.getHistoryFee());
-                        }
-                    }
-                    BigDecimal extractFee = agencyExtractFee.getExtractFee();
-                    if (!extractFee.equals(new BigDecimal("0.00"))) {
-                        //已提现
-                        agencyExtractFee.setHistoryFee(historyFee);
-                        //可提现 = 总抽成-已提现
-                        agencyExtractFee.setCashFee(extractFee.subtract(historyFee));
-                    } else {
-                        agencyExtractFee.setHistoryFee(new BigDecimal("0.00"));
-                        agencyExtractFee.setCashFee(extractFee.subtract(new BigDecimal("0.00")));
-                    }
-
-                } else {
-                    agencyExtractFee.setSumpremium(BigDecimal.ZERO);
-                    agencyExtractFee.setExtractFee(BigDecimal.ZERO);
-                    agencyExtractFee.setHistoryFee(BigDecimal.ZERO);
-                    agencyExtractFee.setCashFee(BigDecimal.ZERO);
-                }
-                agencyExtractFeeList.add(agencyExtractFee);
-
-            }
-        }
-
-        return new BasePageResult<>(sysPartnerPageDto.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
-                agencyExtractFeeList);
-
-    }
     @Override
     public BasePageResult<AgencyExtractFeeVo> queryPartnerByPages(SysPartnerPageDto sysPartnerPageDto) {
         List<AgencyExtractFeeVo> agencyExtractFeeList = new ArrayList<>();
@@ -555,48 +429,14 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                             if (sysDeptList.size() > 0) {
 
                                 for (SysDept sysDept1 : sysDeptList) {
-
-//                                    List<InsOrders> insOrderList;
-//                                    //筛选订单，选择时间
-//                                    Date updateTime = sysAgencyLeader.getUpdateTime();
-//                                    if (updateTime == null) {
-//                                        //机构下所有订单
-//                                        insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-//                                                .likeRight(InsOrders::getDeptid, sysDept1.getId())
-//                                                .ge(InsOrders::getCreatetime, sysAgencyLeader.getCreateTime()));
-//                                        sysPartnerAPPPageVo.setStartTime(sysAgencyLeader.getCreateTime());
-//
-//                                    } else {
-//                                        insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-//                                                .likeRight(InsOrders::getDeptid, sysDept1.getId())
-//                                                .ge(InsOrders::getCreatetime, updateTime));
-//                                        sysPartnerAPPPageVo.setStartTime(updateTime);
-//                                    }
-//
-//                                    if (insOrderList.size() > 0) {
-//                                        List<String> collect = insOrderList.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
-//                                        //查询订单下的所有子订单
-//                                        List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
-//                                                .in(InsAreaCompany::getOrderno, collect)
-//                                                .eq(InsAreaCompany::getOrderstatus, 3));
-//                                        if (insAreaCompanies.size() > 0) {
-//                                            BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//                                            BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//                                            BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-//
-//                                            bigDecimal = jqpremium.add(sypremium).add(jypremium);
-//                                        }
-//                                    }
                                     //筛选订单，选择时间
                                     Date updateTime = sysAgencyLeader.getUpdateTime();
                                     Date createTime = sysAgencyLeader.getCreateTime();
                                     String dateStr = "";
                                     if (updateTime != null) {
                                         dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(updateTime);
-//                                        sysPartnerAPPPageVo.setStartTime(updateTime);
                                     } else {
                                         dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(createTime);
-//                                        sysPartnerAPPPageVo.setStartTime(createTime);
                                     }
                                     HashMap<String, BigDecimal> map = sysAgencyLeaderMapper.getBigDecimalNum(sysDept1.getId(), dateStr,null,null);
                                     if (CollectionUtil.isNotEmpty(map)) {