From 1cda9be49d77c83bdab4cfea7e3558fd4064bdb1 Mon Sep 17 00:00:00 2001
From: seatonwan9
Date: 星期四, 28 八月 2025 02:03:11 +0800
Subject: [PATCH] 更新代码
---
src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java | 741 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 723 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java b/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java
index 92a9b54..94a5ab0 100644
--- a/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java
+++ b/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java
@@ -8,17 +8,24 @@
import com.webmanage.common.PageResult;
import com.webmanage.dto.CreateOrderDTO;
import com.webmanage.dto.CreateOrderItemDTO;
+import com.webmanage.dto.FileCheckDTO;
+import com.webmanage.dto.OrderApprovalDTO;
import com.webmanage.dto.OrderQueryDTO;
+import com.webmanage.dto.UpdateOrderDetailDTO;
+import com.webmanage.entity.OrderApproval;
import com.webmanage.entity.OrderAttachment;
import com.webmanage.entity.OrderDetail;
import com.webmanage.entity.OrderEvaluation;
import com.webmanage.entity.OrderInfo;
+import com.webmanage.mapper.OrderApprovalMapper;
import com.webmanage.mapper.OrderAttachmentMapper;
import com.webmanage.mapper.OrderDetailMapper;
import com.webmanage.mapper.OrderEvaluationMapper;
import com.webmanage.mapper.OrderInfoMapper;
+import com.webmanage.mapper.ReportResultSubmissionMapper;
import com.webmanage.service.OrderInfoService;
import com.webmanage.service.OrderNoService;
+import com.webmanage.service.MinioService;
import com.webmanage.vo.OrderAttachmentVO;
import com.webmanage.vo.OrderDetailItemVO;
import com.webmanage.vo.OrderDetailVO;
@@ -53,10 +60,19 @@
private OrderEvaluationMapper orderEvaluationMapper;
@Resource
+ private OrderApprovalMapper orderApprovalMapper;
+
+ @Resource
private OrderNoService orderNoService;
+ @Resource
+ private MinioService minioService;
+
+ @Resource
+ private ReportResultSubmissionMapper reportResultSubmissionMapper;
+
@Override
- public PageResult<OrderInfo> getBuyerOrderPage(OrderQueryDTO queryDTO) {
+ public PageResult<OrderDetailVO> getBuyerOrderPage(OrderQueryDTO queryDTO) {
// 鍙傛暟鏍￠獙
if (queryDTO.getUserId() == null) {
throw new BusinessException("鐢ㄦ埛ID涓嶈兘涓虹┖");
@@ -76,10 +92,23 @@
queryDTO.getCreateTimeEnd() != null ? queryDTO.getCreateTimeEnd().toString() : null,
queryDTO.getOrderBy(), queryDTO.getOrderDirection()
);
+ // 灏嗚鍗曚笌璇︽儏鑱旇〃灏佽鍒癡O
+ List<OrderDetailVO> voList = result.getRecords().stream().map(order -> {
+ OrderDetailVO vo = new OrderDetailVO();
+ BeanUtils.copyProperties(order, vo);
+ List<OrderDetail> details = orderDetailMapper.selectByOrderId(order.getOrderId());
+ List<OrderDetailItemVO> items = details.stream().map(d -> {
+ OrderDetailItemVO item = new OrderDetailItemVO();
+ BeanUtils.copyProperties(d, item);
+ return item;
+ }).collect(java.util.stream.Collectors.toList());
+ vo.setOrderDetails(items);
+ return vo;
+ }).collect(java.util.stream.Collectors.toList());
// 鏋勫缓杩斿洖缁撴灉
- return new PageResult<OrderInfo>(
- result.getRecords(),
+ return new PageResult<OrderDetailVO>(
+ voList,
result.getTotal(),
queryDTO.getPageNum().longValue(),
queryDTO.getPageSize().longValue(),
@@ -88,10 +117,10 @@
}
@Override
- public PageResult<OrderInfo> getSellerOrderPage(OrderQueryDTO queryDTO) {
+ public PageResult<OrderDetailVO> getSellerOrderPage(OrderQueryDTO queryDTO) {
// 鍙傛暟鏍￠獙
- if (queryDTO.getUserId() == null) {
- throw new BusinessException("鐢ㄦ埛ID涓嶈兘涓虹┖");
+ if (queryDTO.getProviderId() == null) {
+ throw new BusinessException("鎻愪緵鑰匢D涓嶈兘涓虹┖");
}
// 鍒涘缓鍒嗛〉瀵硅薄
@@ -99,7 +128,7 @@
// 鎵ц鍒嗛〉鏌ヨ
IPage<OrderInfo> result = baseMapper.selectSellerOrderPage(
- page, queryDTO.getUserId(), queryDTO.getOrderStatus(), queryDTO.getPaymentStatus(),
+ page, queryDTO.getProviderId(), queryDTO.getOrderStatus(), queryDTO.getPaymentStatus(),
queryDTO.getProductName(), queryDTO.getOrderId(),
queryDTO.getApplyTimeStart() != null ? queryDTO.getApplyTimeStart().toString() : null,
queryDTO.getApplyTimeEnd() != null ? queryDTO.getApplyTimeEnd().toString() : null,
@@ -108,9 +137,23 @@
queryDTO.getOrderBy(), queryDTO.getOrderDirection()
);
+ // 灏嗚鍗曚笌璇︽儏鑱旇〃灏佽鍒癡O
+ List<OrderDetailVO> voList = result.getRecords().stream().map(order -> {
+ OrderDetailVO vo = new OrderDetailVO();
+ BeanUtils.copyProperties(order, vo);
+ List<OrderDetail> details = orderDetailMapper.selectByOrderId(order.getOrderId());
+ List<OrderDetailItemVO> items = details.stream().map(d -> {
+ OrderDetailItemVO item = new OrderDetailItemVO();
+ BeanUtils.copyProperties(d, item);
+ return item;
+ }).collect(java.util.stream.Collectors.toList());
+ vo.setOrderDetails(items);
+ return vo;
+ }).collect(java.util.stream.Collectors.toList());
+
// 鏋勫缓杩斿洖缁撴灉
- return new PageResult<OrderInfo>(
- result.getRecords(),
+ return new PageResult<OrderDetailVO>(
+ voList,
result.getTotal(),
queryDTO.getPageNum().longValue(),
queryDTO.getPageSize().longValue(),
@@ -135,6 +178,139 @@
// 鏋勫缓杩斿洖缁撴灉
return new PageResult<OrderInfo>(
result.getRecords(),
+ result.getTotal(),
+ queryDTO.getPageNum().longValue(),
+ queryDTO.getPageSize().longValue(),
+ result.getPages()
+ );
+ }
+
+ @Override
+ public PageResult<OrderDetailVO> getBuyerOrderPageWithProductConditions(OrderQueryDTO queryDTO) {
+ // 鍙傛暟鏍￠獙
+ if (queryDTO.getUserId() == null) {
+ throw new BusinessException("鐢ㄦ埛ID涓嶈兘涓虹┖");
+ }
+
+ // 鏍规嵁浜у搧鏉′欢鏌ヨ浜у搧ID鍒楄〃
+ List<String> productIds = null;
+ if (StringUtils.hasText(queryDTO.getIndustryId()) || StringUtils.hasText(queryDTO.getUnitProjectId()) ||
+ StringUtils.hasText(queryDTO.getProductTypeId()) || StringUtils.hasText(queryDTO.getProductSubTypeId())) {
+ productIds = reportResultSubmissionMapper.selectProductIdsByConditions(
+ queryDTO.getIndustryId(), queryDTO.getUnitProjectId(),
+ queryDTO.getProductTypeId(), queryDTO.getProductSubTypeId()
+ );
+
+ // 濡傛灉娌℃湁鎵惧埌鍖归厤鐨勪骇鍝侊紝鐩存帴杩斿洖绌虹粨鏋�
+ if (CollectionUtils.isEmpty(productIds)) {
+ return new PageResult<OrderDetailVO>(
+ java.util.Collections.emptyList(),
+ 0L,
+ queryDTO.getPageNum().longValue(),
+ queryDTO.getPageSize().longValue(),
+ 0L
+ );
+ }
+ }
+
+ // 鍒涘缓鍒嗛〉瀵硅薄
+ Page<OrderInfo> page = new Page<>(queryDTO.getPageNum(), queryDTO.getPageSize());
+
+ // 鎵ц鍒嗛〉鏌ヨ
+ IPage<OrderInfo> result = baseMapper.selectBuyerOrderPageWithProductConditions(
+ page, queryDTO.getUserId(), queryDTO.getUnitId(), queryDTO.getOrderStatus(),
+ queryDTO.getPaymentStatus(), queryDTO.getPaymentType(), queryDTO.getProductName(),
+ queryDTO.getProviderName(), queryDTO.getOrderId(),
+ queryDTO.getApplyTimeStart() != null ? queryDTO.getApplyTimeStart().toString() : null,
+ queryDTO.getApplyTimeEnd() != null ? queryDTO.getApplyTimeEnd().toString() : null,
+ queryDTO.getCreateTimeStart() != null ? queryDTO.getCreateTimeStart().toString() : null,
+ queryDTO.getCreateTimeEnd() != null ? queryDTO.getCreateTimeEnd().toString() : null,
+ queryDTO.getOrderBy(), queryDTO.getOrderDirection(), productIds
+ );
+
+ // 灏嗚鍗曚笌璇︽儏鑱旇〃灏佽鍒癡O
+ List<OrderDetailVO> voList = result.getRecords().stream().map(order -> {
+ OrderDetailVO vo = new OrderDetailVO();
+ BeanUtils.copyProperties(order, vo);
+ List<OrderDetail> details = orderDetailMapper.selectByOrderId(order.getOrderId());
+ List<OrderDetailItemVO> items = details.stream().map(d -> {
+ OrderDetailItemVO item = new OrderDetailItemVO();
+ BeanUtils.copyProperties(d, item);
+ return item;
+ }).collect(java.util.stream.Collectors.toList());
+ vo.setOrderDetails(items);
+ return vo;
+ }).collect(java.util.stream.Collectors.toList());
+
+ // 鏋勫缓杩斿洖缁撴灉
+ return new PageResult<OrderDetailVO>(
+ voList,
+ result.getTotal(),
+ queryDTO.getPageNum().longValue(),
+ queryDTO.getPageSize().longValue(),
+ result.getPages()
+ );
+ }
+
+ @Override
+ public PageResult<OrderDetailVO> getSellerOrderPageWithProductConditions(OrderQueryDTO queryDTO) {
+ // 鍙傛暟鏍￠獙
+ if (queryDTO.getProviderId() == null) {
+ throw new BusinessException("鎻愪緵鑰匢D涓嶈兘涓虹┖");
+ }
+
+ // 鏍规嵁浜у搧鏉′欢鏌ヨ浜у搧ID鍒楄〃
+ List<String> productIds = null;
+ if (StringUtils.hasText(queryDTO.getIndustryId()) || StringUtils.hasText(queryDTO.getUnitProjectId()) ||
+ StringUtils.hasText(queryDTO.getProductTypeId()) || StringUtils.hasText(queryDTO.getProductSubTypeId())) {
+ productIds = reportResultSubmissionMapper.selectProductIdsByConditions(
+ queryDTO.getIndustryId(), queryDTO.getUnitProjectId(),
+ queryDTO.getProductTypeId(), queryDTO.getProductSubTypeId()
+ );
+
+ // 濡傛灉娌℃湁鎵惧埌鍖归厤鐨勪骇鍝侊紝鐩存帴杩斿洖绌虹粨鏋�
+ if (CollectionUtils.isEmpty(productIds)) {
+ return new PageResult<OrderDetailVO>(
+ java.util.Collections.emptyList(),
+ 0L,
+ queryDTO.getPageNum().longValue(),
+ queryDTO.getPageSize().longValue(),
+ 0L
+ );
+ }
+ }
+
+ // 鍒涘缓鍒嗛〉瀵硅薄
+ Page<OrderInfo> page = new Page<>(queryDTO.getPageNum(), queryDTO.getPageSize());
+
+ // 鎵ц鍒嗛〉鏌ヨ
+ IPage<OrderInfo> result = baseMapper.selectSellerOrderPageWithProductConditions(
+ page, queryDTO.getProviderId(), queryDTO.getOrderStatus(), queryDTO.getPaymentStatus(),
+ queryDTO.getProductName(), queryDTO.getOrderId(),
+ queryDTO.getApplyTimeStart() != null ? queryDTO.getApplyTimeStart().toString() : null,
+ queryDTO.getApplyTimeEnd() != null ? queryDTO.getApplyTimeEnd().toString() : null,
+ queryDTO.getCreateTimeStart() != null ? queryDTO.getCreateTimeStart().toString() : null,
+ queryDTO.getCreateTimeEnd() != null ? queryDTO.getCreateTimeEnd().toString() : null,
+ queryDTO.getOrderBy(), queryDTO.getOrderDirection(), productIds
+ );
+
+ // 灏嗚鍗曚笌璇︽儏鑱旇〃灏佽鍒癡O
+ List<OrderDetailVO> voList = result.getRecords().stream().map(order -> {
+ OrderDetailVO vo = new OrderDetailVO();
+ BeanUtils.copyProperties(order, vo);
+ List<OrderDetail> details = orderDetailMapper.selectByOrderId(order.getOrderId());
+ List<OrderDetailItemVO> items = details.stream().map(d -> {
+ OrderDetailItemVO item = new OrderDetailItemVO();
+ BeanUtils.copyProperties(d, item);
+ return item;
+ }).collect(java.util.stream.Collectors.toList());
+ vo.setOrderDetails(items);
+ return vo;
+ }).collect(java.util.stream.Collectors.toList());
+
+ // 鏋勫缓杩斿洖缁撴灉
+ return new PageResult<OrderDetailVO>(
+ voList,
result.getTotal(),
queryDTO.getPageNum().longValue(),
queryDTO.getPageSize().longValue(),
@@ -190,7 +366,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public String createOrder(CreateOrderDTO createOrderDTO) {
+ public OrderInfo createOrder(CreateOrderDTO createOrderDTO) {
if (createOrderDTO == null || CollectionUtils.isEmpty(createOrderDTO.getItems())) {
throw new BusinessException("璁㈠崟淇℃伅涓嶅畬鏁�");
}
@@ -219,7 +395,11 @@
orderInfo.setUserId(createOrderDTO.getUserId());
orderInfo.setUnitId(createOrderDTO.getUnitId());
orderInfo.setApplyTime(LocalDateTime.now());
- orderInfo.setOrderStatus("寰呭鎵�");
+
+ // 鏍规嵁璁㈠崟鏄庣粏涓槸鍚﹀寘鍚崗璁环鏍肩被鍨嬫潵鍐冲畾鍒濆鐘舵��
+ String initialStatus = determineInitialOrderStatus(createOrderDTO.getItems());
+ orderInfo.setOrderStatus(initialStatus);
+
orderInfo.setTotalAmount(createOrderDTO.getTotalAmount() != null ? createOrderDTO.getTotalAmount() : totalAmount);
orderInfo.setPaymentType(createOrderDTO.getPaymentType());
orderInfo.setPaymentStatus("鏈敮浠�");
@@ -258,15 +438,15 @@
orderDetailMapper.insert(detail);
}
- return orderId;
+ return orderInfo;
}
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean uploadOrderAttachment(String orderId, String fileName, String originalName,
- String fileType, Long fileSize, String fileUrl,
- String bucketName, String objectName, Long uploadUserId,
- String uploadUserName, String attachmentType, String description) {
+ public Long uploadOrderAttachment(String orderId, String fileName, String originalName,
+ String fileType, Long fileSize, String fileUrl,
+ String bucketName, String objectName, Long uploadUserId,
+ String uploadUserName, String attachmentType, String description) {
// 鍙傛暟鏍￠獙
if (!StringUtils.hasText(orderId)) {
throw new BusinessException("璁㈠崟ID涓嶈兘涓虹┖");
@@ -296,8 +476,13 @@
attachment.setAttachmentType(attachmentType);
attachment.setDescription(description);
- // 淇濆瓨闄勪欢
- return orderAttachmentMapper.insert(attachment) > 0;
+ // 淇濆瓨闄勪欢骞惰繑鍥為檮浠禝D
+ int result = orderAttachmentMapper.insert(attachment);
+ if (result > 0) {
+ return attachment.getId();
+ } else {
+ throw new BusinessException("淇濆瓨闄勪欢澶辫触");
+ }
}
@Override
@@ -419,4 +604,524 @@
// 淇濆瓨璇勪环
return orderEvaluationMapper.updateById(evaluation) > 0;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateOrderDetail(UpdateOrderDetailDTO updateOrderDetailDTO) {
+ // 鍙傛暟鏍￠獙
+ if (updateOrderDetailDTO == null) {
+ throw new BusinessException("鏇存柊鍙傛暟涓嶈兘涓虹┖");
+ }
+ if (!StringUtils.hasText(updateOrderDetailDTO.getOrderId())) {
+ throw new BusinessException("璁㈠崟ID涓嶈兘涓虹┖");
+ }
+ if (!StringUtils.hasText(updateOrderDetailDTO.getOrderStatus())) {
+ throw new BusinessException("璁㈠崟鐘舵�佷笉鑳戒负绌�");
+ }
+ if (CollectionUtils.isEmpty(updateOrderDetailDTO.getOrderDetails())) {
+ throw new BusinessException("璁㈠崟璇︽儏鍒楄〃涓嶈兘涓虹┖");
+ }
+
+ // 鏌ヨ璁㈠崟淇℃伅
+ OrderInfo orderInfo = this.getById(updateOrderDetailDTO.getOrderId());
+ if (orderInfo == null) {
+ throw new BusinessException("璁㈠崟涓嶅瓨鍦�");
+ }
+
+ // 鏇存柊璁㈠崟鐘舵��
+ orderInfo.setOrderStatus(updateOrderDetailDTO.getOrderStatus());
+ orderInfo.setUpdatedAt(LocalDateTime.now());
+ int orderUpdated = this.baseMapper.updateById(orderInfo);
+ if (orderUpdated <= 0) {
+ throw new BusinessException("鏇存柊璁㈠崟鐘舵�佸け璐�");
+ }
+
+ // 鏇存柊璁㈠崟璇︽儏澶囨敞
+ for (UpdateOrderDetailDTO.UpdateOrderDetailItemDTO itemDTO : updateOrderDetailDTO.getOrderDetails()) {
+ if (itemDTO.getId() == null) {
+ continue;
+ }
+
+ OrderDetail orderDetail = orderDetailMapper.selectById(itemDTO.getId());
+ if (orderDetail == null) {
+ log.warn("璁㈠崟璇︽儏涓嶅瓨鍦紝ID: {}", itemDTO.getId());
+ continue;
+ }
+
+ // 鏇存柊澶囨敞
+ orderDetail.setRemarks(itemDTO.getRemarks());
+ orderDetail.setUpdatedAt(LocalDateTime.now());
+
+ int detailUpdated = orderDetailMapper.updateById(orderDetail);
+ if (detailUpdated <= 0) {
+ log.warn("鏇存柊璁㈠崟璇︽儏澶辫触锛孖D: {}", itemDTO.getId());
+ }
+ }
+
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean checkFiles(FileCheckDTO fileCheckDTO) {
+ // 鍙傛暟鏍￠獙
+ if (fileCheckDTO == null) {
+ throw new BusinessException("鏂囦欢鏍告煡鍙傛暟涓嶈兘涓虹┖");
+ }
+ if (!StringUtils.hasText(fileCheckDTO.getOrderId())) {
+ throw new BusinessException("璁㈠崟ID涓嶈兘涓虹┖");
+ }
+ if (fileCheckDTO.getIsApprove() == null) {
+ throw new BusinessException("瀹℃壒缁撴灉涓嶈兘涓虹┖");
+ }
+ if (fileCheckDTO.getApproverId() == null) {
+ throw new BusinessException("瀹℃壒浜篒D涓嶈兘涓虹┖");
+ }
+ if (!StringUtils.hasText(fileCheckDTO.getApproverName())) {
+ throw new BusinessException("瀹℃壒浜哄鍚嶄笉鑳戒负绌�");
+ }
+
+ // 鏌ヨ璁㈠崟淇℃伅
+ OrderInfo orderInfo = this.getById(fileCheckDTO.getOrderId());
+ if (orderInfo == null) {
+ throw new BusinessException("璁㈠崟涓嶅瓨鍦�");
+ }
+
+ // 妫�鏌ヨ鍗曠姸鎬佹槸鍚︿负"寰呮巿鏉�"
+ if (!"寰呮巿鏉�".equals(orderInfo.getOrderStatus())) {
+ throw new BusinessException("璁㈠崟鐘舵�佷笉姝ｇ‘锛屽綋鍓嶇姸鎬佷负锛�" + orderInfo.getOrderStatus());
+ }
+
+ // 鏇存柊璁㈠崟鐘舵��
+ if (fileCheckDTO.getIsApprove()) {
+ // 閫氳繃锛氭洿鏂颁负"寰呬氦鏄撶‘璁�"
+ orderInfo.setOrderStatus("寰呬氦鏄撶‘璁�");
+ } else {
+ // 椹冲洖锛氭洿鏂颁负"寰呬笂浼犳枃浠�"(闇�瑕侀噸鏂颁笂浼�)
+ orderInfo.setOrderStatus("寰呬笂浼犳枃浠�");
+ }
+ orderInfo.setUpdatedAt(LocalDateTime.now());
+
+ // 淇濆瓨璁㈠崟
+ int updated = this.baseMapper.updateById(orderInfo);
+ if (updated <= 0) {
+ throw new BusinessException("鏇存柊璁㈠崟鐘舵�佸け璐�");
+ }
+
+ log.info("鏂囦欢鏍告煡瀹屾垚锛岃鍗旾D: {}, 瀹℃壒缁撴灉: {}, 瀹℃壒浜�: {}, 瀹℃壒鎰忚: {}",
+ fileCheckDTO.getOrderId(),
+ fileCheckDTO.getIsApprove() ? "閫氳繃" : "椹冲洖",
+ fileCheckDTO.getApproverName(),
+ fileCheckDTO.getApprovalOpinion());
+
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean approveOrder(OrderApprovalDTO orderApprovalDTO) {
+ // 鍙傛暟鏍￠獙
+ if (orderApprovalDTO == null) {
+ throw new BusinessException("瀹℃壒鍙傛暟涓嶈兘涓虹┖");
+ }
+ if (!StringUtils.hasText(orderApprovalDTO.getOrderId())) {
+ throw new BusinessException("璁㈠崟ID涓嶈兘涓虹┖");
+ }
+ if (!StringUtils.hasText(orderApprovalDTO.getApprovalOpinion())) {
+ throw new BusinessException("瀹℃壒鎰忚涓嶈兘涓虹┖");
+ }
+ if (orderApprovalDTO.getApproverId() == null) {
+ throw new BusinessException("瀹℃壒浜篒D涓嶈兘涓虹┖");
+ }
+ if (!StringUtils.hasText(orderApprovalDTO.getApproverName())) {
+ throw new BusinessException("瀹℃壒浜哄鍚嶄笉鑳戒负绌�");
+ }
+ if (!StringUtils.hasText(orderApprovalDTO.getApprovalType())) {
+ throw new BusinessException("瀹℃壒绫诲瀷涓嶈兘涓虹┖");
+ }
+ if (!StringUtils.hasText(orderApprovalDTO.getApprovalResult())) {
+ throw new BusinessException("瀹℃壒缁撴灉涓嶈兘涓虹┖");
+ }
+
+ // 鏌ヨ璁㈠崟淇℃伅
+ OrderInfo orderInfo = this.getById(orderApprovalDTO.getOrderId());
+ if (orderInfo == null) {
+ throw new BusinessException("璁㈠崟涓嶅瓨鍦�");
+ }
+
+ // 鍒涘缓瀹℃壒璁板綍
+ OrderApproval orderApproval = new OrderApproval();
+ orderApproval.setOrderId(orderApprovalDTO.getOrderId());
+ orderApproval.setApprovalStep("瀹℃壒鎺堟潈");
+ orderApproval.setApprovalType(orderApprovalDTO.getApprovalType());
+ orderApproval.setApprovalResult(orderApprovalDTO.getApprovalResult());
+ orderApproval.setApproverId(orderApprovalDTO.getApproverId());
+ orderApproval.setApproverName(orderApprovalDTO.getApproverName());
+ orderApproval.setApprovalOpinion(orderApprovalDTO.getApprovalOpinion());
+ orderApproval.setApprovalTime(LocalDateTime.now());
+
+ // 鎻掑叆瀹℃壒璁板綍
+ int insertResult = orderApprovalMapper.insert(orderApproval);
+ if (insertResult <= 0) {
+ throw new BusinessException("鎻掑叆瀹℃壒璁板綍澶辫触");
+ }
+
+ log.info("瀹℃壒璁板綍娣诲姞鎴愬姛锛岃鍗旾D: {}, 瀹℃壒绫诲瀷: {}, 瀹℃壒缁撴灉: {}, 瀹℃壒浜�: {}, 瀹℃壒鎰忚: {}",
+ orderApprovalDTO.getOrderId(),
+ orderApprovalDTO.getApprovalType(),
+ orderApprovalDTO.getApprovalResult(),
+ orderApprovalDTO.getApproverName(),
+ orderApprovalDTO.getApprovalOpinion());
+
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateOrderStatusToNext(String orderId) {
+ // 鍙傛暟鏍￠獙
+ if (!StringUtils.hasText(orderId)) {
+ throw new BusinessException("璁㈠崟ID涓嶈兘涓虹┖");
+ }
+
+ // 鏌ヨ璁㈠崟淇℃伅
+ OrderInfo orderInfo = this.getById(orderId);
+ if (orderInfo == null) {
+ throw new BusinessException("璁㈠崟涓嶅瓨鍦�");
+ }
+
+ // 鑾峰彇褰撳墠鐘舵��
+ String currentStatus = orderInfo.getOrderStatus();
+ if (!StringUtils.hasText(currentStatus)) {
+ throw new BusinessException("璁㈠崟褰撳墠鐘舵�佷负绌�");
+ }
+
+ // 鑾峰彇涓嬩竴涓姸鎬�
+ String nextStatus = getNextOrderStatus(currentStatus);
+ if (nextStatus == null) {
+ throw new BusinessException("褰撳墠鐘舵�� " + currentStatus + " 宸叉槸鏈�缁堢姸鎬侊紝鏃犳硶缁х画娴佽浆");
+ }
+
+ // 鏇存柊璁㈠崟鐘舵��
+ orderInfo.setOrderStatus(nextStatus);
+ orderInfo.setUpdatedAt(LocalDateTime.now());
+
+ int updated = this.baseMapper.updateById(orderInfo);
+ if (updated <= 0) {
+ throw new BusinessException("鏇存柊璁㈠崟鐘舵�佸け璐�");
+ }
+
+ log.info("璁㈠崟鐘舵�佹洿鏂版垚鍔燂紝璁㈠崟ID: {}, 浠� {} 鏇存柊涓� {}", orderId, currentStatus, nextStatus);
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateOrderStatusToPrevious(String orderId) {
+ // 鍙傛暟鏍￠獙
+ if (!StringUtils.hasText(orderId)) {
+ throw new BusinessException("璁㈠崟ID涓嶈兘涓虹┖");
+ }
+
+ // 鏌ヨ璁㈠崟淇℃伅
+ OrderInfo orderInfo = this.getById(orderId);
+ if (orderInfo == null) {
+ throw new BusinessException("璁㈠崟涓嶅瓨鍦�");
+ }
+
+ // 鑾峰彇褰撳墠鐘舵��
+ String currentStatus = orderInfo.getOrderStatus();
+ if (!StringUtils.hasText(currentStatus)) {
+ throw new BusinessException("璁㈠崟褰撳墠鐘舵�佷负绌�");
+ }
+
+ // 鑾峰彇涓婁竴涓姸鎬�
+ String previousStatus = getPreviousOrderStatus(currentStatus);
+ if (previousStatus == null) {
+ throw new BusinessException("褰撳墠鐘舵�� " + currentStatus + " 宸叉槸鍒濆鐘舵�侊紝鏃犳硶鍥為��");
+ }
+
+ // 鏇存柊璁㈠崟鐘舵��
+ orderInfo.setOrderStatus(previousStatus);
+ orderInfo.setUpdatedAt(LocalDateTime.now());
+
+ int updated = this.baseMapper.updateById(orderInfo);
+ if (updated <= 0) {
+ throw new BusinessException("鏇存柊璁㈠崟鐘舵�佸け璐�");
+ }
+
+ log.info("璁㈠崟鐘舵�佹洿鏂版垚鍔燂紝璁㈠崟ID: {}, 浠� {} 鍥為��涓� {}", orderId, currentStatus, previousStatus);
+ return true;
+ }
+
+ /**
+ * 鏍规嵁璁㈠崟鏄庣粏纭畾鍒濆璁㈠崟鐘舵��
+ * @param items 璁㈠崟鏄庣粏鍒楄〃
+ * @return 鍒濆鐘舵��
+ */
+ private String determineInitialOrderStatus(List<CreateOrderItemDTO> items) {
+ // 妫�鏌ユ槸鍚︽湁浠锋牸绫诲瀷涓�"鍗忚"鐨勬槑缁嗛」
+ boolean hasAgreementPrice = items.stream()
+ .anyMatch(item -> "鍗忚".equals(item.getPriceType()));
+
+ // 濡傛灉鏈夊崗璁环鏍硷紝浠�"寰呬笂浼犳枃浠�"寮�濮嬶紝鍚﹀垯浠�"寰呮巿鏉�"寮�濮�
+ String initialStatus = hasAgreementPrice ? "寰呬笂浼犳枃浠�" : "寰呮巿鏉�";
+
+ log.info("璁㈠崟鍒濆鐘舵�佺‘瀹氫负: {}, 鏄惁鍖呭惈鍗忚浠锋牸: {}", initialStatus, hasAgreementPrice);
+ return initialStatus;
+ }
+
+ /**
+ * 鑾峰彇涓嬩竴涓鍗曠姸鎬�
+ * @param currentStatus 褰撳墠鐘舵��
+ * @return 涓嬩竴涓姸鎬侊紝濡傛灉鏄渶缁堢姸鎬佸垯杩斿洖null
+ */
+ private String getNextOrderStatus(String currentStatus) {
+ switch (currentStatus) {
+ case "寰呬笂浼犳枃浠�":
+ return "寰呮巿鏉�";
+ case "寰呮巿鏉�":
+ return "寰呬氦鏄撶‘璁�";
+ case "寰呬氦鏄撶‘璁�":
+ return "宸插畬鎴�";
+ case "宸插畬鎴�":
+ return "宸茶瘎浠�";
+ case "宸茶瘎浠�":
+ return null; // 鏈�缁堢姸鎬�
+ default:
+ throw new BusinessException("鏈煡鐨勮鍗曠姸鎬侊細" + currentStatus);
+ }
+ }
+
+ /**
+ * 鑾峰彇涓婁竴涓鍗曠姸鎬�
+ * @param currentStatus 褰撳墠鐘舵��
+ * @return 涓婁竴涓姸鎬侊紝濡傛灉鏄垵濮嬬姸鎬佸垯杩斿洖null
+ */
+ private String getPreviousOrderStatus(String currentStatus) {
+ switch (currentStatus) {
+ case "寰呬笂浼犳枃浠�":
+ return null; // 鍒濆鐘舵��
+ case "寰呮巿鏉�":
+ return "寰呬笂浼犳枃浠�";
+ case "寰呬氦鏄撶‘璁�":
+ return "寰呮巿鏉�";
+ case "宸插畬鎴�":
+ return "寰呬氦鏄撶‘璁�";
+ case "宸茶瘎浠�":
+ return "宸插畬鎴�";
+ default:
+ throw new BusinessException("鏈煡鐨勮鍗曠姸鎬侊細" + currentStatus);
+ }
+ }
+
+ @Override
+ public boolean hasAgreementPriceType(String orderId) {
+ // 鍙傛暟鏍￠獙
+ if (!StringUtils.hasText(orderId)) {
+ throw new BusinessException("璁㈠崟ID涓嶈兘涓虹┖");
+ }
+
+ // 鏌ヨ璁㈠崟璇︽儏锛屾鏌ユ槸鍚︽湁浠锋牸绫诲瀷涓�"鍗忚"鐨勫瓙璁㈠崟
+ QueryWrapper<OrderDetail> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("order_id", orderId);
+ queryWrapper.eq("price_type", "鍗忚");
+ queryWrapper.eq("deleted", 0);
+
+ List<OrderDetail> agreementDetails = orderDetailMapper.selectList(queryWrapper);
+
+ boolean hasAgreement = !CollectionUtils.isEmpty(agreementDetails);
+ log.info("妫�鏌ヨ鍗曞崗璁被鍨嬶紝璁㈠崟ID: {}, 鏄惁鍖呭惈鍗忚绫诲瀷: {}", orderId, hasAgreement);
+
+ return hasAgreement;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateOrderDetailRemarksOnly(UpdateOrderDetailDTO.UpdateOrderDetailRemarksOnlyDTO updateOrderDetailDTO) {
+ // 鍙傛暟鏍￠獙
+ if (updateOrderDetailDTO == null) {
+ throw new BusinessException("鏇存柊鍙傛暟涓嶈兘涓虹┖");
+ }
+ if (!StringUtils.hasText(updateOrderDetailDTO.getOrderId())) {
+ throw new BusinessException("璁㈠崟ID涓嶈兘涓虹┖");
+ }
+ if (CollectionUtils.isEmpty(updateOrderDetailDTO.getOrderDetails())) {
+ throw new BusinessException("璁㈠崟璇︽儏鍒楄〃涓嶈兘涓虹┖");
+ }
+
+ // 鏌ヨ璁㈠崟淇℃伅锛堥獙璇佽鍗曞瓨鍦級
+ OrderInfo orderInfo = this.getById(updateOrderDetailDTO.getOrderId());
+ if (orderInfo == null) {
+ throw new BusinessException("璁㈠崟涓嶅瓨鍦�");
+ }
+
+ // 鍙洿鏂拌鍗曡鎯呭娉紝涓嶆洿鏂拌鍗曠姸鎬�
+ for (UpdateOrderDetailDTO.UpdateOrderDetailItemDTO itemDTO : updateOrderDetailDTO.getOrderDetails()) {
+ if (itemDTO.getId() == null) {
+ continue;
+ }
+
+ OrderDetail orderDetail = orderDetailMapper.selectById(itemDTO.getId());
+ if (orderDetail == null) {
+ log.warn("璁㈠崟璇︽儏涓嶅瓨鍦紝ID: {}", itemDTO.getId());
+ continue;
+ }
+
+ // 鏇存柊澶囨敞
+ orderDetail.setRemarks(itemDTO.getRemarks());
+ orderDetail.setUpdatedAt(LocalDateTime.now());
+
+ int detailUpdated = orderDetailMapper.updateById(orderDetail);
+ if (detailUpdated <= 0) {
+ log.warn("鏇存柊璁㈠崟璇︽儏澶辫触锛孖D: {}", itemDTO.getId());
+ }
+ }
+
+ log.info("璁㈠崟璇︽儏澶囨敞鏇存柊鎴愬姛锛岃鍗旾D: {}", updateOrderDetailDTO.getOrderId());
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean deleteOrderAttachment(Long attachmentId) {
+ // 鍙傛暟鏍￠獙
+ if (attachmentId == null) {
+ throw new BusinessException("闄勪欢ID涓嶈兘涓虹┖");
+ }
+
+ log.info("寮�濮嬪垹闄よ鍗曢檮浠讹紝闄勪欢ID: {}", attachmentId);
+
+ // 鏌ヨ闄勪欢淇℃伅
+ OrderAttachment attachment = orderAttachmentMapper.selectById(attachmentId);
+ if (attachment == null) {
+ log.error("闄勪欢涓嶅瓨鍦紝闄勪欢ID: {}", attachmentId);
+ throw new BusinessException("闄勪欢涓嶅瓨鍦�");
+ }
+
+ log.info("鏌ヨ鍒伴檮浠朵俊鎭�: ID={}, 鏂囦欢鍚�={}, 瀵硅薄鍚嶇О={}, 褰撳墠鍒犻櫎鐘舵��={}",
+ attachment.getId(), attachment.getFileName(), attachment.getObjectName(), attachment.getDeleted());
+
+ try {
+ // 1. 鍒犻櫎MinIO涓殑鏂囦欢
+ if (StringUtils.hasText(attachment.getObjectName())) {
+ log.info("寮�濮嬪垹闄inIO鏂囦欢锛屽璞″悕绉�: {}", attachment.getObjectName());
+ minioService.deleteFile(attachment.getObjectName());
+ log.info("MinIO鏂囦欢鍒犻櫎鎴愬姛锛屽璞″悕绉�: {}", attachment.getObjectName());
+ } else {
+ log.warn("闄勪欢瀵硅薄鍚嶇О涓虹┖锛岃烦杩嘙inIO鏂囦欢鍒犻櫎");
+ }
+
+ // 2. 鍒犻櫎鏁版嵁搴撲腑鐨勯檮浠惰褰曪紙閫昏緫鍒犻櫎锛�
+ log.info("寮�濮嬮�昏緫鍒犻櫎鏁版嵁搴撹褰曪紝闄勪欢ID: {}", attachmentId);
+
+ // 浣跨敤MyBatis-Plus鐨勯�昏緫鍒犻櫎鏂规硶
+ int result = orderAttachmentMapper.deleteById(attachmentId);
+ log.info("鏁版嵁搴撻�昏緫鍒犻櫎缁撴灉: 褰卞搷琛屾暟={}", result);
+
+ if (result > 0) {
+ log.info("璁㈠崟闄勪欢鍒犻櫎鎴愬姛锛岄檮浠禝D: {}, 鏂囦欢鍚�: {}", attachmentId, attachment.getFileName());
+ return true;
+ } else {
+ log.error("鏁版嵁搴撴洿鏂板け璐ワ紝褰卞搷琛屾暟涓�0锛岄檮浠禝D: {}", attachmentId);
+ throw new BusinessException("鍒犻櫎闄勪欢璁板綍澶辫触");
+ }
+ } catch (Exception e) {
+ log.error("鍒犻櫎璁㈠崟闄勪欢澶辫触锛岄檮浠禝D: {}", attachmentId, e);
+ throw new BusinessException("鍒犻櫎璁㈠崟闄勪欢澶辫触锛�" + e.getMessage());
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean cancelOrder(String orderId) {
+ // 鍙傛暟鏍￠獙
+ if (!StringUtils.hasText(orderId)) {
+ throw new BusinessException("璁㈠崟ID涓嶈兘涓虹┖");
+ }
+
+ log.info("寮�濮嬪彇娑堣鍗曪紝璁㈠崟ID: {}", orderId);
+
+ // 鏌ヨ璁㈠崟淇℃伅
+ OrderInfo orderInfo = this.getById(orderId);
+ if (orderInfo == null) {
+ throw new BusinessException("璁㈠崟涓嶅瓨鍦�");
+ }
+
+ // 妫�鏌ヨ鍗曠姸鎬侊紝鍙湁"宸插畬鎴�"鐘舵�佸墠鐨勮鍗曟墠鑳藉彇娑�
+ String currentStatus = orderInfo.getOrderStatus();
+ if ("宸插畬鎴�".equals(currentStatus) || "宸茶瘎浠�".equals(currentStatus)) {
+ throw new BusinessException("宸插畬鎴愭垨宸茶瘎浠风殑璁㈠崟涓嶈兘鍙栨秷");
+ }
+
+ try {
+ // 1. 鍒犻櫎璁㈠崟闄勪欢锛堝寘鎷琈inIO鏂囦欢鍜屾暟鎹簱璁板綍锛�
+ log.info("寮�濮嬪垹闄よ鍗曢檮浠讹紝璁㈠崟ID: {}", orderId);
+ List<OrderAttachment> attachments = orderAttachmentMapper.selectByOrderId(orderId);
+ for (OrderAttachment attachment : attachments) {
+ try {
+ // 鍒犻櫎MinIO涓殑鏂囦欢
+ if (StringUtils.hasText(attachment.getObjectName())) {
+ log.info("鍒犻櫎MinIO鏂囦欢锛屽璞″悕绉�: {}", attachment.getObjectName());
+ minioService.deleteFile(attachment.getObjectName());
+ }
+ // 鍒犻櫎鏁版嵁搴撹褰�
+ orderAttachmentMapper.deleteById(attachment.getId());
+ log.info("鍒犻櫎闄勪欢璁板綍鎴愬姛锛岄檮浠禝D: {}", attachment.getId());
+ } catch (Exception e) {
+ log.error("鍒犻櫎闄勪欢澶辫触锛岄檮浠禝D: {}, 閿欒: {}", attachment.getId(), e.getMessage());
+ // 缁х画鍒犻櫎鍏朵粬闄勪欢锛屼笉涓柇鏁翠釜娴佺▼
+ }
+ }
+
+ // 2. 閫昏緫鍒犻櫎璁㈠崟璇︽儏
+ log.info("寮�濮嬮�昏緫鍒犻櫎璁㈠崟璇︽儏锛岃鍗旾D: {}", orderId);
+ // 鍏堟煡璇㈣鍗曡鎯呭垪琛紝鐒跺悗閫愪釜閫昏緫鍒犻櫎
+ List<OrderDetail> orderDetails = orderDetailMapper.selectByOrderId(orderId);
+ int detailDeleted = 0;
+ for (OrderDetail detail : orderDetails) {
+ int result = orderDetailMapper.deleteById(detail.getId());
+ if (result > 0) {
+ detailDeleted++;
+ }
+ }
+ log.info("閫昏緫鍒犻櫎璁㈠崟璇︽儏瀹屾垚锛屽奖鍝嶈鏁�: {}", detailDeleted);
+
+ // 3. 鍒犻櫎璁㈠崟淇℃伅锛堥�昏緫鍒犻櫎锛�
+ log.info("寮�濮嬪垹闄よ鍗曚俊鎭紝璁㈠崟ID: {}", orderId);
+ int orderDeleted = this.baseMapper.deleteById(orderId);
+ log.info("鍒犻櫎璁㈠崟淇℃伅瀹屾垚锛屽奖鍝嶈鏁�: {}", orderDeleted);
+
+ if (orderDeleted > 0) {
+ log.info("璁㈠崟鍙栨秷鎴愬姛锛岃鍗旾D: {}", orderId);
+ return true;
+ } else {
+ log.error("鍒犻櫎璁㈠崟淇℃伅澶辫触锛屽奖鍝嶈鏁颁负0锛岃鍗旾D: {}", orderId);
+ throw new BusinessException("鍒犻櫎璁㈠崟淇℃伅澶辫触");
+ }
+ } catch (Exception e) {
+ log.error("鍙栨秷璁㈠崟澶辫触锛岃鍗旾D: {}", orderId, e);
+ throw new BusinessException("鍙栨秷璁㈠崟澶辫触锛�" + e.getMessage());
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateWorkflowId(String orderId, String workflowId) {
+ if (!StringUtils.hasText(orderId)) {
+ throw new BusinessException("璁㈠崟ID涓嶈兘涓虹┖");
+ }
+ if (!StringUtils.hasText(workflowId)) {
+ throw new BusinessException("宸ヤ綔娴両D涓嶈兘涓虹┖");
+ }
+
+ OrderInfo orderInfo = this.getById(orderId);
+ if (orderInfo == null) {
+ throw new BusinessException("璁㈠崟涓嶅瓨鍦�");
+ }
+
+ orderInfo.setWorkflowId(workflowId);
+ orderInfo.setUpdatedAt(LocalDateTime.now());
+ return this.updateById(orderInfo);
+ }
}
--
Gitblit v1.8.0