kk 8 mesiacov pred
rodič
commit
552d3014fd
15 zmenil súbory, kde vykonal 125 pridanie a 44 odobranie
  1. 5 8
      game-business/src/main/java/com/game/business/controller/AppGameBettingController.java
  2. 9 0
      game-business/src/main/java/com/game/business/service/IAppGameBettingService.java
  3. 7 0
      game-business/src/main/java/com/game/business/service/IAppGameClassifyService.java
  4. 4 0
      game-business/src/main/java/com/game/business/service/IAppGameLotteryService.java
  5. 8 0
      game-business/src/main/java/com/game/business/service/IAppGameService.java
  6. 28 0
      game-business/src/main/java/com/game/business/service/impl/AppGameBettingServiceImpl.java
  7. 11 3
      game-business/src/main/java/com/game/business/service/impl/AppGameClassifyServiceImpl.java
  8. 20 0
      game-business/src/main/java/com/game/business/service/impl/AppGameLotteryServiceImpl.java
  9. 12 1
      game-business/src/main/java/com/game/business/service/impl/AppGameServiceImpl.java
  10. 2 1
      game-business/src/main/java/com/game/business/service/impl/AppUserServiceImpl.java
  11. 2 1
      game-business/src/main/java/com/game/business/service/impl/AppUsersCashrecordServiceImpl.java
  12. 2 1
      game-business/src/main/java/com/game/business/service/impl/AppUsersChargeServiceImpl.java
  13. 2 1
      game-business/src/main/java/com/game/business/service/impl/FinTranRecordServiceImpl.java
  14. 3 7
      game-business/src/main/java/com/game/business/task/AppGameBettingTask.java
  15. 10 21
      game-business/src/main/java/com/game/business/websocket/client/GameOneClient.java

+ 5 - 8
game-business/src/main/java/com/game/business/controller/AppGameBettingController.java

@@ -1,6 +1,7 @@
 package com.game.business.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.game.business.domain.*;
 import com.game.business.service.*;
 import com.game.common.core.controller.BaseController;
@@ -57,12 +58,12 @@ public class AppGameBettingController extends BaseController{
             return error("用户ID为空。");
         }
 
-        AppGameClassify appGameClassify = appGameClassifyService.getById(gameBetting.getClassId());
+        AppGameClassify appGameClassify = appGameClassifyService.selectAppGameClassifyById(gameBetting.getClassId());
         if(appGameClassify == null){
             return error("游戏平台不存在。");
         }
 
-        AppGame appGame = appGameService.getById(gameBetting.getGameId());
+        AppGame appGame = appGameService.selectAppGameById(gameBetting.getGameId());
         if(appGame == null){
             return error("游戏不存在。");
         }
@@ -86,11 +87,7 @@ public class AppGameBettingController extends BaseController{
             return error("游戏已封盘,无法下单。");
         }
 
