From d98e92ff3cd9bde1398d4f84a393da9397cb6e70 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 19:57:04 +0800
Subject: [PATCH] Merge branch 'xin' into pxb

---
 oying-system/src/main/java/com/oying/modules/hwc/service/SwiftPassService.java |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/hwc/service/SwiftPassService.java b/oying-system/src/main/java/com/oying/modules/hwc/service/SwiftPassService.java
index 9083daa..5c6c7c5 100644
--- a/oying-system/src/main/java/com/oying/modules/hwc/service/SwiftPassService.java
+++ b/oying-system/src/main/java/com/oying/modules/hwc/service/SwiftPassService.java
@@ -4,10 +4,7 @@
 import com.oying.modules.hwc.domain.HwcResponse;
 import com.oying.utils.enums.PayTypeEnum;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
-import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -23,8 +20,8 @@
      *
      * @see [类、类#方法、类#成员]
      */
-    HwcResponse pay(String ip, Integer total, String timeExpire, String description, String openId,
-                    String orderNum, PayTypeEnum status) throws IOException;
+    HwcResponse pay(String ip, String total, String timeExpire, String description, String openId,
+                    String orderNum, PayTypeEnum status);
 
     /**
      * <一句话功能简述>
@@ -32,9 +29,9 @@
      *
      * @see [类、类#方法、类#成员]
      */
-    JSONObject query(String orderNum, PayTypeEnum status) throws IOException;
+    JSONObject query(String orderNum, PayTypeEnum status);
 
-    void closeOrder(String outTradeNo, PayTypeEnum status) throws IOException;
+    void closeOrder(String outTradeNo, PayTypeEnum status);
 
     /**
      * <一句话功能简述>
@@ -43,9 +40,5 @@
      * @see [类、类#方法、类#成员]
      */
     Map<String, String> refund(String returnNum, String orderNum, @NotNull(message = "备注不能为空") String reason,
-                               long refund, long total, PayTypeEnum payType) throws IOException;
-
-    void alipayCallback(HttpServletRequest request, HttpServletResponse response);
-
-    void returnNotify(HttpServletRequest request, HttpServletResponse response);
+                               long refund, long total, PayTypeEnum payType);
 }

--
Gitblit v1.9.3