From a69c4f866e38bf458a0339c719af5caba425309e Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 04 Sep 2025 15:55:51 +0800
Subject: [PATCH] 骑手超时判断
---
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java | 82 ++++++++++++++++++++++++++++++----------
1 files changed, 61 insertions(+), 21 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..c202bcf 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,16 +3,10 @@
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;
-import com.oying.modules.rider.domain.RiderOrderRecord;
-import com.oying.modules.rider.domain.RiderWalletInfo;
+import com.oying.modules.rider.domain.*;
import com.oying.modules.rider.domain.vo.OrderRiderOperationVo;
-import com.oying.modules.rider.service.RiderIncomeDetailService;
-import com.oying.modules.rider.service.RiderInfoService;
-import com.oying.modules.rider.service.RiderWalletInfoService;
+import com.oying.modules.rider.service.*;
import com.oying.modules.rider.utils.Constants;
import com.oying.modules.sh.domain.Order;
import com.oying.modules.sh.domain.vo.OrderResponse;
@@ -22,13 +16,14 @@
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.oying.modules.rider.service.RiderOrderRecordService;
import com.oying.modules.rider.domain.dto.RiderOrderRecordQueryCriteria;
import com.oying.modules.rider.mapper.RiderOrderRecordMapper;
import org.springframework.stereotype.Service;
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;
@@ -49,9 +44,9 @@
private final RedisUtils redisUtils;
private final OrderService orderService;
private final RiderInfoService riderInfoService;
- private final StoreService storeService;
private final RiderWalletInfoService riderWalletInfoService;
private final RiderIncomeDetailService riderIncomeDetailService;
+ private final RiderDeliveryPhotosService riderDeliveryPhotosService;
@Override
public PageResult<RiderOrderRecord> queryAll(RiderOrderRecordQueryCriteria criteria, Page<Object> page) {
@@ -126,12 +121,47 @@
@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_NO;
+ 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();
// 查询骑手信息
RiderInfo riderInfo = riderInfoService.getRiderSourceInfo(riderId);
if (riderInfo == null || riderInfo.getEnabled().equals(Constants.SOURCE_ENABLED_DFF)) {
- return R.fail(400, "骑手信息不存在或已过期");
+ throw new BadRequestException("骑手信息不存在或已过期");
}
// 唯一标识当前线程/客户端
String clientId = UUID.randomUUID().toString();
@@ -141,27 +171,27 @@
// 获取分布式锁，设置超时时间10秒
boolean isLocked = redisUtils.setIfAbsent(lockKey, clientId, 10);
if (!isLocked) {
- return R.fail(400, "订单已经被其他骑手接单，请稍后重试");
+ throw new BadRequestException("订单已经被其他骑手接单，请稍后重试");
}
// 查询当前订单 检查订单是否已经被其他骑手抢到或取消 直接返回
OrderResponse orderResponse = orderService.getByOrderNum(orderNum);
if (orderResponse == null || orderResponse.getOrder() == null) {
- return R.fail(400, "订单信息不存在，请稍后重试");
+ throw new BadRequestException("订单信息不存在，请稍后重试");
}
int orderStatus = orderResponse.getOrder().getOrderStatus();
- // 2商家已接单 4商家已备货 这两个状态可以接单
- if (orderStatus != 2 && orderStatus != 4) {
- return R.fail(400, "订单状态异常，不允许接单");
+ // 2商家已接单 3商家已备货 这两个状态可以接单
+ if (orderStatus != 2 && orderStatus != 3) {
+ throw new BadRequestException("订单已经被其他骑手接单或取消，请稍后重试");
}
// 商家备货状态 查看是否存在骑手信息
- if (orderStatus == 4 && orderResponse.getOrder().getRiderId() == null) {
- return R.fail(400, "该订单已备货，但未分配骑手，请联系商家确认");
+ if (orderStatus == 4 && orderResponse.getOrder().getRiderId() != null) {
+ throw new BadRequestException("订单已经被其他骑手接单，请稍后重试");
}
// 订单没有被接单或取消的情况下，进行接单操作
// 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) {
@@ -216,6 +246,8 @@
// 配送费详情Id
// riderOrderRecord.setDeliveryFeeId(orderResponse.getOrder().getDeliveryFeeId());
riderOrderRecord.setOrderIncome(orderResponse.getOrder().getSendPrice());
+ riderOrderRecord.setOrderTime(orderResponse.getOrder().getOrderTime());
+ riderOrderRecord.setUserName(orderResponse.getOrder().getUsername());
create(riderOrderRecord);
}
@@ -251,14 +283,22 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public R riderCompleteOrder(String orderNum) {
+ // 是否上传送达照片
+ RiderDeliveryPhotos riderDeliveryPhotos = riderDeliveryPhotosService.getOne(
+ new QueryWrapper<RiderDeliveryPhotos>().eq(RiderDeliveryPhotos.COL_ORDER_NUM, orderNum));
+ if (riderDeliveryPhotos == null) {
+ // 送达照片数据为空，抛出异常
+ throw new BadRequestException("请上传送达照片");
+ }
// 当前订单信息
OrderResponse orderResponse = orderService.getByOrderNum(orderNum);
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());
// 查询骑手钱包信息
--
Gitblit v1.9.3