From 044a57d2133b2363a6f0d3d167b3eaa587c70b91 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:18:47 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 152 insertions(+), 23 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 78e2ea8..ba8b304 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,25 +3,27 @@
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.RiderInfo;
-import com.oying.modules.rider.domain.RiderOrderRecord;
-import com.oying.modules.rider.service.RiderInfoService;
+import com.oying.modules.rider.domain.*;
+import com.oying.modules.rider.domain.vo.OrderRiderOperationVo;
+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;
import com.oying.modules.sh.service.OrderService;
import com.oying.utils.*;
+import com.oying.utils.enums.OrderStatusEnum;
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;
@@ -42,7 +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) {
@@ -117,7 +121,48 @@
@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();
+ // 查询骑手信息
+ RiderInfo riderInfo = riderInfoService.getRiderSourceInfo(riderId);
+ if (riderInfo == null || riderInfo.getEnabled().equals(Constants.SOURCE_ENABLED_DFF)) {
+ return R.fail(400, "骑手信息不存在或已过期");
+ }
// 唯一标识当前线程/客户端
String clientId = UUID.randomUUID().toString();
// Redis 锁 key
@@ -130,19 +175,23 @@
}
// 查询当前订单 检查订单是否已经被其他骑手抢到或取消 直接返回
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, "订单已经被其他骑手接单，请稍后重试");
}
// 订单没有被接单或取消的情况下，进行接单操作
- // 查询骑手信息
- Long riderId = SecurityUtils.getCurrentUserId();
- RiderInfo riderInfo = riderInfoService.getRiderSourceInfo(riderId);
- // 查询商家信息
- Store store = storeService.getById(orderResponse.getOrder().getStoreId());
// 1.新增骑手接单记录
- addRiderOrderRecord(riderInfo, orderResponse, store);
- // 2.新增订单接单流程信息
+ addRiderOrderRecord(riderInfo, orderResponse);
+ // 2.新增订单接单流程信息 骑手接单流程新增
+ orderService.operationLog(orderResponse, OrderStatusEnum.THREE, riderInfo.getCardName());
// 返回成功信息
return R.success(orderResponse, "接单成功");
} catch (Exception e) {
@@ -163,16 +212,22 @@
*
* @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.setReceiverAddress(orderResponse.getAddress().getDetail());
- // 当前为接单 设置为待取货状态 1-待取货 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消
- riderOrderRecord.setOrderStatus(Constants.ORDER_STATUS_WAIT);
+ riderOrderRecord.setMerchantAddress(orderResponse.getOrder().getStoreAddress());
+ // 收货地址 拼接地址
+ 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()));
// 取单编号
riderOrderRecord.setAcceptNum(orderResponse.getOrder().getOrderStoreNum());
@@ -186,14 +241,15 @@
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());
+ riderOrderRecord.setOrderTime(orderResponse.getOrder().getOrderTime());
+ riderOrderRecord.setUserName(orderResponse.getOrder().getUsername());
create(riderOrderRecord);
}
-
@Override
public R riderCancelOrder(String orderNum) {
@@ -206,5 +262,78 @@
return null;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R riderOperationOrder(OrderRiderOperationVo orderRiderOperationVo) {
+ OrderResponse orderResponse = orderService.getByOrderNum(orderRiderOperationVo.getOrderNum());
+ // 判断骑手操作类型 上报到店操作 OperationType=1
+ if (orderRiderOperationVo.getOperationType().equals(Constants.ORDER_OPERATION_TYPE_STORE)) {
+ // 添加订单操作记录 上报到店操作1
+ 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, orderResponse.getOrder().getRiderName());
+ updateRiderOrderStatus(orderRiderOperationVo.getOrderNum(), Constants.ORDER_STATUS_DELIVERY);
+ orderResponse.getOrder().setOrderStatus(OrderStatusEnum.SIX.getKey());
+ }
+ // 修改骑手端的订单状态
+ return R.success(orderResponse);
+ }
+
+ @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) {
+ return R.fail(400, "请上传送达照片");
+ }
+ // 当前订单信息
+ OrderResponse orderResponse = orderService.getByOrderNum(orderNum);
+ Order order = orderResponse.getOrder();
+ // 添加订单操作记录 订单完成
+ orderService.operationLog(orderResponse, OrderStatusEnum.SEVEN, orderResponse.getOrder().getRiderName());
+ // 修改骑手端的订单状态 // 修改完成时间
+ updateRiderOrderInfo(orderNum);
+ // 返回参数
+ orderResponse.getOrder().setOrderStatus(OrderStatusEnum.SEVEN.getKey());
+ // 查询骑手钱包信息
+ RiderWalletInfo riderWalletInfo = riderWalletInfoService.getRiderWalletInfo(String.valueOf(order.getRiderId()));
+ // 修改骑手钱包信息 // 骑手总金额添加配送费
+ riderWalletInfo.setAmount(riderWalletInfo.getAmount().add(order.getSendPrice()));
+ // 骑手可用余额添加配送费
+ riderWalletInfo.setAvailableBalance(riderWalletInfo.getAvailableBalance().add(order.getSendPrice()));
+ // 添加累计收入添加配送费
+ riderWalletInfo.setIncomeTotal(riderWalletInfo.getIncomeTotal().add(order.getSendPrice()));
+ // 完成总单数添加1
+ riderWalletInfo.setRunTotal(riderWalletInfo.getRunTotal() + 1);
+ riderWalletInfoService.updateById(riderWalletInfo);
+ // 添加骑手收入明细
+ RiderIncomeDetail riderIncomeDetail = new RiderIncomeDetail();
+ riderIncomeDetail.setRiderId(order.getRiderId());
+ riderIncomeDetail.setRiderName(order.getRiderName());
+ riderIncomeDetail.setRiderPhone(order.getRiderPhone());
+ riderIncomeDetail.setOrderId(order.getOrderId());
+ riderIncomeDetail.setOrderNum(order.getOrderNum());
+ riderIncomeDetail.setIncomeAmount(order.getSendPrice());
+ riderIncomeDetail.setIncomeType(Constants.INCOME_TYPE_DELIVERY);
+ riderIncomeDetail.setIncomeDate(DateUtil.getNowTimeTypeYYYYMMDD());
+ riderIncomeDetail.setIncomeMonth(DateUtil.getNowTimeTypeYYYYMM());
+ riderIncomeDetail.setDeliveryTime(new Timestamp(System.currentTimeMillis()));
+ riderIncomeDetail.setOrderStatus(Constants.ORDER_STATUS_FINISH);
+ riderIncomeDetail.setStartAddress(orderResponse.getOrder().getStoreAddress());
+ // 收货地址 拼接地址
+ 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