From 0ef280ca1db4c8f280be5030ccfea35441ca1e51 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Wed, 16 Jul 2025 11:24:29 +0800
Subject: [PATCH] 骑手同步数接口修改
---
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 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 bb45c60..993f8eb 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
@@ -146,16 +146,14 @@
// 查询当前订单 检查订单是否已经被其他骑手抢到或取消 直接返回
OrderResponse orderResponse = orderService.getByOrderNum(orderNum);
// 2商家已接单 4商家已备货 这两个状态可以接单
- if (orderResponse == null || orderResponse.getOrder().getOrderStatus() != 2 || orderResponse.getOrder().getOrderStatus() != 4) {
+ if (null == orderResponse || (orderResponse.getOrder().getOrderStatus() != 2 && orderResponse.getOrder().getOrderStatus() != 4)) {
return R.fail(400, "订单已经被其他骑手接单或顾客取消，请稍后重试");
}
// 订单没有被接单或取消的情况下，进行接单操作
- // 查询商家信息
- Store store = storeService.getById(orderResponse.getOrder().getStoreId());
// 1.新增骑手接单记录
- addRiderOrderRecord(riderInfo, orderResponse, store);
+ addRiderOrderRecord(riderInfo, orderResponse);
// 2.新增订单接单流程信息 骑手接单流程新增
- orderService.operationLog(orderResponse, OrderStatusEnum.THREE);
+ orderService.operationLog(orderResponse, OrderStatusEnum.THREE, riderInfo.getCardName());
// 返回成功信息
return R.success(orderResponse, "接单成功");
} catch (Exception e) {
@@ -176,13 +174,13 @@
*
* @Date: 2025/7/14 17:48
*/
- public void addRiderOrderRecord(RiderInfo riderInfo, OrderResponse orderResponse, Store store) {
+ public void addRiderOrderRecord(RiderInfo riderInfo, OrderResponse orderResponse) {
RiderOrderRecord riderOrderRecord = new RiderOrderRecord();
riderOrderRecord.setOrderId(orderResponse.getOrder().getOrderId());
riderOrderRecord.setOrderNum(orderResponse.getOrder().getOrderNum());
riderOrderRecord.setMerchantId(orderResponse.getOrder().getStoreId());
riderOrderRecord.setMerchantName(orderResponse.getOrder().getStoreName());
- riderOrderRecord.setMerchantAddress(store.getAddress());
+ riderOrderRecord.setMerchantAddress(orderResponse.getOrder().getStoreAddress());
riderOrderRecord.setReceiverAddress(orderResponse.getAddress().getDetail());
// 当前为接单 设置为待取货状态 0-已接单 1-已到店 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消
riderOrderRecord.setOrderStatus(Constants.ORDER_STATUS_OK);
@@ -199,8 +197,8 @@
riderOrderRecord.setUserId(orderResponse.getOrder().getUserId());
riderOrderRecord.setUserLongitude(String.valueOf(orderResponse.getAddress().getLongitude()));
riderOrderRecord.setUserLatitude(String.valueOf(orderResponse.getAddress().getLatitude()));
- riderOrderRecord.setMerchantLongitude(String.valueOf(store.getLongitude()));
- riderOrderRecord.setMerchantLatitude(String.valueOf(store.getLatitude()));
+ riderOrderRecord.setMerchantLongitude(String.valueOf(orderResponse.getOrder().getStoreLongitude()));
+ riderOrderRecord.setMerchantLatitude(String.valueOf(orderResponse.getOrder().getStoreLatitude()));
// 配送费详情Id
// riderOrderRecord.setDeliveryFeeId(orderResponse.getOrder().getDeliveryFeeId());
riderOrderRecord.setOrderIncome(orderResponse.getOrder().getSendPrice());
@@ -225,12 +223,12 @@
// 判断骑手操作类型 上报到店操作 OperationType=1
if (orderRiderOperationVo.getOperationType().equals(Constants.ORDER_OPERATION_TYPE_STORE)) {
// 添加订单操作记录 上报到店操作1
- orderService.operationLog(orderResponse, OrderStatusEnum.FIVE);
+ orderService.operationLog(orderResponse, OrderStatusEnum.FIVE, orderResponse.getOrder().getRiderName());
updateRiderOrderStatus(orderRiderOperationVo.getOrderNum(), Constants.ORDER_STATUS_StORE);
orderResponse.getOrder().setOrderStatus(OrderStatusEnum.FIVE.getKey());
} else {
// 添加订单操作记录 取货配送 OperationType=2
- orderService.operationLog(orderResponse, OrderStatusEnum.SIX);
+ orderService.operationLog(orderResponse, OrderStatusEnum.SIX, orderResponse.getOrder().getRiderName());
updateRiderOrderStatus(orderRiderOperationVo.getOrderNum(), Constants.ORDER_STATUS_DELIVERY);
orderResponse.getOrder().setOrderStatus(OrderStatusEnum.SIX.getKey());
}
@@ -244,7 +242,7 @@
OrderResponse orderResponse = orderService.getByOrderNum(orderNum);
Order order = orderResponse.getOrder();
// 添加订单操作记录 订单完成
- orderService.operationLog(orderResponse, OrderStatusEnum.SEVEN);
+ orderService.operationLog(orderResponse, OrderStatusEnum.SEVEN, orderResponse.getOrder().getRiderName());
// 修改骑手端的订单状态
updateRiderOrderStatus(orderNum, Constants.ORDER_STATUS_FINISH);
// 返回参数
@@ -273,12 +271,10 @@
riderIncomeDetail.setIncomeMonth(DateUtil.getNowTimeTypeYYYYMM());
riderIncomeDetail.setDeliveryTime(new Timestamp(System.currentTimeMillis()));
riderIncomeDetail.setOrderStatus(Constants.ORDER_STATUS_FINISH);
- riderIncomeDetail.setStartAddress("待完善");
- riderIncomeDetail.setEndAddress("待完善");
+ riderIncomeDetail.setStartAddress(orderResponse.getOrder().getStoreAddress());
+ riderIncomeDetail.setEndAddress(orderResponse.getAddress().getDetail());
riderIncomeDetailService.save(riderIncomeDetail);
return R.success(orderResponse);
}
-
-
}
--
Gitblit v1.9.3