修改bug

liujie

2025-07-21 87f979fb201a82ebad5926735ed6dfa75ca004d3

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbCompanyServiceImpl.java

@@ -83,7 +83,9 @@
            queryWrapper.in(TbCompany::getId, tbPermits.stream().map(TbPermit::getCompanyId).collect(Collectors.toList()));
        }
        queryWrapper.eq(TbCompany::getCityCode, query.getCityCode());
        queryWrapper.eq(TbCompany::getAreaCode, query.getAreaCode());
        if(query.getAreaCode()!=null && !"".equals(query.getAreaCode())){
            queryWrapper.eq(TbCompany::getAreaCode, query.getAreaCode());
        }
        queryWrapper.like(StringUtils.isNotEmpty(query.getCompanyName()),TbCompany::getCompanyName, query.getCompanyName());

        if (query.getCompanyCategorys() != null && query.getCompanyCategorys().size() > 0) {
@@ -209,7 +211,16 @@
    @Override
    public Page<MyPushCompanyListVo> getMyPushCompanyList(MyPushCompanyListQuery query, Long userId) {
        Page<MyPushCompanyListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
        return this.baseMapper.getMyPushCompanyList(page, query, userId);
        Page<MyPushCompanyListVo> myPushCompanyList = this.baseMapper.getMyPushCompanyList(page, query, userId);
        for (MyPushCompanyListVo record : myPushCompanyList.getRecords()) {
            if(record.getStatus()!=1){
                TbOrder order = orderService.getOne(new LambdaQueryWrapper<TbOrder>().eq(TbOrder::getCompanyId, record.getId()).ne(TbOrder::getStatus, -1).last("limit 1"));
                if(order!=null){
                    record.setOrderId(order.getId());
                }
            }
        }
        return myPushCompanyList;
    }

    @Override
@@ -219,7 +230,7 @@
        map.put("toBeConfirmed", list.stream().filter(e -> e.getStatus() == 2).count());
        map.put("confirmed", list.stream().filter(e -> e.getStatus() == 3).count());
        map.put("processing", list.stream().filter(e -> e.getStatus() == 4).count());
        map.put("completed", list.stream().filter(e -> e.getStatus() == 5).count());
        map.put("completed", list.stream().filter(e -> e.getStatus() == 5).count() + list.stream().filter(e -> e.getStatus() == 6).count());
        return map;
    }
    @Override
@@ -228,6 +239,7 @@
        TbCompany tbCompany = this.baseMapper.selectById(companyId);
        BeanUtils.copyProperties(tbCompany, companyDetailVo);
        companyDetailVo.setState(tbCompany.getStatus());


        TbIndustry industry = industryService.getById(tbCompany.getCompanyIndustryId());
        companyDetailVo.setCompanyIndustryName(industry.getName());
