From 40bff1d19de4d55c910e2f6e8378c8b114af4d31 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Mon, 26 Aug 2024 09:56:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hfkj/service/hlt/HltCardRefundService.java  | 4 ++--
 .../com/hfkj/service/order/impl/BsOrderRefundServiceImpl.java | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/service/src/main/java/com/hfkj/service/hlt/HltCardRefundService.java b/service/src/main/java/com/hfkj/service/hlt/HltCardRefundService.java
index d2b4e32..5956245 100644
--- a/service/src/main/java/com/hfkj/service/hlt/HltCardRefundService.java
+++ b/service/src/main/java/com/hfkj/service/hlt/HltCardRefundService.java
@@ -49,7 +49,7 @@ public class HltCardRefundService {
      * @param orderRefund
      * @return
      */
-    public BsOrderRefund refund(BsOrderRefund orderRefund) {
+    public boolean refund(BsOrderRefund orderRefund) {
         // 查询系统订单号
         BsHltCardRecord oldCardRecord = hltCardRecordService.getNewPayOrderNo(orderRefund.getOrderNo());
         if (oldCardRecord == null) {
@@ -147,6 +147,6 @@ public class HltCardRefundService {
             oldCardRecord.setExceptionContent("未知错误");
             hltCardRecordService.update(oldCardRecord);
         }
-        return orderRefund;
+        return !oldCardRecord.getExceptionStatus();
     }
 }
diff --git a/service/src/main/java/com/hfkj/service/order/impl/BsOrderRefundServiceImpl.java b/service/src/main/java/com/hfkj/service/order/impl/BsOrderRefundServiceImpl.java
index c949b28..76e85de 100644
--- a/service/src/main/java/com/hfkj/service/order/impl/BsOrderRefundServiceImpl.java
+++ b/service/src/main/java/com/hfkj/service/order/impl/BsOrderRefundServiceImpl.java
@@ -103,8 +103,7 @@ public class BsOrderRefundServiceImpl implements BsOrderRefundService {
 
             } else if (OrderPayChannelEnum.type4.getCode() == orderRefund.getRefundPayChannel()) {
                 // 商户退款
-                orderRefund = hltCardRefundService.refund(orderRefund);
-                return true;
+                return hltCardRefundService.refund(orderRefund);
             } else {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "退款失败！该支付方式暂不支持退款");
             }