From 5b122a6277c2fe4e80f0b16a7295ce4db685819b Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Wed, 16 Jul 2025 12:20:22 +0800
Subject: [PATCH] 骑手接单修改
---
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
index 9dddb3c..bfc28be 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
@@ -151,11 +151,11 @@
int orderStatus = orderResponse.getOrder().getOrderStatus();
// 2商家已接单 4商家已备货 这两个状态可以接单
if (orderStatus != 2 && orderStatus != 4) {
- return R.fail(400, "订单状态异常，不允许接单");
+ return R.fail(400, "订单已经被其他骑手接单或取消，请稍后重试");
}
// 商家备货状态 查看是否存在骑手信息
- if (orderStatus == 4 && orderResponse.getOrder().getRiderId() == null) {
- return R.fail(400, "该订单已备货，但未分配骑手，请联系商家确认");
+ if (orderStatus == 4 && orderResponse.getOrder().getRiderId() != null) {
+ return R.fail(400, "订单已经被其他骑手接单，请稍后重试");
}
// 订单没有被接单或取消的情况下，进行接单操作
// 1.新增骑手接单记录
--
Gitblit v1.9.3