From 41b60f3df5f3054aad44307c13a26b14f3b32ac0 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 21 十一月 2023 09:46:03 +0800
Subject: [PATCH] 11.21

---
 cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
index 81bd0d1..ef7e699 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
@@ -76,7 +76,7 @@
 
     private String key = "";//微信商户号
 
-    private String callbackPath = "";//支付回调网关地址
+    private String callbackPath = "8.137.22.229:56666/account";//支付回调网关地址
 
     private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
 
@@ -204,6 +204,7 @@
             AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
             Map<String, String> map = new HashMap<>();
             map.put("orderString", response.getBody());
+            map.put("returnId",passbackParams);
             System.out.println(map);//就是orderString 可以直接给客户端请求,无需再做处理。
             return ResultUtil.success(map);
         } catch (AlipayApiException e) {
@@ -314,19 +315,20 @@
      * @return
      * @throws Exception
      */
-    public ResultUtil queryALIOrder(String out_trade_no) throws Exception{
+    public AlipayTradeQueryResponse queryALIOrder(String out_trade_no) throws Exception{
         AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",aliAppid, appPrivateKey,"json","UTF-8",alipay_public_key,"RSA2");
         AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
         request.setBizContent("{" +
                 "  \"out_trade_no\":\"" + out_trade_no + "\"" +
                 "}");
         AlipayTradeQueryResponse response = alipayClient.execute(request);
-        if(response.isSuccess()){
-            String tradeStatus = response.getTradeStatus();//交易状态:WAIT_BUYER_PAY(交易创建,等待买家付款)、TRADE_CLOSED(未付款交易超时关闭,或支付完成后全额退款)、TRADE_SUCCESS(交易支付成功)、TRADE_FINISHED(交易结束,不可退款)
-            return ResultUtil.success(tradeStatus);
-        } else {
-            return ResultUtil.error(response.getMsg());
-        }
+        return response;
+//        if(response.isSuccess()){
+//            String tradeStatus = response.getTradeStatus();//交易状态:WAIT_BUYER_PAY(交易创建,等待买家付款)、TRADE_CLOSED(未付款交易超时关闭,或支付完成后全额退款)、TRADE_SUCCESS(交易支付成功)、TRADE_FINISHED(交易结束,不可退款)
+//            return ResultUtil.success(response);
+//        } else {
+//            return ResultUtil.error(response.getMsg());
+//        }
     }
 
 

--
Gitblit v1.7.1