From 325b09c92e51c26e297a937a6f1be9f6661dceb1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 15 十月 2024 18:25:31 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java
index 04048b4..52f2e96 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java
@@ -123,7 +123,7 @@
*/
@PostMapping("pay/notify")
@ApiOperation("订单回调")
- public R<Map<String, Object>> payNotify(HttpServletRequest request) throws Exception {
+ public void payNotify(HttpServletRequest request) throws Exception {
try {
Map<String, Object> params = wxV3Pay.verifyNotify(request, new TypeReference<Map<String, Object>>() {});
log.info("支付回调：{}", params);
@@ -147,13 +147,10 @@
break;
}
wxV3Pay.ack();
- return R.ok(params);
} catch (Exception e) {
log.error("支付回调异常：{}", e, e);
wxV3Pay.ack(false, e.getMessage());
- return R.fail("回调异常");
}
-
}
/**
--
Gitblit v1.7.1