From c06d972894b536cd96b817c922fb73f69c9d1a71 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Wed, 17 Sep 2025 19:28:40 +0800
Subject: [PATCH] fix: 调整店铺与商户绑定方式

---
 oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 ddf7a31..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("订单不存在!");
         }
@@ -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) {

--
Gitblit v1.9.3