From 8033ea73b898357ad8853524ba558b18c42c2bbe Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 01 十一月 2023 20:27:51 +0800
Subject: [PATCH] 10.31.6
---
cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java | 94 ++++++++++++++++++++++++-----------------------
1 files changed, 48 insertions(+), 46 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 f65d53e..e21ff45 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
@@ -160,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.err.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);
@@ -317,19 +314,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());
+// }
}
@@ -403,6 +401,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