From a1c22dc7beef7beee4e6bb702ac254cf9f172f8e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:08:40 +0800
Subject: [PATCH] 订单备货接单并行
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java
index 1d6d032..8ed6275 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java
@@ -79,7 +79,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public synchronized void create(ReturnOrder resources) {
- Order order = orderService.queryByOrderNum(resources.getOrderNum());
+ OrderResponse response = orderService.getByOrderNum(resources.getOrderNum());
+ Order order = response.getOrder();
if (order == null) {
throw new BadRequestException("订单不存在！");
}
@@ -88,7 +89,7 @@
}
OrderReturn returnOrder1 = orderReturnMapper.getByOrderNum(resources.getOrderNum(), ReturnAuditEnum.ZERO.getKey());
if (returnOrder1 != null) {
- throw new BadRequestException("退款订单已提交");
+ throw new BadRequestException("申请已提交");
}
OrderReturn returnOrder2 = orderReturnMapper.getByOrderNum(resources.getOrderNum(), ReturnAuditEnum.TWO.getKey());
if (returnOrder2 != null) {
@@ -102,8 +103,8 @@
// 退款订单号
String returnNum = redisUtils.generateSn(ORDER_RETURN_KEY, GenerateEnum.ORDER_RETURN.getKey());
returnOrder.setReturnNum(returnNum);
- returnOrder.setReturnStatus(ReturnAuditEnum.ZERO.getKey());
- returnOrder.setReturnStatusDescribe(ReturnAuditEnum.ZERO.getValue());
+ returnOrder.setReturnStatus(OrderStatusEnum.TEN.getKey());
+ returnOrder.setReturnStatusDescribe(OrderStatusEnum.TEN.getValue());
returnOrder.setOrderNum(resources.getOrderNum());
returnOrder.setOrderTime(order.getOrderTime());
returnOrder.setOrderStoreNum(order.getOrderStoreNum());
@@ -137,6 +138,7 @@
}
}
productSnapshotService.saveBatch(productSnapshots);
+ operationLogService.create(response, OrderStatusEnum.TEN, null);
}
private static OrderReturnProductSnapshot getSnapshot(OrderProductSnapshot snapshot, String returnNum) {
@@ -164,10 +166,13 @@
public void cancel(String returnNum) {
OrderReturn orderReturn = orderReturnMapper.getByReturnNum(returnNum);
if (orderReturn == null) {
- throw new BadRequestException("订单不存在！");
+ throw new BadRequestException("申请不存在！");
}
if (!orderReturn.getUserId().equals(SecurityUtils.getCurrentUserId())) {
- throw new BadRequestException("不能修改他人订单");
+ throw new BadRequestException("不能修改他人申请");
+ }
+ if (orderReturn.getAuditStatus().equals(ReturnAuditEnum.ONE.getKey())) {
+ throw new BadRequestException("申请已拒绝");
}
orderReturnMapper.updateStatus(returnNum, OrderStatusEnum.FIFTEEN.getKey(), OrderStatusEnum.FIFTEEN.getValue(),
ReturnAuditEnum.THREE.getKey());
@@ -188,10 +193,10 @@
public synchronized void audit(AuditOrderReturn resources) {
OrderReturn orderReturn = orderReturnMapper.getByReturnNum(resources.getReturnNum());
if (orderReturn == null) {
- throw new BadRequestException("订单不存在！");
+ throw new BadRequestException("申请不存在！");
}
if (!Objects.equals(orderReturn.getReturnStatus(), ReturnAuditEnum.ZERO.getKey())) {
- throw new BadRequestException("订单已处理或取消");
+ throw new BadRequestException("申请已处理或取消");
}
if (resources.getAmount().compareTo(orderReturn.getActuallyPayPrice()) > 0) {
throw new BadRequestException("退款金额超过订单金额");
--
Gitblit v1.9.3