From 289d7c0993041a3edec0361622beab0dacfe2a31 Mon Sep 17 00:00:00 2001
From: Wang YiHang <3060234389@qq.com>
Date: Fri, 30 Aug 2024 18:51:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/muyu/pay/domain/AliPay.java   |  2 ++
 .../com/muyu/pay/controller/AliPayController.java   | 13 +++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cloud-pay-common/src/main/java/com/muyu/pay/domain/AliPay.java b/cloud-pay-common/src/main/java/com/muyu/pay/domain/AliPay.java
index 6eff815..907ef83 100644
--- a/cloud-pay-common/src/main/java/com/muyu/pay/domain/AliPay.java
+++ b/cloud-pay-common/src/main/java/com/muyu/pay/domain/AliPay.java
@@ -10,6 +10,8 @@ import lombok.Data;
  */
 @Data
 public class AliPay {
+    //路径
+    private String returnUrl;
     //订单编号
     private String traceNo;
     //商品金额
diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/controller/AliPayController.java b/cloud-pay-server/src/main/java/com/muyu/pay/controller/AliPayController.java
index 1241474..8cd7834 100644
--- a/cloud-pay-server/src/main/java/com/muyu/pay/controller/AliPayController.java
+++ b/cloud-pay-server/src/main/java/com/muyu/pay/controller/AliPayController.java
@@ -37,18 +37,15 @@ public class AliPayController {
     private static final String CHARSET ="utf-8";
     private static final String SIGN_TYPE ="RSA2";
 
-    @GetMapping("/pay") // 前端路径参数格式?subject=xxx&traceNo=xxx&totalAmount=xxx
-    public void pay(@RequestParam(name = "traceNo") String traceNo, HttpServletResponse httpResponse) throws Exception {
-        AliPay aliPay = new AliPay();
-        aliPay.setTraceNo(traceNo);
-        aliPay.setSubject(traceNo);
-        aliPay.setTotalAmount(1);
+    @PostMapping("/pay")
+    @ResponseBody
+    public void pay(@RequestBody AliPay aliPay, HttpServletResponse httpResponse) throws Exception {
         AlipayClient alipayClient = new DefaultAlipayClient(GATEWAY_URL, aliPayConfig.getAppId(),
                 aliPayConfig.getAppPrivateKey(), FORMAT, CHARSET, aliPayConfig.getAlipayPublicKey(), SIGN_TYPE);
         AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
         request.setNotifyUrl(aliPayConfig.getNotifyUrl());
-        request.setReturnUrl(aliPayConfig.getReturnUrl());
-        request.setBizContent("{\"out_trade_no\":\"" + traceNo + "\","
+        request.setReturnUrl(aliPay.getReturnUrl());
+        request.setBizContent("{\"out_trade_no\":\"" + aliPay.getTraceNo() + "\","
                 + "\"total_amount\":\"" + aliPay.getTotalAmount() + "\","
                 + "\"subject\":\"" + aliPay.getSubject() + "\","
                 + "\"product_code\":\"FAST_INSTANT_TRADE_PAY\"}");