hjl
2024-07-18 b9da8289051937fbbbd47bbda97414ad6c769a90
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java
@@ -134,7 +134,7 @@
        changeDispatch.setWorkerName(masterWorker.getRealName());
        changeDispatch.setApplyReason(reason);
        changeDispatch.setApplyTime(DateUtils.getNowDate());
        changeDispatch.setState(0);
        changeDispatch.setState(Constants.ZERO);
        Boolean result = orderClient.changeOrderState(orderId, Constants.SIX).getData();
        Order order = orderClient.detail(orderId).getData();
        if (null == order) {
@@ -178,7 +178,7 @@
        // 上传时判断是否在下单位置附件,距离大于某个值则 不允许上传
        if (distance > Constants.THREE_THOUSAND) {
//            throw new GlobalException("您当前手机定位超出当前订单预约地址范围 3km,无法提供回收服务!");
            return R.fail(Boolean.FALSE, "您当前手机定位超出当前订单预约地址范围 3km,无法提供回收服务!");
            return R.ok(Boolean.FALSE, "您当前手机定位超出当前订单预约地址范围 3km,无法提供回收服务!");
        }
        return R.ok(true);
    }
@@ -245,7 +245,9 @@
        Integer serveId = data.getOrderInfo().getServeId();
        RecoveryServe recoveryServe = recoveryServeService.lambdaQuery()
                .eq(RecoveryServe::getId, serveId).one();
        data.getOrderInfo().setCover(recoveryServe.getCover());
        if (null != recoveryServe) {
            data.getOrderInfo().setCover(recoveryServe.getCover());
        }
        return R.ok(data);
    }