From 64e180d293fed0851c0e63808c9ef3948f3f882f Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Sun, 13 Jul 2025 00:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E9=80=80=E6=AC=BE=20fix=20bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/ShopOrderReturnServiceImpl.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 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 798cea6c..b4fcc255 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
@@ -2195,7 +2195,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
      * @return CommonResult 统一返回结果
      * @throws ApiException 仅当用户未登录时抛出
      */
-    @Transactional
+    // @Transactional
     @Override
     public CommonResult doRefundForMch(JSONObject requestParams) {
         try {
@@ -2304,7 +2304,6 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
                 if (refundOrder == null) {
                     return CommonResult.failed("退货单创建失败");
                 }
-                refundOrder.setReturn_buyer_message(refundRequest.getReturn_buyer_message());
             }
 
             // === 6. 处理退货 ===
@@ -2314,7 +2313,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
             refundOrder.setReturn_store_message(reason);
             refundOrder.setReturn_buyer_message(reason);
 
-            logger.info("商家退款订单：{}", refundOrder);
+            logger.info("商家退款订单：{}", JSONUtil.toJsonStr(refundOrder));
 
             if (!processReviewList(refundOrder, 0)) {
                 return CommonResult.failed("退款处理失败");
@@ -2334,7 +2333,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
             return CommonResult.success();
         } catch (Exception e) {
             log.error("商家处理退款异常", e);
-            return CommonResult.failed("系统处理退款时发生异常");
+            return CommonResult.failed(e.getMessage());
         }
     }