From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 64 insertions(+), 7 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 ca6daee..716c517 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
@@ -3,7 +3,6 @@
import cn.hutool.core.lang.UUID;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.oying.exception.BadRequestException;
-import com.oying.modules.pc.store.domain.Store;
import com.oying.modules.pc.store.service.StoreService;
import com.oying.modules.rider.domain.RiderIncomeDetail;
import com.oying.modules.rider.domain.RiderInfo;
@@ -29,6 +28,8 @@
import org.springframework.transaction.annotation.Transactional;
import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
import java.io.IOException;
@@ -126,6 +127,41 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ public void updateRiderOrderInfo(String orderNum) {
+ // 查询骑手订单信息
+ RiderOrderRecord riderOrderRecord = riderOrderRecordMapper.selectRiderInfo(orderNum);
+ // 当前为接单 设置为待取货状态 1-待取货 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消
+ RiderOrderRecord riderOrderRecordUpdate = new RiderOrderRecord();
+ riderOrderRecordUpdate.setRecordId(riderOrderRecord.getRecordId());
+ riderOrderRecordUpdate.setOrderNum(orderNum);
+ riderOrderRecordUpdate.setOrderStatus(Constants.ORDER_STATUS_FINISH);
+ // 判断是否超时 当前时间和预计送达时间做比较// 获取当前时间
+ Timestamp now = new Timestamp(System.currentTimeMillis());
+ // 获取订单的预计送达时间（假设 orderResponse.getOrder().getOrderTime() 返回的是 Timestamp 类型）
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ LocalDateTime orderLocalTime = LocalDateTime.parse(riderOrderRecord.getOrderTime(), formatter);
+ Timestamp orderTime = Timestamp.valueOf(orderLocalTime);
+ // 判断是否超时
+ String isOvertime = Constants.IS_OVERTIME_YES;
+ if (now.after(orderTime)) {
+ isOvertime = Constants.IS_OVERTIME_YES;
+ }
+ // 设置到订单记录中
+ riderOrderRecordUpdate.setIsOvertime(isOvertime);
+ // 完成时间
+ Timestamp finishTime = new Timestamp(System.currentTimeMillis());
+ riderOrderRecordUpdate.setFinishTime(finishTime);
+ // 接单时间-完成时间 计算出相隔秒数
+ Timestamp acceptTime = riderOrderRecord.getAcceptTime();
+ // 计算两个时间之间的秒数差
+ long durationInSeconds = (finishTime.getTime() - acceptTime.getTime()) / 1000;
+ riderOrderRecordUpdate.setDeliveryDuration(durationInSeconds);
+ // 更新订单状态
+ riderOrderRecordMapper.updateById(riderOrderRecordUpdate);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public R riderGrabOrder(String orderNum) {
Long riderId = SecurityUtils.getCurrentUserId();
// 查询骑手信息
@@ -145,9 +181,17 @@
}
// 查询当前订单 检查订单是否已经被其他骑手抢到或取消 直接返回
OrderResponse orderResponse = orderService.getByOrderNum(orderNum);
+ if (orderResponse == null || orderResponse.getOrder() == null) {
+ return R.fail(400, "订单信息不存在，请稍后重试");
+ }
+ int orderStatus = orderResponse.getOrder().getOrderStatus();
// 2商家已接单 4商家已备货 这两个状态可以接单
- if (orderResponse == null || orderResponse.getOrder().getOrderStatus() != 2 || orderResponse.getOrder().getOrderStatus() != 4) {
- return R.fail(400, "订单已经被其他骑手接单或顾客取消，请稍后重试");
+ if (orderStatus != 2 && orderStatus != 4) {
+ return R.fail(400, "订单已经被其他骑手接单或取消，请稍后重试");
+ }
+ // 商家备货状态 查看是否存在骑手信息
+ if (orderStatus == 4 && orderResponse.getOrder().getRiderId() != null) {
+ return R.fail(400, "订单已经被其他骑手接单，请稍后重试");
}
// 订单没有被接单或取消的情况下，进行接单操作
// 1.新增骑手接单记录
@@ -181,7 +225,13 @@
riderOrderRecord.setMerchantId(orderResponse.getOrder().getStoreId());
riderOrderRecord.setMerchantName(orderResponse.getOrder().getStoreName());
riderOrderRecord.setMerchantAddress(orderResponse.getOrder().getStoreAddress());
- riderOrderRecord.setReceiverAddress(orderResponse.getAddress().getDetail());
+ // 收货地址 拼接地址
+ String receiverAddress = orderResponse.getAddress().getCity()
+ + orderResponse.getAddress().getDistrict()
+ + orderResponse.getAddress().getStreet()
+ + orderResponse.getAddress().getShortAddress()
+ + orderResponse.getAddress().getDetail();
+ riderOrderRecord.setReceiverAddress(receiverAddress);
// 当前为接单 设置为待取货状态 0-已接单 1-已到店 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消
riderOrderRecord.setOrderStatus(Constants.ORDER_STATUS_OK);
riderOrderRecord.setAcceptTime(new Timestamp(System.currentTimeMillis()));
@@ -202,6 +252,7 @@
// 配送费详情Id
// riderOrderRecord.setDeliveryFeeId(orderResponse.getOrder().getDeliveryFeeId());
riderOrderRecord.setOrderIncome(orderResponse.getOrder().getSendPrice());
+ riderOrderRecord.setOrderTime(orderResponse.getOrder().getOrderTime());
create(riderOrderRecord);
}
@@ -243,8 +294,8 @@
Order order = orderResponse.getOrder();
// 添加订单操作记录 订单完成
orderService.operationLog(orderResponse, OrderStatusEnum.SEVEN, orderResponse.getOrder().getRiderName());
- // 修改骑手端的订单状态
- updateRiderOrderStatus(orderNum, Constants.ORDER_STATUS_FINISH);
+ // 修改骑手端的订单状态 // 修改完成时间
+ updateRiderOrderInfo(orderNum);
// 返回参数
orderResponse.getOrder().setOrderStatus(OrderStatusEnum.SEVEN.getKey());
// 查询骑手钱包信息
@@ -272,7 +323,13 @@
riderIncomeDetail.setDeliveryTime(new Timestamp(System.currentTimeMillis()));
riderIncomeDetail.setOrderStatus(Constants.ORDER_STATUS_FINISH);
riderIncomeDetail.setStartAddress(orderResponse.getOrder().getStoreAddress());
- riderIncomeDetail.setEndAddress(orderResponse.getAddress().getDetail());
+ // 收货地址 拼接地址
+ String receiverAddress = orderResponse.getAddress().getCity()
+ + orderResponse.getAddress().getDistrict()
+ + orderResponse.getAddress().getStreet()
+ + orderResponse.getAddress().getShortAddress()
+ + orderResponse.getAddress().getDetail();
+ riderIncomeDetail.setEndAddress(receiverAddress);
riderIncomeDetailService.save(riderIncomeDetail);
return R.success(orderResponse);
}
--
Gitblit v1.9.3