彭雪彬
2025-08-21 9aeeda3cb69bf2bc76285d73e6441c0fde7ffb10
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
@@ -179,8 +179,8 @@
                return R.fail(400, "订单信息不存在,请稍后重试");
            }
            int orderStatus = orderResponse.getOrder().getOrderStatus();
            // 2商家已接单 4商家已备货 这两个状态可以接单
            if (orderStatus != 2 && orderStatus != 4) {
            // 2商家已接单 3商家已备货 这两个状态可以接单
            if (orderStatus != 2 && orderStatus != 3) {
                return R.fail(400, "订单已经被其他骑手接单或取消,请稍后重试");
            }
            // 商家备货状态 查看是否存在骑手信息
@@ -191,7 +191,7 @@
            // 1.新增骑手接单记录
            addRiderOrderRecord(riderInfo, orderResponse);
            // 2.新增订单接单流程信息 骑手接单流程新增
            orderService.operationLog(orderResponse, OrderStatusEnum.THREE, riderInfo.getCardName());
            orderService.operationLog(orderResponse, OrderStatusEnum.FOUR, riderInfo.getCardName());
            // 返回成功信息
            return R.success(orderResponse, "接单成功");
        } catch (Exception e) {