From 168d852672f8f671a01d6f0f053349d0d321ec7c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 03 一月 2024 11:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
index b1d0666..06518cc 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
@@ -85,7 +85,7 @@
private String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAouYvZ1v4RiydwNOnGcU0Hb4hQu0x6XUooaE2Bi6/atNOobtFdunnATGP6OMOW7yF9DpP8qH5mbFXAiaQD721y/7qlayI50UcV4mngRU4ZcaAVE3bp721Eg2H85RISa+Tb1CiOh+pc9p4l5UBseKsvB2ruHHForfZDPI8FL7AVUKBYCQPsa4zL6KAO2C6KULaTg/lCa+bYQKU0n9ca569VtdsqJUyxB9eSZjVd+9nKl62FLqp2NELGj7cXqiVBgDnBnVS5ZUO3mrBM5z/AxQbw3RwE3JqdkhzUA1BFjejAlT2zIGNOjUFagF8ao0wGElYfuk0bum6Hz5qWAt02QdNNwIDAQAB";//支付宝应用公钥
private String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";//支付宝支付公钥
-
+ private String smid = "2088330203191220";//平台支付宝商户号
/**
* 获取赛事列表
@@ -300,7 +300,16 @@
}
if (paymentCompetitionVo.getPayType() == 2) {//支付宝
- return aliPaymentCompetition(code, money);
+ // 判断当前赛事属于哪个运营商
+ Competition byId = competitionService.getById(paymentCompetitionVo.getId());
+ Integer operatorId = byId.getOperatorId();
+ if (operatorId == null ){
+ // 说明是平台
+ return aliPaymentCompetition(smid,code, money);
+ }
+ // 获取该运营商的商户号
+ String smid = storeClient.getSMIDByOperatorId(operatorId);
+ return aliPaymentCompetition(smid,code, money);
}
if (paymentCompetitionVo.getPayType() == 3) {//玩湃币
appUser.setPlayPaiCoins(appUser.getPlayPaiCoins() - money.intValue());
@@ -418,8 +427,9 @@
* @return
* @throws Exception
*/
- public ResultUtil aliPaymentCompetition(String code, BigDecimal money) throws Exception {
- ResultUtil alipay = payMoneyUtil.alipay("报名赛事", "", "", code, money.toString(), "/base/competition/aliPaymentCompetitionCallback");
+ public ResultUtil aliPaymentCompetition(String smid,String code, BigDecimal money) throws Exception {
+ ResultUtil alipay = payMoneyUtil.alipay
+ (smid,"报名赛事", "", "", code, money.toString(), "/base/competition/aliPaymentCompetitionCallback");
if (alipay.getCode() == 200) {
new Thread(new Runnable() {
@Override
@@ -453,6 +463,7 @@
paymentCompetition.setAppUserId(null);
paymentCompetition.setState(3);
userCompetitionService.remove(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", paymentCompetition.getId()));
+
break;
}
if ("TRADE_SUCCESS".equals(s)) {
@@ -461,12 +472,10 @@
paymentCompetition.setPayTime(new Date());
paymentCompetition.setPayOrderNo(tradeNo);
paymentCompetitionService.updateById(paymentCompetition);
-
+ // 结算资金到商户账号
+ payMoneyUtil.confirm(smid,code,tradeNo,money.toString());
//分账
-
-
// moneyOut(tradeNo, tradeNo,code);
-
break;
}
if ("WAIT_BUYER_PAY".equals(s)) {
--
Gitblit v1.7.1