From ce166b832f583e9d6840601c000242e5676297f8 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 29 一月 2024 14:47:15 +0800
Subject: [PATCH] 11.27,9
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 5 +++++
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 6 +++++-
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 19 ++++++++++++++++++-
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 13 +++++++++++--
4 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index 21f0578..5f7274c 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -960,6 +960,8 @@
String smid1="";
if (store.getOperatorId() == null ){
smid1 = smid;
+ }else if (store.getOperatorId() == 0){
+ smid1 = smid;
}else{
smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
}
@@ -1006,9 +1008,11 @@
Integer coursePackageId = coursePackagePayment.getCoursePackageId();
TCoursePackage byId = coursePackageService.getById(coursePackageId);
Store store = storeClient.queryStoreById(byId.getStoreId());
- if (store.getOperatorId()== null ){
+ if (store.getOperatorId() == null ){
// 说明是平台的门店
payMoneyUtil.confirm(smid,code,tradeNo,request.toString());
+ }else if (store.getOperatorId() == 0){
+ payMoneyUtil.confirm(smid,code,tradeNo,request.toString());
}else{
String smid = storeClient.getSMIDByOperatorId(store.getOperatorId());
payMoneyUtil.confirm(smid,code,tradeNo,request.toString());
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index 1d0b910..cd13880 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -1088,10 +1088,14 @@
Integer coursePackageId = paymentCourseVo.getId();
TCoursePackage byId = coursePackageService.getById(coursePackageId);
Store store = storeClient.queryStoreById(byId.getStoreId());
- if (store.getOperatorId() == null ){
+ if (store.getOperatorId() == null){
smid1 = smid;
}else{
- smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
+ if (store.getOperatorId()==0){
+ smid1 = smid;
+ }else{
+ smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
+ }
}
ResultUtil alipay = payMoneyUtil.alipay(smid1,"购买课程", "购买课程",
coursePackagePaymentConfig.getId().toString(),
@@ -1149,6 +1153,11 @@
// 说明是平台的
payMoneyUtil.confirm(smid,finalCode,tradeNo,paymentPrice.toString());
break;
+ }else if (operatorId==0){
+ String smid ="2088330203191220";
+ // 说明是平台的
+ payMoneyUtil.confirm(smid,finalCode,tradeNo,paymentPrice.toString());
+ break;
}else{
// 当前课程不属于门店 查询这个课程属于哪个门店 属于哪个运营商
String smidByOperatorId = storeClient.getSMIDByOperatorId(operatorId);
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
index 3d31715..3806b5b 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
@@ -61,6 +61,8 @@
@Autowired
private ISiteBookingService siteBookingService;
+ @Autowired
+ private IOperatorUserService operatorUserService;
@ResponseBody
@PostMapping("/getIntro")
@@ -264,7 +266,22 @@
return weixinpay;
} else if (type == 2) {
String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId + "_" + code + "_" + configId;
- ResultUtil alipay = payMoneyUtil.alipay("游戏支付", "游戏支付", params, code, config.getCash().toString(), "/base/site/gameCallback");
+ TGame byId = gameService.getById(gameId);
+ String smid="";
+ // 属于平台
+ if (byId.getOperationId()==null){
+ smid ="2088330203191220";
+ }else if(byId.getOperationId()==0){
+ smid= "2088330203191220";
+ }else{
+ // 根据运营商id 查询商户号
+ OperatorUser operatorId = operatorUserService.getOne(new QueryWrapper<OperatorUser>()
+ .eq("operatorId", byId.getOperationId()));
+ if (operatorId!=null){
+ smid = operatorId.getAlipayNum();
+ }
+ }
+ ResultUtil alipay = payMoneyUtil.alipay(smid,"游戏支付", "游戏支付", params, code, config.getCash().toString(), "/base/site/gameCallback");
if (alipay.getCode() == 200) {
new Thread(new Runnable() {
@Override
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