From b1739f47e88d184337f08e703fece6b134549c3b Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Sat, 5 Jul 2025 12:11:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=80=80=E6=AC=BE=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ShopOrderReturnServiceImpl.java      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
index 628329d8..30b2c238 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
@@ -903,6 +903,15 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
      *
      * @param orderId
      * @param returnFlag 退货类型(ENUM): 0-不用退货;1-需要退货
+     *                   <p>
+     *                   RETURN_PROCESS_SUBMIT = 3100; //【客户】提交退单1ReturnReturn
+     *                   RETURN_PROCESS_CHECK = 3105; //退单审核1ReturnReturn
+     *                   RETURN_PROCESS_RECEIVED = 3110; //收货确认0ReturnReturn
+     *                   RETURN_PROCESS_REFUND = 3115; //退款确认0ReturnReturn
+     *                   RETURN_PROCESS_RECEIPT_CONFIRMATION = 3120; //[【客户】收款确认0 ReturnReturn
+     *                   RETURN_PROCESS_FINISH = 3125; //完成1退货退款
+     *                   RETURN_PROCESS_REFUSED = 3130; //-商家拒绝退货
+     *                   RETURN_PROCESS_CANCEL = 3135; //-买家取消退款
      * @return
      */
     @GlobalTransactional
@@ -922,14 +931,6 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
 
         returnFlag = CheckUtil.isEmpty(returnFlag) ? 0 : returnFlag;
 
-        //    RETURN_PROCESS_SUBMIT = 3100; //【客户】提交退单1ReturnReturn
-        //    RETURN_PROCESS_CHECK = 3105; //退单审核1ReturnReturn
-        //    RETURN_PROCESS_RECEIVED = 3110; //收货确认0ReturnReturn
-        //    RETURN_PROCESS_REFUND = 3115; //退款确认0ReturnReturn
-        //    RETURN_PROCESS_RECEIPT_CONFIRMATION = 3120; //[【客户】收款确认0 ReturnReturn
-        //   RETURN_PROCESS_FINISH = 3125; //完成1退货退款
-        //   RETURN_PROCESS_REFUSED = 3130; //-商家拒绝退货
-        //   RETURN_PROCESS_CANCEL = 3135; //-买家取消退款
 
         List<String> return_ids = Collections.singletonList(shopOrderReturn.getReturn_id());
 
@@ -1039,7 +1040,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
             order_item_row.setOrder_item_return_num(order_item_row.getOrder_item_return_num() + return_item_num);
             order_item_row.setOrder_item_return_subtotal(NumberUtil.add(order_item_row.getOrder_item_return_subtotal(), return_item_subtotal));
             // 乐观锁
-            order_item_row.setVersion(Optional.ofNullable(order_item_row.getVersion()).orElse(0) + 1);
+//            order_item_row.setVersion(Optional.ofNullable(order_item_row.getVersion()).orElse(0) + 1);
             if (!shopOrderItemService.edit(order_item_row)) {
                 throw new ApiException(I18nUtil._("修改订单信息失败！"));
             }