From 383d1c41ebc2fb5262e473d3dee43fcb52830c73 Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Mon, 26 Aug 2024 16:10:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=80=80=E7=A7=9F=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=A2=9E=E5=8A=A0=E8=A7=A3=E5=86=BB=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?try=20catch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gxwebsoft/shop/controller/OrderRefundController.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java
index d8573b0..dd6a197 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java
@@ -29,6 +29,7 @@ import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.shop.service.OrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -47,6 +48,7 @@ import static com.gxwebsoft.common.core.constants.OrderConstants.*;
  * @since 2023-05-18 13:09:51
  */
 @Api(tags = "售后单记录表管理")
+@Slf4j
 @RestController
 @RequestMapping("/api/shop/order-refund")
 public class OrderRefundController extends BaseController {
@@ -140,7 +142,11 @@ public class OrderRefundController extends BaseController {
             order.setReceiptStatus(RECEIPT_STATUS_RETURN);
             order.setOrderStatus(ORDER_STATUS_OVER);
             orderService.updateById(order);
-            freezeOrderService.unfreeze(order.getOrderId(), refundMoney);
+            try {
+                freezeOrderService.unfreeze(order.getOrderId(), refundMoney);//这里有可能出现没有找不到解冻订单的问题
+            }catch (Exception e){
+                log.warn("解冻失败！orderId:{},orderNo:{},errMesg:{}", orderRefund.getOrderId(),orderRefund.getOrderNo(),e.getMessage());
+            }
 //              freezeOrderService.deduction(order.getOrderId());
         }
         else if(auditStatus.equals(30)) {