@@ -249,47 +261,55 @@
        }

        TbOrder order = orderService.getOne(new LambdaQueryWrapper<TbOrder>().eq(TbOrder::getCompanyId, companyId).gt(TbOrder::getStatus, 0).orderByDesc(TbOrder::getCreateTime).last("limit 1"));
        if(order!=null){
        if(order!=null) {
            companyDetailVo.setStatus(order.getStatus());
            companyDetailVo.setSellerFinishTime(order.getSellerFinishTime());
            companyDetailVo.setOrderId(order.getId());
        }
            companyDetailVo.setOrderMoney(order.getPrice());

        List<TbSchedule> list2 = scheduleService.list(new LambdaQueryWrapper<TbSchedule>().eq(TbSchedule::getOrderId, order.getId()).orderByDesc(TbSchedule::getCreateTime));
        List<TbSchedule> collect = list2.stream().filter(e -> StringUtils.isEmpty(e.getParentId())).collect(Collectors.toList());
        for (TbSchedule tbSchedule : collect) {
            List<TbSchedule> collect1 = list2.stream().filter(e -> StringUtils.isNotEmpty(e.getParentId()) && e.getParentId().equals(tbSchedule.getId())).collect(Collectors.toList());
            tbSchedule.setSchedules(collect1);
        }
        companyDetailVo.setSchedules(collect);
        companyDetailVo.setPayTime(order.getPayTime());
        companyDetailVo.setConfirmTime(order.getConfirmTime());

        TbBuyerCompanyInfo one = buyerCompanyInfoService.getOne(new LambdaQueryWrapper<TbBuyerCompanyInfo>().eq(TbBuyerCompanyInfo::getOrderId, order.getId()));
        CustomerInfoVo customerInfoVo = new CustomerInfoVo();
        if(one!=null){
            BeanUtils.copyProperties(one, customerInfoVo);
            String orderId = one.getOrderId();
            List<TbShareholder> list3 = shareholderService.list(new LambdaQueryWrapper<TbShareholder>().eq(TbShareholder::getOrderId, orderId));
            customerInfoVo.setShareHolders(list3);
        }
        companyDetailVo.setCustomerInfoVo(customerInfoVo);
        companyDetailVo.setEstimatedRevenue(order.getPrice().subtract(order.getCommissionPrice()).subtract(order.getCommissionPlatform()));

        TbUser user = userService.getById(order.getUserId());
        companyDetailVo.setCustomerName(user.getUserName());

        // 判断是否要迁区 是否要改名 新增天数
        if(one!=null){
            companyDetailVo.setEstimatedDays(one.getAddDay()+companyDetailVo.getEstimatedDays());
            if(one.getNeedRename()==1){
                companyDetailVo.setSaleMoney( companyDetailVo.getSaleMoney().add(companyDetailVo.getRenameMoney()));
            List<TbSchedule> list2 = scheduleService.list(new LambdaQueryWrapper<TbSchedule>().eq(TbSchedule::getOrderId, order.getId()).orderByDesc(TbSchedule::getCreateTime));
            List<TbSchedule> collect = list2.stream().filter(e -> StringUtils.isEmpty(e.getParentId())).collect(Collectors.toList());
            for (TbSchedule tbSchedule : collect) {
                List<TbSchedule> collect1 = list2.stream().filter(e -> StringUtils.isNotEmpty(e.getParentId()) && e.getParentId().equals(tbSchedule.getId())).collect(Collectors.toList());
                tbSchedule.setSchedules(collect1);
            }
            if(one.getNewDistrict()==1){
                companyDetailVo.setSaleMoney( companyDetailVo.getSaleMoney().add(companyDetailVo.getRelocationAreaMoney()));
            companyDetailVo.setSchedules(collect);
            companyDetailVo.setPayTime(order.getPayTime());
            companyDetailVo.setConfirmTime(order.getConfirmTime());

            TbBuyerCompanyInfo one = buyerCompanyInfoService.getOne(new LambdaQueryWrapper<TbBuyerCompanyInfo>().eq(TbBuyerCompanyInfo::getOrderId, order.getId()));
            CustomerInfoVo customerInfoVo = new CustomerInfoVo();
            if(one!=null){
                BeanUtils.copyProperties(one, customerInfoVo);
                String orderId = one.getOrderId();
                List<TbShareholder> list3 = shareholderService.list(new LambdaQueryWrapper<TbShareholder>().eq(TbShareholder::getOrderId, orderId));
                customerInfoVo.setShareHolders(list3);
            }
            companyDetailVo.setCustomerInfoVo(customerInfoVo);
            companyDetailVo.setEstimatedRevenue(order.getPrice().subtract(order.getCommissionPrice()).subtract(order.getCommissionPlatform()));

            TbUser user = userService.getById(order.getUserId());
            companyDetailVo.setCustomerName(user.getUserName());
            companyDetailVo.setCustomerPhone(user.getPhone());

            companyDetailVo.setSellerName(userService.getById(tbCompany.getUserId()).getUserName());

            // 判断是否要迁区 是否要改名 新增天数
            if(one!=null){
                companyDetailVo.setEstimatedDays(one.getAddDay()+companyDetailVo.getEstimatedDays());
                if(one.getNeedRename()==1 && companyDetailVo.getRenameMoney()!=null){
                    companyDetailVo.setSaleMoney( companyDetailVo.getSaleMoney().add(companyDetailVo.getRenameMoney()));
                }
                if(one.getNewDistrict()==1 && companyDetailVo.getRelocationAreaMoney()!=null){
                    companyDetailVo.setSaleMoney( companyDetailVo.getSaleMoney().add(companyDetailVo.getRelocationAreaMoney()));
                }
            }
        }




        return companyDetailVo;
    }