hjl
2024-07-02 242725f795b4cca830421c07f714a3ec36af0add
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java
@@ -1,7 +1,7 @@
package com.ruoyi.worker.controller;
import com.ruoyi.admin.api.entity.ExchangeDispatch;
import com.ruoyi.admin.api.entity.ChangeDispatch;
import com.ruoyi.admin.api.feignClient.AdminClient;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
@@ -89,24 +89,28 @@
        if (null == loginWorker) {
            return R.loginExpire("登录失效!");
        }
        ChangeDispatch data = adminClient.changeDispatchOne(orderId).getData();
        if (null != data) {
            return R.fail("当前订单已提交改派申请!");
        }
        MasterWorker masterWorker = masterWorkerService.getById(loginWorker.getUserid());
        // 订单改派信息
        ExchangeDispatch exchangeDispatch = new ExchangeDispatch();
        exchangeDispatch.setWorkerId(masterWorker.getId());
        exchangeDispatch.setWorkerName(masterWorker.getRealName());
        exchangeDispatch.setApplyReason(reason);
        exchangeDispatch.setApplyTime(DateUtils.getNowDate());
        exchangeDispatch.setState(0);
        ChangeDispatch changeDispatch = new ChangeDispatch();
        changeDispatch.setWorkerId(masterWorker.getId());
        changeDispatch.setWorkerName(masterWorker.getRealName());
        changeDispatch.setApplyReason(reason);
        changeDispatch.setApplyTime(DateUtils.getNowDate());
        changeDispatch.setState(0);
        Order order = orderService.lambdaQuery().eq(Order::getId, orderId).eq(Order::getIsDelete, 0).one();
        if (null == order) {
            throw new GlobalException("订单信息异常!");
        }
        exchangeDispatch.setOrderId(orderId);
        exchangeDispatch.setOrderNumber(order.getOrderNumber());
        exchangeDispatch.setUserId(order.getUserId());
        exchangeDispatch.setUserName(order.getReservationName());
        changeDispatch.setOrderId(orderId);
        changeDispatch.setOrderNumber(order.getOrderNumber());
        changeDispatch.setUserId(order.getUserId());
        changeDispatch.setUserName(order.getReservationName());
        // 添加改派信息
        Boolean save = adminClient.changeDispatchSave(exchangeDispatch).getData();
        Boolean save = adminClient.changeDispatchSave(changeDispatch).getData();
        return save ? R.ok() : R.fail();
    }
@@ -128,7 +132,8 @@
        if (null == loginWorker) {
            return R.loginExpire("登录失效!");
        }
        Order order = orderService.lambdaQuery().eq(Order::getId, orderId).eq(Order::getServerId, loginWorker.getUserid())
        Order order = orderService.lambdaQuery().eq(Order::getId, orderId)
                .eq(Order::getServerId, loginWorker.getUserid())
                .eq(Order::getIsDelete, 0).one();
        if (null == order) {
            throw new GlobalException("请确认当前订单所派单师傅是否是您!");