From 4c15dfef9e11c3d78fbe8b89f16733526b6200d5 Mon Sep 17 00:00:00 2001 From: Dftre <3066417822@qq.com> Date: Sun, 9 Jun 2024 09:23:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E6=94=AF=E4=BB=98=E5=87=BD?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/alipay/controller/AliPayController.java | 14 ++------------ .../ruoyi/pay/sqb/controller/SQBController.java | 4 ++-- .../java/com/ruoyi/pay/wx/config/WxPayConfig.java | 1 - .../ruoyi/pay/wx/controller/WxPayController.java | 4 ++-- 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/ruoyi-pay/ruoyi-pay-alipay/src/main/java/com/ruoyi/pay/alipay/controller/AliPayController.java b/ruoyi-pay/ruoyi-pay-alipay/src/main/java/com/ruoyi/pay/alipay/controller/AliPayController.java index 91f6fd2..fa06d99 100644 --- a/ruoyi-pay/ruoyi-pay-alipay/src/main/java/com/ruoyi/pay/alipay/controller/AliPayController.java +++ b/ruoyi-pay/ruoyi-pay-alipay/src/main/java/com/ruoyi/pay/alipay/controller/AliPayController.java @@ -47,7 +47,7 @@ public class AliPayController extends BaseController { @Parameters({ @Parameter(name = "orderId", description = "订单号", required = true) }) - @GetMapping("/pay/{orderNumber}") + @GetMapping("/url/{orderNumber}") public AjaxResult pay(@PathVariable(name = "orderNumber") String orderNumber) { AlipayTradePagePayResponse response; PayOrder aliPay = payOrderService.selectPayOrderByOrderNumber(orderNumber); @@ -68,9 +68,8 @@ public class AliPayController extends BaseController { @Operation(summary = "支付宝支付回调") @Transactional @PostMapping("/notify") - public AjaxResult payNotify(HttpServletRequest request) throws Exception { + public AjaxResult notify(HttpServletRequest request) throws Exception { if (request.getParameter("trade_status").equals("TRADE_SUCCESS")) { - System.out.println("=========支付宝异步回调========"); Map params = new HashMap<>(); Map requestParams = request.getParameterMap(); @@ -81,15 +80,6 @@ public class AliPayController extends BaseController { String orderNumber = params.get("out_trade_no"); // 支付宝验签 if (Factory.Payment.Common().verifyNotify(params)) { - // 验签通过 - System.out.println("交易名称: " + params.get("subject")); - System.out.println("交易状态: " + params.get("trade_status")); - System.out.println("支付宝交易凭证号: " + params.get("trade_no")); - System.out.println("商户订单号: " + params.get("out_trade_no")); - System.out.println("交易金额: " + params.get("total_amount")); - System.out.println("买家在支付宝唯一id: " + params.get("buyer_id")); - System.out.println("买家付款时间: " + params.get("gmt_payment")); - System.out.println("买家付款金额: " + params.get("buyer_pay_amount")); // // 更新订单未已支付 payOrderService.updateStatus(orderNumber, "已支付"); diff --git a/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/controller/SQBController.java b/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/controller/SQBController.java index 9631233..ed44dfc 100644 --- a/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/controller/SQBController.java +++ b/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/controller/SQBController.java @@ -45,7 +45,7 @@ public class SQBController extends BaseController { }) @PostMapping("/url/{orderNumber}") @Anonymous - public R payUrl(@PathVariable(name = "orderNumber") String orderNumber) throws Exception { + public R url(@PathVariable(name = "orderNumber") String orderNumber) throws Exception { PayOrder payOrder = payOrderServicer.selectPayOrderByOrderNumber(orderNumber); String url = sqbServiceImpl.payUrl(payOrder); return R.ok(url); @@ -74,7 +74,7 @@ public class SQBController extends BaseController { @PostMapping("/notify") @Anonymous @Operation(summary = "支付回调") - public AjaxResult payNotify(@RequestBody JSONObject jsonObject) throws IOException { + public AjaxResult notify(@RequestBody JSONObject jsonObject) throws IOException { // 验签 // 修改订单状态 // 用户自定义行为 diff --git a/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/config/WxPayConfig.java b/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/config/WxPayConfig.java index a7b7d74..0b7896a 100644 --- a/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/config/WxPayConfig.java +++ b/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/config/WxPayConfig.java @@ -30,7 +30,6 @@ public class WxPayConfig { private String wxchantId; @Value("${pay.wechat.merchantSerialNumber}") private String wxchantSerialNumber; - @Value("${pay.wechat.apiV3Key}") private String wxapiV3Key; @Value("${pay.wechat.privateKeyPath}") diff --git a/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/controller/WxPayController.java b/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/controller/WxPayController.java index 461eee9..67a6282 100644 --- a/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/controller/WxPayController.java +++ b/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/controller/WxPayController.java @@ -60,7 +60,7 @@ public class WxPayController extends BaseController { @Parameter(name = "orderNumber", description = "订单号", required = true) }) @GetMapping("/url/{orderNumber}") - public AjaxResult pay(@PathVariable(name = "orderNumber") String orderNumber) throws Exception { + public AjaxResult url(@PathVariable(name = "orderNumber") String orderNumber) throws Exception { PayOrder aliPay = payOrderService.selectPayOrderByOrderNumber(orderNumber); String amountStr = aliPay.getActualAmount(); double amountDouble = Double.parseDouble(amountStr); @@ -81,7 +81,7 @@ public class WxPayController extends BaseController { @Anonymous @Operation(summary = "微信支付查询订单") @PostMapping("/notify") - public AjaxResult WxPayList(HttpServletRequest servletRequest, HttpServletResponse response) + public AjaxResult notify(HttpServletRequest servletRequest, HttpServletResponse response) throws Exception { String timeStamp = servletRequest.getHeader("Wechatpay-Timestamp"); String nonce = servletRequest.getHeader("Wechatpay-Nonce");