From 999902dd007e228121b9c85642177d2e7cf4181a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 七月 2025 15:29:53 +0800
Subject: [PATCH] 修改支付宝资金结算
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 101 ++++++++++++--------------------------------------
1 files changed, 24 insertions(+), 77 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
index 6cc0dff..95a170c 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -457,7 +457,7 @@
return ResultUtil.success();
}
-
+ private String smidVx = "2088330203191220";//平台微信商户号
/**
* 课程微信支付
*
@@ -469,69 +469,23 @@
String code = siteBooking.getOrderNo();
Integer id = siteBooking.getId();
Site byId = siteService.getById(siteBooking.getSiteId());
- // 是否分账 0否1是
- int isFenZhang= 1;
- String merchantNumber = "";
- if (byId.getOperatorId()==null || byId.getOperatorId()==0){
+ Store store = storeService.getById(byId.getStoreId());
+ if (store.getOperatorId()==null || store.getOperatorId()==0){
// 平台
- isFenZhang = 0;
- }
- ResultUtil weixinpay = payMoneyUtil.weixinpay("预约场地-"+isFenZhang, id.toString(), code, paymentPrice.toString(),
+ ResultUtil weixinpay = payMoneyUtil.weixinpay("预约场地", id.toString(), code, paymentPrice.toString(),
"/base/site/weChatPaymentSiteCallback", "APP", "");
- if (weixinpay.getCode() == 200) {
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- int num = 1;
- int wait = 0;
- while (num <= 10) {
- int min = 5000;
- wait += (min * num);
- Thread.sleep(wait);
- SiteBooking siteBooking = siteBookingService.getById(id);
- if (siteBooking.getStatus() != 0) {
- break;
- }
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(siteBooking.getOrderNo(), "");
- if (resultUtil.getCode() == 200 && siteBooking.getStatus() == 0) {
- /**
- * SUCCESS—支付成功，
- * REFUND—转入退款，
- * NOTPAY—未支付，
- * CLOSED—已关闭，
- * REVOKED—已撤销（刷卡支付），
- * USERPAYING--用户支付中，
- * PAYERROR--支付失败(其他原因，如银行返回失败)
- */
- Map<String, String> data1 = resultUtil.getData();
- String s = data1.get("trade_state");
- String transaction_id = data1.get("transaction_id");
- if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
- break;
- }
- if ("SUCCESS".equals(s)) {
- siteBooking.setPayTime(new Date());
- siteBooking.setStatus(1);
- siteBooking.setPayOrderNo(transaction_id);
- siteBookingService.updateById(siteBooking);
-
-
-
- break;
- }
- if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) {
- num++;
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }).start();
+ return weixinpay;
+ }else{
+ String smidVx= operatorUserService.getmerchantNumberByOperatorId(store.getOperatorId());
+ if (!StringUtils.hasLength(smidVx)){
+ return ResultUtil.error("运营商未配置微信商户号，获取支付失败!");
+ }
+ return payMoneyUtil.weixinpayV3(smidVx,"预约场地"
+ ,code,"/base/site/weChatPaymentSiteCallback1",
+ paymentPrice.toString(),id.toString());
}
- return weixinpay;
+
+
}
private String smid = "2088330203191220";//平台支付宝商户号
@@ -560,12 +514,13 @@
}else if (operatorId == 0){
smid1 = smid;
}else{
- smid1 = siteService.getSMIDByOperatorId(operatorId);
+ smid1 = siteService.getmerchantNumberAliByOperatorId(operatorId);
}
ResultUtil alipay = payMoneyUtil.alipay(smid1,"预约场地", "预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
System.out.println("预约场地----" + alipay.getCode());
if (alipay.getCode() == 200) {
+ String finalSmid = smid1;
new Thread(new Runnable() {
@Override
public void run() {
@@ -602,21 +557,8 @@
siteBooking.setPayOrderNo(tradeNo);
siteBookingService.updateById(siteBooking);
System.err.println("======完成支付");
- // 判断预约的门店 属于哪个运营商
- Integer storeId = siteBooking.getStoreId();
- Store byId = storeService.getById(storeId);
- Integer operatorId = byId.getOperatorId();
- String smid1 = "";
- if (operatorId == null || operatorId == 0){
- // 平台的门店 不冻结资金不做分账处理
- payMoneyUtil.confirm1(smid1,code,tradeNo,paymentPrice.toString());
- }else{
- smid1 = siteService.getSMIDByOperatorId(operatorId);
- payMoneyUtil.confirm(smid1,code,tradeNo,paymentPrice.toString());
- // 分账
- extracted(operatorId, new BigDecimal(paymentPrice.toString()), tradeNo);
- }
-
+ Thread.sleep(30000);
+ payMoneyUtil.confirm(finalSmid, code, tradeNo, paymentPrice.toString());
break;
}
if ("WAIT_BUYER_PAY".equals(s)) {
@@ -1011,4 +953,9 @@
public String getmerchantNumberByOperatorId(Integer id) {
return siteMapper.getmerchantNumberByOperatorId(id);
}
+
+ @Override
+ public String getmerchantNumberAliByOperatorId(Integer id) {
+ return siteMapper.getmerchantNumberAliByOperatorId(id);
+ }
}
--
Gitblit v1.7.1