From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index 71470b8..b17ef77 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -66,6 +66,15 @@
private CityManagerClient cityManagerClient;
/**
+ * 通过运营商id查询运营商对应的支付宝商户号
+ */
+ @RequestMapping("/base/getSMIDByOperatorId")
+ @ResponseBody
+ public String getSMIDByOperatorId(Integer id) {
+ // 获取运营商的管理员
+ return siteService.getSMIDByOperatorId(id);
+ }
+ /**
* 获取所有场地
*/
@RequestMapping("/base/site/getList")
@@ -340,7 +349,6 @@
}
}
-
/**
* 预约场地支付宝回调
*
@@ -356,7 +364,8 @@
if (null != map) {
String code = map.get("out_trade_no");
String trade_no = map.get("trade_no");
- SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>().eq("orderNo", code).eq("state", 1));
+ SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>()
+ .eq("orderNo", code).eq("state", 1));
if (siteBooking.getStatus() == 0) {
siteBooking.setPayTime(new Date());
siteBooking.setStatus(1);
@@ -396,14 +405,6 @@
String code = map.get("passback_params");
String trade_no = map.get("trade_no");
-// SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>().eq("orderNo", code).eq("state", 1));
-// if(siteBooking.getStatus() == 0){
-// siteBooking.setPayTime(new Date());
-// siteBooking.setStatus(1);
-// siteBooking.setPayOrderNo(trade_no);
-// siteBookingService.updateById(siteBooking);
-// }
-
String[] s = code.split("_");
Integer i = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3]));
List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("number", s[4]).eq("payType", 2));
@@ -415,18 +416,13 @@
coursePackagePayment.setOrderNo(trade_no);
CourseCounsum courseCounsum = new CourseCounsum();
-// courseCounsum.setPaymentId(paymentId);
courseCounsum.setChangeType(3);
courseCounsum.setInsertTime(new Date());
courseCounsum.setReason("智慧球场;" + config.getCash());
courseCounsum.setAppUserId(Integer.valueOf(s[0]));
courseRecordClient.save(courseCounsum);
-
}
gameRecordService.updateBatchById(list);
-
-
-
System.err.println("===========游戏回调游戏回调=========" + i);
PrintWriter out = response.getWriter();
--
Gitblit v1.7.1