From 48323fce3b4b8013755421aa1d1feb9a73cddde9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 03 一月 2024 11:42:17 +0800
Subject: [PATCH] 合并代码

---
 cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java |   13 -------------
 1 files changed, 0 insertions(+), 13 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..59e44a1 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
@@ -396,14 +396,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 +407,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