From a21a8b9b733edd59dbcd3f696d2b69f10c4c3fc9 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:11:24 +0800
Subject: [PATCH] Merge branch 'pxb' into xin

---
 oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderDeliveryPhotosServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderDeliveryPhotosServiceImpl.java b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderDeliveryPhotosServiceImpl.java
index d8fa46d..9881d62 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderDeliveryPhotosServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderDeliveryPhotosServiceImpl.java
@@ -106,7 +106,10 @@
         // 限制只上传一张图
         RiderDeliveryPhotos riderDeliveryPhotosIsHave = riderDeliveryPhotosMapper.getRiderDeliveryPhotosByOrderNum(orderDeliveryPhotosVo.getOrderNum());
         if(riderDeliveryPhotosIsHave != null) {
-            throw new BadRequestException("只能上传一张图片,图片已上传");
+            // throw new BadRequestException("只能上传一张图片,图片已上传");
+            // 删除上次上传的图片
+            bucketStorageService.deleteById(riderDeliveryPhotosIsHave.getPhotoUrl());
+            riderDeliveryPhotosMapper.deleteById(riderDeliveryPhotosIsHave.getPhotoId());
         }
         OrderResponse orderResponse = orderService.getByOrderNum(orderDeliveryPhotosVo.getOrderNum());
         if (orderResponse != null) {

--
Gitblit v1.9.3