From a9564eae9f0169ca39329b2f14a8f13d13358a0a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 15:28:44 +0800
Subject: [PATCH] 11.7

---
 cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

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 b5e85a8..0148a97 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
@@ -5,10 +5,8 @@
 import com.alipay.api.response.AlipayTradeQueryResponse;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.other.entity.SiteLock;
-import com.dsh.other.entity.TGame;
-import com.dsh.other.entity.TGameConfig;
-import com.dsh.other.entity.TGameRecord;
+import com.dsh.other.entity.*;
+import com.dsh.other.feignclient.CourseRecordClient;
 import com.dsh.other.feignclient.account.AppUserClient;
 import com.dsh.other.feignclient.account.model.AppUser;
 import com.dsh.other.model.QueryMySiteVo;
@@ -27,6 +25,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -54,6 +53,8 @@
     @Autowired
     private PayMoneyUtil payMoneyUtil;
 
+    @Resource
+    private CourseRecordClient courseRecordClient;
 
 
     @ResponseBody
@@ -220,7 +221,7 @@
                                     int min = 5000;
                                     wait += (min * num);
                                     Thread.sleep(wait);
-                                    List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("code", code).eq("payType", 3));
+                                    List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("number", code).eq("payType", 2));
                                     TGameRecord one = list.get(0);
                                     if(one.getStatus() == 1){
                                         break;
@@ -246,6 +247,15 @@
                                                 coursePackagePayment.setStatus(1);
                                                 coursePackagePayment.setMoney(config.getCash());
                                                 coursePackagePayment.setOrderNo(tradeNo);
+
+                                                CourseCounsum courseCounsum = new CourseCounsum();
+//                                                courseCounsum.setPaymentId(paymentId);
+                                                courseCounsum.setChangeType(3);
+                                                courseCounsum.setInsertTime(new Date());
+                                                courseCounsum.setReason("智慧球场;" + config.getCash());
+                                                courseCounsum.setAppUserId(uid);
+                                                courseRecordClient.save(courseCounsum);
+
                                             }
                                             gameRecordService.updateBatchById(list);
                                             Integer integer = startGame(uid, gameId, spaceId, sutuId);

--
Gitblit v1.7.1