-        LambdaQueryWrapper<AppGameLottery> queryLotteryWrapper = new LambdaQueryWrapper<>();
-        queryLotteryWrapper.eq(AppGameLottery::getClassId, appGame.getClassifyId());
-        queryLotteryWrapper.eq(AppGameLottery::getGameId, appGame.getId());
-        queryLotteryWrapper.eq(AppGameLottery::getGameDate, appGame.getGameDate());
-        long count = appGameLotteryService.count(queryLotteryWrapper);
+        long count = appGameLotteryService.selectCount(appGame.getClassifyId(), appGame.getId(), appGame.getGameDate());
 
         if(count > 0){
             return error("游戏已开奖,无法下单。");
@@ -98,7 +95,7 @@ public class AppGameBettingController extends BaseController{
 
         synchronized (this){
 
-            AppUser appUser = appUserService.getById(gameBetting.getUserId());
+            AppUser appUser = appUserService.selectAppUserByUserid(gameBetting.getUserId());
 
             if(appUser == null){
                 return error("用户不存在。");

+ 9 - 0
game-business/src/main/java/com/game/business/service/IAppGameBettingService.java

@@ -3,5 +3,14 @@ package com.game.business.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.game.business.domain.AppGameBetting;
 
+import java.util.List;
+
 public interface IAppGameBettingService extends IService<AppGameBetting> {
+
+
+    List<AppGameBetting> getIsWinning(Long classId, Long gameId, String gameDate, Integer isWinning);
+
+    boolean updateById(AppGameBetting appGameBetting);
+
+    boolean save(AppGameBetting appGameBetting);
 }

+ 7 - 0
game-business/src/main/java/com/game/business/service/IAppGameClassifyService.java

@@ -58,4 +58,11 @@ public interface IAppGameClassifyService extends IService<AppGameClassify> {
      * @return 结果
      */
     public int deleteAppGameClassifyById(Long id);
+
+    /**
+     * 根据code查询
+     * @param code
+     * @return
+     */
+    AppGameClassify getByCode(String code);
 }

+ 4 - 0
game-business/src/main/java/com/game/business/service/IAppGameLotteryService.java

@@ -7,4 +7,8 @@ import com.game.business.domain.AppGameLottery;
  * 游戏开奖记录业务接口
  */
 public interface IAppGameLotteryService extends IService<AppGameLottery> {
+
+    long selectCount(Long classId, Long gameId, String gameDate);
+
+    boolean save(AppGameLottery appGameLottery);
 }

+ 8 - 0
game-business/src/main/java/com/game/business/service/IAppGameService.java

@@ -58,4 +58,12 @@ public interface IAppGameService extends IService<AppGame> {
      * @return 结果
      */
     public int deleteAppGameById(Long id);
+
+    /**
+     * 根据编码查询游戏
+     * @param classId
+     * @param code
+     * @return
+     */
+    AppGame selectAppGameByClassIdAndCode(Long classId, String code);
 }

+ 28 - 0
game-business/src/main/java/com/game/business/service/impl/AppGameBettingServiceImpl.java

@@ -1,11 +1,39 @@
 package com.game.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.game.business.domain.AppGameBetting;
 import com.game.business.mapper.AppGameBettingMapper;
 import com.game.business.service.IAppGameBettingService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class AppGameBettingServiceImpl extends ServiceImpl<AppGameBettingMapper, AppGameBetting> implements IAppGameBettingService {
+
+    private AppGameBettingMapper appGameBettingMapper;
+
+    @Override
+    public List<AppGameBetting> getIsWinning(Long classId, Long gameId, String gameDate, Integer isWinning) {
+
+        LambdaQueryWrapper<AppGameBetting> queryWrapper = Wrappers.lambdaQuery();;
+        queryWrapper.eq(AppGameBetting::getClassId, classId);
+        queryWrapper.eq(AppGameBetting::getGameId, gameId);
+        queryWrapper.eq(AppGameBetting::getGameDate, gameDate);
+        queryWrapper.eq(AppGameBetting::getIsWinning, isWinning);
+        return appGameBettingMapper.selectList(queryWrapper);
+
+    }
+
+    @Override
+    public boolean updateById(AppGameBetting appGameBetting) {
+        return appGameBettingMapper.updateById(appGameBetting) > 0;
+    }
+
+    @Override
+    public boolean save(AppGameBetting appGameBetting) {
+        return appGameBettingMapper.insert(appGameBetting) > 0;
+    }
 }

+ 11 - 3
game-business/src/main/java/com/game/business/service/impl/AppGameClassifyServiceImpl.java

@@ -1,10 +1,11 @@
 package com.game.business.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
 
-import com.game.common.annotation.DataSource;
-import com.game.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.game.business.mapper.AppGameClassifyMapper;
@@ -18,7 +19,7 @@ import com.game.business.service.IAppGameClassifyService;
  * @date 2024-06-14
  */
 @Service
-@DataSource(DataSourceType.SLAVE)
+@DS("slave")
 public class AppGameClassifyServiceImpl extends ServiceImpl<AppGameClassifyMapper, AppGameClassify> implements IAppGameClassifyService {
     @Autowired
     private AppGameClassifyMapper appGameClassifyMapper;
@@ -88,4 +89,11 @@ public class AppGameClassifyServiceImpl extends ServiceImpl<AppGameClassifyMappe
     public int deleteAppGameClassifyById(Long id) {
         return appGameClassifyMapper.deleteAppGameClassifyById(id);
     }
+
+    @Override
+    public AppGameClassify getByCode(String code) {
+        LambdaQueryWrapper<AppGameClassify> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(AppGameClassify::getCode, code);
+        return appGameClassifyMapper.selectOne(queryWrapper);
+    }
 }

+ 20 - 0
game-business/src/main/java/com/game/business/service/impl/AppGameLotteryServiceImpl.java

@@ -1,11 +1,31 @@
 package com.game.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.game.business.domain.AppGameLottery;
 import com.game.business.mapper.AppGameLotteryMapper;
 import com.game.business.service.IAppGameLotteryService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class AppGameLotteryServiceImpl extends ServiceImpl<AppGameLotteryMapper, AppGameLottery> implements IAppGameLotteryService {
+
+    @Autowired
+    private AppGameLotteryMapper appGameLotteryMapper;
+
+    @Override
+    public long selectCount(Long classId, Long gameId, String gameDate) {
+        LambdaQueryWrapper<AppGameLottery> queryLotteryWrapper = Wrappers.lambdaQuery();;
+        queryLotteryWrapper.eq(AppGameLottery::getClassId, classId);
+        queryLotteryWrapper.eq(AppGameLottery::getGameId, gameId);
+        queryLotteryWrapper.eq(AppGameLottery::getGameDate, gameDate);
+        return appGameLotteryMapper.selectCount(queryLotteryWrapper);
+    }
+
+    @Override
+    public boolean save(AppGameLottery appGameLottery) {
+        return appGameLotteryMapper.insert(appGameLottery) > 0;
+    }
 }

+ 12 - 1
game-business/src/main/java/com/game/business/service/impl/AppGameServiceImpl.java

@@ -1,5 +1,8 @@
 package com.game.business.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
 
@@ -19,7 +22,7 @@ import com.game.business.service.IAppGameService;
  * @date 2024-06-14
  */
 @Service
-@DataSource(DataSourceType.SLAVE)
+@DS("slave")
 public class AppGameServiceImpl extends ServiceImpl<AppGameMapper, AppGame> implements IAppGameService {
     @Autowired
     private AppGameMapper appGameMapper;
@@ -90,4 +93,12 @@ public class AppGameServiceImpl extends ServiceImpl<AppGameMapper, AppGame> impl
     public int deleteAppGameById(Long id) {
         return appGameMapper.deleteAppGameById(id);
     }
+
+    @Override
+    public AppGame selectAppGameByClassIdAndCode(Long classId, String code) {
+        LambdaQueryWrapper<AppGame> queryGameWrapper = Wrappers.lambdaQuery();;
+        queryGameWrapper.eq(AppGame::getCode, code);
+        queryGameWrapper.eq(AppGame::getClassifyId, classId);
+        return appGameMapper.selectOne(queryGameWrapper);
+    }
 }

+ 2 - 1
game-business/src/main/java/com/game/business/service/impl/AppUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.game.business.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
 
@@ -19,7 +20,7 @@ import com.game.business.service.IAppUserService;
  * @date 2024-06-18
  */
 @Service
-@DataSource(DataSourceType.SLAVE)
+@DS("slave")
 public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implements IAppUserService {
     @Autowired
     private AppUserMapper appUserMapper;

+ 2 - 1
game-business/src/main/java/com/game/business/service/impl/AppUsersCashrecordServiceImpl.java

@@ -1,5 +1,6 @@
 package com.game.business.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
 
@@ -18,7 +19,7 @@ import com.game.business.service.IAppUsersCashrecordService;
  * @date 2024-06-18
  */
 @Service
-@DataSource(DataSourceType.SLAVE)
+@DS("slave")
 public class AppUsersCashrecordServiceImpl extends ServiceImpl<AppUsersCashrecordMapper, AppUsersCashrecord> implements IAppUsersCashrecordService {
     @Autowired
     private AppUsersCashrecordMapper appUsersCashrecordMapper;

+ 2 - 1
game-business/src/main/java/com/game/business/service/impl/AppUsersChargeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.game.business.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
 
@@ -18,7 +19,7 @@ import com.game.business.service.IAppUsersChargeService;
  * @date 2024-06-18
  */
 @Service
-@DataSource(DataSourceType.SLAVE)
+@DS("slave")
 public class AppUsersChargeServiceImpl extends ServiceImpl<AppUsersChargeMapper, AppUsersCharge> implements IAppUsersChargeService {
     @Autowired
     private AppUsersChargeMapper appUsersChargeMapper;

+ 2 - 1
game-business/src/main/java/com/game/business/service/impl/FinTranRecordServiceImpl.java

@@ -1,5 +1,6 @@
 package com.game.business.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
 
@@ -19,7 +20,7 @@ import com.game.business.service.IFinTranRecordService;
  * @date 2024-06-18
  */
 @Service
-@DataSource(DataSourceType.SLAVE)
+@DS("slave")
 public class FinTranRecordServiceImpl extends ServiceImpl<FinTranRecordMapper, FinTranRecord> implements IFinTranRecordService {
 
     @Autowired

+ 3 - 7
game-business/src/main/java/com/game/business/task/AppGameBettingTask.java

@@ -1,6 +1,7 @@
 package com.game.business.task;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.game.business.domain.AppGameBetting;
 import com.game.business.domain.AppUser;
 import com.game.business.domain.FinTranRecord;
@@ -27,12 +28,7 @@ public class AppGameBettingTask {
 
     public void gameBettingTask(Long classId, Long gameId, String gameDate, String bettingItem){
 
-        LambdaQueryWrapper<AppGameBetting> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AppGameBetting::getClassId, classId);
-        queryWrapper.eq(AppGameBetting::getGameId, gameId);
-        queryWrapper.eq(AppGameBetting::getGameDate, gameDate);
-        queryWrapper.eq(AppGameBetting::getIsWinning, 0);
-        List<AppGameBetting> list = appGameBettingService.list(queryWrapper);
+        List<AppGameBetting> list = appGameBettingService.getIsWinning(classId, gameId, gameDate, 0);
 
         if(list == null || list.isEmpty()){
             return;
@@ -47,7 +43,7 @@ public class AppGameBettingTask {
                 continue;
             }
 
-            AppUser appUser = appUserService.getById(appGameBetting.getUserId());
+            AppUser appUser = appUserService.selectAppUserByUserid(appGameBetting.getUserId());
             if(appUser == null){
                 appGameBetting.setIsWinning(1);
                 appGameBettingService.updateById(appGameBetting);

+ 10 - 21
game-business/src/main/java/com/game/business/websocket/client/GameOneClient.java

@@ -2,7 +2,9 @@ package com.game.business.websocket.client;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.game.business.config.GameOneConfig;
 import com.game.business.domain.AppGame;
 import com.game.business.domain.AppGameClassify;
@@ -81,6 +83,7 @@ public class GameOneClient {
                 JSONObject jsonObject = dataArry.getJSONObject(i);
                 if(jsonObject.containsKey("type")){
                     type = jsonObject.getInteger("type");
+                    break;
                 }
             }
 
@@ -123,9 +126,7 @@ public class GameOneClient {
                     return;
                 }
 
-                LambdaQueryWrapper<AppGameClassify> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(AppGameClassify::getCode, classCode);
-                AppGameClassify appGameClassify = appGameClassifyService.getOne(queryWrapper);
+                AppGameClassify appGameClassify = appGameClassifyService.getByCode(classCode);
                 if(appGameClassify == null){
                     System.out.println("开奖游戏平台不存在:" + classCode);
                 }
@@ -138,15 +139,12 @@ public class GameOneClient {
                         continue;
                     }
 
-                    LambdaQueryWrapper<AppGame> queryGameWrapper = new LambdaQueryWrapper<>();
-                    queryGameWrapper.eq(AppGame::getCode, gameCode);
-                    queryGameWrapper.eq(AppGame::getClassifyId, appGameClassify.getId());
-                    AppGame appGame = appGameService.getOne(queryGameWrapper);
+                    AppGame appGame = appGameService.selectAppGameByClassIdAndCode(appGameClassify.getId(), gameCode);
                     if(appGame == null){
                         System.out.println("开奖游戏不存在:" + gameCode);
                     }
                     appGame.setGameTime(time);
-                    appGameService.updateById(appGame);
+                    appGameService.updateAppGame(appGame);
                 }
                 return;
             }
@@ -177,9 +175,7 @@ public class GameOneClient {
                 return;
             }
 
-            LambdaQueryWrapper<AppGameClassify> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(AppGameClassify::getCode, classCode);
-            AppGameClassify appGameClassify = appGameClassifyService.getOne(queryWrapper);
+            AppGameClassify appGameClassify = appGameClassifyService.getByCode(classCode);
             if(appGameClassify == null){
                 System.out.println("开奖游戏平台不存在:" + classCode);
             }
@@ -193,10 +189,7 @@ public class GameOneClient {
                     return;
                 }
 
-                LambdaQueryWrapper<AppGame> queryGameWrapper = new LambdaQueryWrapper<>();
-                queryGameWrapper.eq(AppGame::getCode, gameCode);
-                queryGameWrapper.eq(AppGame::getClassifyId, appGameClassify.getId());
-                AppGame appGame = appGameService.getOne(queryGameWrapper);
+                AppGame appGame = appGameService.selectAppGameByClassIdAndCode(appGameClassify.getId(), gameCode);
                 if(appGame == null){
                     System.out.println("开奖游戏不存在:" + gameCode);
                 }
@@ -210,15 +203,11 @@ public class GameOneClient {
 
                 if(type == 3){
                     appGame.setGameDate(gameDate);
-                    appGameService.updateById(appGame);
+                    appGameService.updateAppGame(appGame);
                     continue;
                 }
 
-                LambdaQueryWrapper<AppGameLottery> queryLotteryWrapper = new LambdaQueryWrapper<>();
-                queryLotteryWrapper.eq(AppGameLottery::getClassId, appGame.getClassifyId());
-                queryLotteryWrapper.eq(AppGameLottery::getGameId, appGame.getId());
-                queryLotteryWrapper.eq(AppGameLottery::getGameDate, gameDate);
-                long count = appGameLotteryService.count(queryLotteryWrapper);
+                long count = appGameLotteryService.selectCount(appGame.getClassifyId(), appGame.getId(), gameDate);
 
                 if(count > 0){
                     System.out.println("游戏socket推送开奖,当前期已开过将,游戏编码:" + gameCode + ",期号:" + gameDate);