From bdee6ad7dd52e083cbf6bca7fc1c7d3ec270f2a4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 22 八月 2024 11:46:26 +0800
Subject: [PATCH] 代码合并
---
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/controller/WxPayController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/controller/WxPayController.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/controller/WxPayController.java
index 161e335..adeb678 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/controller/WxPayController.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/controller/WxPayController.java
@@ -151,10 +151,18 @@
* @return
*/
@PostMapping("query/queryOrderInfo")
- public R<NotifyV3PayDecodeRespBody> queryOrderInfo(String orderId){
- // todo 需要完善商户号
- NotifyV3PayDecodeRespBody query = wxV3Pay.query(orderId, "");
+ public R<NotifyV3PayDecodeRespBody> queryOrderInfo(@RequestParam("orderId") String orderId){
+ NotifyV3PayDecodeRespBody query = wxV3Pay.query(orderId);
return R.ok(query);
}
+
+ /**
+ * 关闭订单
+ * @param outTradeNo
+ */
+ @PostMapping("pay/close")
+ public void close(@RequestParam("outTradeNo") String outTradeNo){
+ wxV3Pay.close(outTradeNo);
+ }
}
--
Gitblit v1.7.1