From 2dda6304029c95e171b2f9e32406eb4600d77ebd Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 01 十一月 2023 18:57:58 +0800
Subject: [PATCH] 支付会员送券功能补充 运营商权限bug修改
---
cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java b/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java
index c62b242..e9a7ebc 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java
@@ -12,6 +12,7 @@
import com.alipay.api.domain.RoyaltyInfo;
import com.alipay.api.request.*;
import com.alipay.api.response.*;
+import lombok.Synchronized;
import org.apache.commons.collections.map.HashedMap;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.dom4j.Document;
@@ -76,6 +77,7 @@
/**
* 支付宝支付
*/
+
public ResultUtil alipay(String body, String subject, String passbackParams, String outTradeNo, String amount, String notifyUrl){
// //构造client
// CertAlipayRequest certAlipayRequest = new CertAlipayRequest ();
@@ -148,10 +150,6 @@
-
-
-
-
//分账
// Integer coursePackagePayments = coursePackageClient.queryByCode(outTradeNo);
// Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
@@ -198,6 +196,7 @@
Map<String, String> map = new HashMap<>();
map.put("orderString", response.getBody());
System.err.println("========map=========="+map);//就是orderString 可以直接给客户端请求，无需再做处理。
+ map.put("siteBooking",passbackParams);
return ResultUtil.success(map);
} catch (AlipayApiException e) {
e.printStackTrace();
@@ -307,18 +306,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);
+ return response;
} else {
- return ResultUtil.error(response.getMsg());
+// return ResultUtil.error(response.getMsg());
+ return response;
}
}
@@ -425,6 +426,7 @@
String s1 = this.weixinSignature(map3);
map3.put("sign", s1);
System.err.println(map3);
+ map3.put("siteBookingId",attach);
return ResultUtil.success(map3);
}
return null;
--
Gitblit v1.7.1