From c4addd15f7adca50420f7ced176c4a7192219273 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 30 一月 2024 14:44:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 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 361a4e5..61a4e05 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
@@ -541,8 +541,11 @@
if (operatorId == null ){
// 平台的门店
smid1 = smid;
+ }else if (operatorId == 0){
+ smid1 = smid;
}else{
smid1 = siteService.getSMIDByOperatorId(operatorId);
+
}
ResultUtil alipay = payMoneyUtil.alipay(smid1,"预约场地", "预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
System.out.println("预约场地----" + alipay.getCode());
@@ -590,9 +593,11 @@
String smid1 = "";
if (operatorId == null ){
// 平台的门店
+ }else if (operatorId == 0){
smid1 = smid;
}else{
smid1 = siteService.getSMIDByOperatorId(operatorId);
+
}
payMoneyUtil.confirm(smid1,code,tradeNo,paymentPrice.toString());
break;
--
Gitblit v1.7.1