From 8c0ddb847afb86d8af154e8a32449473f4a32a42 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sat, 14 Feb 2026 12:44:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=B9=BF=E5=91=8A=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/service/impl/xfj/HardXfjServiceImpl.java   | 13 +++++++++----
 .../src/main/resources/application.yml              |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/xfj/HardXfjServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/xfj/HardXfjServiceImpl.java
index 2f2de31cc..c76c294a5 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/xfj/HardXfjServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/xfj/HardXfjServiceImpl.java
@@ -10,7 +10,6 @@ import com.bsd.pjcloud.admin.api.dto.UserInfo;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
 import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.xfj.HardXfjTypeEnum;
-import com.bsd.pjcloud.hard.api.dto.order.HardAdminRefundReinforceDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.dto.order.xfj.HardXfjFastCreateOrderDto;
 import com.bsd.pjcloud.hard.api.dto.xfj.XfjQRCodeTransactionDto;
@@ -406,11 +405,13 @@ public class HardXfjServiceImpl implements HardXfjService {
             logger.setError(e.getMessage());
             e.printStackTrace();
             log.error("|订单退款接口|意外的错误error:{}", e.getMessage());
+            result.setStatus(XfjBaseVo.STATUS_FAIL);
+            result.setMsg(e.getMessage());
+            return result;
         } finally {
             logger.setRes(JSONUtil.toJsonStr(result));
             saveLogger(logger);
         }
-        return null;
     }
 
     /**
@@ -470,11 +471,13 @@ public class HardXfjServiceImpl implements HardXfjService {
             logger.setError(e.getMessage());
             e.printStackTrace();
             log.error("|付款码(二维码)支付接口|意外的错误error:{}", e.getMessage());
+            result.setStatus(XfjBaseVo.STATUS_FAIL);
+            result.setMsg(e.getMessage());
+            return result;
         } finally {
             logger.setRes(JSONUtil.toJsonStr(result));
             saveLogger(logger);
         }
-        return null;
     }
 
     /**
@@ -531,10 +534,12 @@ public class HardXfjServiceImpl implements HardXfjService {
             logger.setError(e.getMessage());
             e.printStackTrace();
             log.error("|二维码支付结果查询接口|意外的错误error:{}", e.getMessage());
+            result.setStatus(XfjBaseVo.STATUS_FAIL);
+            result.setMsg(e.getMessage());
+            return result;
         } finally {
             saveLogger(logger);
         }
-        return null;
     }
 
     /**
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml
index a8c4abc6a..1d6192b0d 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml
@@ -104,7 +104,7 @@ zy:
   # sm4-key: 63P839eg0uxE5aoG
 
 ad:
-  uni-ad-callback-secret: 18200af9d0c84670747e920a66ec09cda0962bc8f42f23431c7dc52bca17e226
+  uni-ad-callback-secret: ee2b40b8b399d2416c4c2df9cca7344adf9838dc179af5360bc52be410020428
 
 
 sms: