bug修改

无关风月

2025-01-08 f198eb8efc4cc3c53e6b5839dabb4aae4c68510c

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java

@@ -189,13 +189,13 @@


        Page<Order> data = orderClient.queryPage(orderQueryRequest).getData();
        List<MasterWorker> list = masterWorkerService.lambdaQuery()
                .eq(MasterWorker::getIsDelete, 0).list();
        if (null != data) {
            for (Order record : data.getRecords()) {
                // 回收服务信息
                Integer serverId = record.getServerId();
                MasterWorker masterWorker = masterWorkerService.lambdaQuery()
                        .eq(MasterWorker::getId, serverId)
                        .eq(MasterWorker::getIsDelete, 0).one();
                MasterWorker masterWorker = list.stream().filter(e -> e.getId().equals(serverId)).findFirst().orElse(null);
                if (null != masterWorker) {
                    record.setServerName(masterWorker.getRealName());
                    record.setServerPhone(masterWorker.getPhone());
@@ -849,9 +849,15 @@
                throw new ServiceException("上门时间格式错误");
            }

            if(!StringUtils.hasLength(address)){
                return R.fail("详细地址不能为空");
            }
            // 解析地址经纬度
            CityInfoVO cityInfoVO = GaoDeMapUtil.getAddressInfo(province + city + area + address).getDatas();
            if(Objects.isNull(cityInfoVO.getLongitude()) || Objects.isNull(cityInfoVO.getLatitude())){
            CityInfoVO cityInfoVO = GaoDeMapUtil.getAddressInfo((province==null?"":province)
                    + (city==null?"":city)
                    + (area==null?"":area)
                    + address).getDatas();
            if(cityInfoVO==null||Objects.isNull(cityInfoVO.getLongitude()) || Objects.isNull(cityInfoVO.getLatitude())){
                return R.fail("地址输入不正确");
            }
            String areaCode = cityInfoVO.getCode();
@@ -862,7 +868,9 @@
            order.setAreaCode(areaCode);
            order.setLongitude(cityInfoVO.getLongitude());
            order.setLatitude(cityInfoVO.getLatitude());

            if (!StringUtils.hasLength(city)){
                order.setCity(cityInfoVO.getCity());
            }
            // 站点信息
            Site site = sites.stream().filter(e -> e.getSiteName().equals(frozenBuckleImportDTO.getSiteName())).findFirst().orElse(null);
            if(Objects.nonNull(site)){