From 4bbfc6f2a4f108d84b9b929ecbbaf5d56b57ca70 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Fri, 25 Jul 2025 17:06:20 +0800
Subject: [PATCH] 骑手同步数据接口
---
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 716c517..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
@@ -4,14 +4,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.oying.exception.BadRequestException;
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;
@@ -21,7 +16,6 @@
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;
@@ -50,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) {
@@ -253,6 +247,7 @@
// riderOrderRecord.setDeliveryFeeId(orderResponse.getOrder().getDeliveryFeeId());
riderOrderRecord.setOrderIncome(orderResponse.getOrder().getSendPrice());
riderOrderRecord.setOrderTime(orderResponse.getOrder().getOrderTime());
+ riderOrderRecord.setUserName(orderResponse.getOrder().getUsername());
create(riderOrderRecord);
}
@@ -288,7 +283,14 @@
}
@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();
--
Gitblit v1.9.3