From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java | 98 +++++++++++++++++++++++++-----------------------
1 files changed, 51 insertions(+), 47 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 df6bb0a..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
@@ -24,6 +24,7 @@
//import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingRequest;
//import com.github.binarywang.wxpay.service.ProfitSharingV3Service;
//import com.github.binarywang.wxpay.service.WxPayService;
+
import org.apache.commons.collections.map.HashedMap;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -75,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";//应用公钥证书路径
@@ -159,45 +160,42 @@
//分账
- Integer coursePackagePayments = coursePackageClient.queryByCode(outTradeNo);
- Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
- Integer siteBookings = siteClient.queryByCode(outTradeNo);
- List<Integer> stores = new ArrayList<>();
- stores.add(coursePackagePayments);
- stores.add(paymentCompetitions);
- stores.add(siteBookings);
-
- OperatorUser operatorUser = siteClient.queryOperator(stores);
-
- String alipayProportion = operatorUser.getAlipayProportion();
- String alipayNum = operatorUser.getAlipayNum();
-
- ExtendParams extendParams = new ExtendParams();
-// extendParams.setSysServiceProviderId("YOUR_SERVICE_PROVIDER_ID");
- model.setExtendParams(extendParams);
-
- RoyaltyInfo royaltyInfo = new RoyaltyInfo();
-// royaltyInfo.setRoyaltyType("transfer");
-
-
- RoyaltyDetailInfos royaltyDetailInfo1 = new RoyaltyDetailInfos();
- royaltyDetailInfo1.setTransOutType("userId");
- royaltyDetailInfo1.setTransOut(aliAppid);
- royaltyDetailInfo1.setTransInType("loginName");
- royaltyDetailInfo1.setTransIn("18398968484");
-
- royaltyDetailInfo1.setDesc("分账描述1");
- royaltyDetailInfo1.setAmountPercentage(alipayProportion);
- List<RoyaltyDetailInfos> royaltyDetailInfos = new ArrayList<>();
-
-
-
-
- royaltyInfo.setRoyaltyDetailInfos(royaltyDetailInfos);
- model.setRoyaltyInfo(royaltyInfo);
-System.out.println("=================="+royaltyInfo);
-
-
+// Integer coursePackagePayments = coursePackageClient.queryByCode(outTradeNo);
+// Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
+// Integer siteBookings = siteClient.queryByCode(outTradeNo);
+// List<Integer> stores = new ArrayList<>();
+// stores.add(coursePackagePayments);
+// stores.add(paymentCompetitions);
+// stores.add(siteBookings);
+//
+// OperatorUser operatorUser = siteClient.queryOperator(stores);
+//
+// String alipayProportion = operatorUser.getAlipayProportion();
+// String alipayNum = operatorUser.getAlipayNum();
+//
+// ExtendParams extendParams = new ExtendParams();
+//// extendParams.setSysServiceProviderId("YOUR_SERVICE_PROVIDER_ID");
+// model.setExtendParams(extendParams);
+//
+// RoyaltyInfo royaltyInfo = new RoyaltyInfo();
+//// royaltyInfo.setRoyaltyType("transfer");
+//
+//
+// RoyaltyDetailInfos royaltyDetailInfo1 = new RoyaltyDetailInfos();
+// royaltyDetailInfo1.setTransOutType("userId");
+// royaltyDetailInfo1.setTransOut(aliAppid);
+// royaltyDetailInfo1.setTransInType("loginName");
+// royaltyDetailInfo1.setTransIn("18398968484");
+//
+// royaltyDetailInfo1.setDesc("分账描述1");
+// royaltyDetailInfo1.setAmountPercentage(alipayProportion);
+// List<RoyaltyDetailInfos> royaltyDetailInfos = new ArrayList<>();
+//
+//
+//
+// royaltyInfo.setRoyaltyDetailInfos(royaltyDetailInfos);
+// model.setRoyaltyInfo(royaltyInfo);
+// System.err.println("=================="+royaltyInfo);
//
request.setBizModel(model);
request.setNotifyUrl(callbackPath + notifyUrl);
@@ -206,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) {
@@ -316,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());
+// }
}
@@ -402,6 +402,10 @@
if("SUCCESS".equals(result_code)){
String type = map1.get("trade_type");
String prepay_id = map1.get("prepay_id");
+
+
+
+
switch (type){
case "JSAPI":
//重新进行签名后返回给前端
--
Gitblit v1.7.1