From ef684096ece7f699447bf567c4d89eecd9b3d200 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Wed, 23 Jul 2025 10:57:33 +0800
Subject: [PATCH] 骑手完成订单时判断是否上传送达图片
---
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java | 18 +++++++++---------
1 files changed, 9 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 f0080c6..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) {
@@ -291,6 +285,12 @@
@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