Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

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

@@ -62,6 +62,7 @@

import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -446,7 +447,7 @@
            orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());

            if (order.getState().equals(Constants.SIX) || order.getState().equals(Constants.THREE)) {
                orderClient.updateState(order.getId(), Constants.ONE);
                orderClient.updateState(order.getId(), 7);

                //如果是待改派,将上门时间设置为最新的，并且更新再投原因
                if (order.getState().equals(Constants.SIX)){
@@ -724,7 +725,10 @@
        if (workIds==null||workIds.isEmpty()){
            return R.ok(new ArrayList<>());
        }
        List<MasterWorker> list = masterWorkerService.lambdaQuery().in(MasterWorker::getId, workIds).eq(name!=null&&name!="",MasterWorker::getRealName,name).eq(cityCode!=null&&cityCode!="", MasterWorker::getCityCode,cityCode).list();
        List<MasterWorker> list = masterWorkerService.lambdaQuery()
                .in(MasterWorker::getId, workIds)
                .eq(name!=null&&name!="",MasterWorker::getRealName,name)
                .eq(cityCode!=null&&cityCode!=""&&!cityCode.contains("0000"), MasterWorker::getCityCode,cityCode).list();
        for (MasterWorker masterWorker : list) {
            masterWorker.setLacation(redisService.getCacheObject("work:"+masterWorker.getId()+":"));
        }
@@ -733,7 +737,10 @@

    @ApiOperation(value = "获师傅", tags = {"后台-订单管理-地图统计"})
    @PostMapping(value = "/map/line")
    public R<List<OrderByServeRecordVO>> line(Integer id) {
    public R<Map<String,Object>> line(Integer id) {

        Map<String,Object> map = new HashMap<>();

        List<OrderByServeRecordVO> list = new ArrayList<>();
        // 获取当天时间
        String today = DateUtils.dateTimeNow("yyyy-MM-dd");
@@ -767,7 +774,11 @@
            }
            list.add(orderByServeRecord);
        }
        return R.ok(list);
        map.put("orderByServeRecordVO", list);
        MasterWorker masterWorker = masterWorkerService.getById(id);
        map.put("masterWorker", masterWorker);

        return R.ok(map);
    }

    /**
@@ -863,6 +874,20 @@
        return R.ok();
    }

    /**
     * 批量修改订单时间
     * @param ids 站点多条id拼接
     */
    @ApiOperation(value = "订单列表-批量修改订单时间", tags = {"后台-订单管理[2.0]"})
    @GetMapping(value = "/batchOrderUpdateTime")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "多个id ',' 拼接", name = "ids", dataType = "String", required = true),
            @ApiImplicitParam(value = "修改上门时间", name = "time", dataType = "String", required = true),
    })
    public R<Boolean> batchOrderUpdateTime(@RequestParam("ids") String ids, @RequestParam("time") String time) {
        orderClient.batchUpdateTime(ids, time);
        return R.ok();
    }

    /**
     * 最简单的读的监听器