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 | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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 2c0d9be..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
@@ -1,10 +1,13 @@
package com.oying.modules.rider.service.impl;
+import com.oying.domain.BucketStorage;
+import com.oying.exception.BadRequestException;
import com.oying.modules.rider.domain.RiderDeliveryPhotos;
import com.oying.modules.rider.domain.vo.OrderDeliveryPhotosVo;
import com.oying.modules.rider.utils.Constants;
import com.oying.modules.sh.domain.vo.OrderResponse;
import com.oying.modules.sh.service.OrderService;
+import com.oying.service.BucketStorageService;
import com.oying.utils.FileUtil;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,6 +27,7 @@
import java.util.LinkedHashMap;
import com.oying.utils.PageResult;
+import org.springframework.web.multipart.MultipartFile;
/**
* @author pxb
@@ -36,6 +40,8 @@
private final RiderDeliveryPhotosMapper riderDeliveryPhotosMapper;
private final OrderService orderService;
+ private final BucketStorageService bucketStorageService;
+
@Override
public PageResult<RiderDeliveryPhotos> queryAll(RiderDeliveryPhotosQueryCriteria criteria, Page<Object> page) {
@@ -96,9 +102,27 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean riderDeliveryPhotos(OrderDeliveryPhotosVo orderDeliveryPhotosVo) {
+ public RiderDeliveryPhotos riderDeliveryPhotos(OrderDeliveryPhotosVo orderDeliveryPhotosVo) {
+ // 限制只上传一张图
+ RiderDeliveryPhotos riderDeliveryPhotosIsHave = riderDeliveryPhotosMapper.getRiderDeliveryPhotosByOrderNum(orderDeliveryPhotosVo.getOrderNum());
+ if(riderDeliveryPhotosIsHave != null) {
+ // throw new BadRequestException("只能上传一张图片，图片已上传");
+ // 删除上次上传的图片
+ bucketStorageService.deleteById(riderDeliveryPhotosIsHave.getPhotoUrl());
+ riderDeliveryPhotosMapper.deleteById(riderDeliveryPhotosIsHave.getPhotoId());
+ }
OrderResponse orderResponse = orderService.getByOrderNum(orderDeliveryPhotosVo.getOrderNum());
if (orderResponse != null) {
+ // 图片信息不能为空
+ MultipartFile file = orderDeliveryPhotosVo.getPhotoFile();
+ // 判断文件是否为图片
+ String suffix = FileUtil.getExtensionName(file.getOriginalFilename());
+ FileUtil.checkSize(5, file.getSize());
+ if (!FileUtil.IMAGE.equals(FileUtil.getFileType(suffix))) {
+ throw new BadRequestException("只能上传图片");
+ }
+ // 上传照片
+ BucketStorage bucketStorage = bucketStorageService.create(null, file);
// 封装数据
RiderDeliveryPhotos riderDeliveryPhotos = new RiderDeliveryPhotos();
riderDeliveryPhotos.setOrderId(orderResponse.getOrder().getOrderId());
@@ -106,16 +130,18 @@
riderDeliveryPhotos.setRiderId(orderResponse.getOrder().getRiderId());
riderDeliveryPhotos.setRiderName(orderResponse.getOrder().getRiderName());
riderDeliveryPhotos.setRiderPhone(orderResponse.getOrder().getRiderPhone());
- riderDeliveryPhotos.setPhotoUrl(orderDeliveryPhotosVo.getPhotoUrl());
- riderDeliveryPhotos.setUploadId(orderDeliveryPhotosVo.getUploadId());
+ riderDeliveryPhotos.setPhotoUrl(bucketStorage.getPath());
+ riderDeliveryPhotos.setUploadId(bucketStorage.getBucketId());
riderDeliveryPhotos.setLatitude(orderDeliveryPhotosVo.getUserLatitude());
riderDeliveryPhotos.setLongitude(orderDeliveryPhotosVo.getUserLongitude());
riderDeliveryPhotos.setDescription(orderDeliveryPhotosVo.getDescription());
riderDeliveryPhotos.setIsValid(Constants.IS_VALID_YES);
riderDeliveryPhotos.setUserPhone(orderResponse.getOrder().getUsername());
riderDeliveryPhotos.setUserId(orderResponse.getOrder().getUserId());
- return this.save(riderDeliveryPhotos);
+ riderDeliveryPhotosMapper.insert(riderDeliveryPhotos);
+ return riderDeliveryPhotos;
+ } else {
+ throw new BadRequestException("订单不存在！");
}
- return false;
}
}
--
Gitblit v1.9.3