Merge remote-tracking branch 'origin/master'

game-business/src/main/java/com/game/business/config/GameFourConfig.java

@@ -0,0 +1,22 @@
+package com.game.business.config;
+
+import com.game.business.util.Common;
+import com.game.business.websocket.WebSocketConnent;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.stereotype.Component;
+
+@Component
+@EnableAsync
+public class GameFourConfig implements CommandLineRunner {
+
+    public static WebSocketConnent webSocketConnent;
+
+    @Override
+    @Async
+    public void run(String... args) throws Exception {
+//        webSocketConnent = new WebSocketConnent(Common.WS_GAME_FOUR_URL, Common.WS_GAME_FOUR_REMARK_URL, Common.GAME_FOUR_NAME);
+//        webSocketConnent.connect();
+    }
+}

game-business/src/main/java/com/game/business/config/GameOneConfig.java

@@ -16,7 +16,7 @@ public class GameOneConfig implements CommandLineRunner {
     @Override
     @Async
     public void run(String... args) throws Exception {
-        webSocketConnent = new WebSocketConnent(Common.WS_GAME_ONE_URL, Common.WS_GAME_ONE_REMARK_URL, Common.GANME_ONE_NAME);
-        webSocketConnent.connect();
+//        webSocketConnent = new WebSocketConnent(Common.WS_GAME_ONE_URL, Common.WS_GAME_ONE_REMARK_URL, Common.GANME_ONE_NAME);
+//        webSocketConnent.connect();
     }
 }

game-business/src/main/java/com/game/business/config/GameThreesConfig.java

@@ -0,0 +1,22 @@
+package com.game.business.config;
+
+import com.game.business.util.Common;
+import com.game.business.websocket.WebSocketConnent;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.stereotype.Component;
+
+@Component
+@EnableAsync
+public class GameThreesConfig implements CommandLineRunner {
+
+    public static WebSocketConnent webSocketConnent;
+
+    @Override
+    @Async
+    public void run(String... args) throws Exception {
+//        webSocketConnent = new WebSocketConnent(Common.WS_GAME_THREES_URL, Common.WS_GAME_THREES_REMARK_URL, Common.GAME_THREES_NAME);
+//        webSocketConnent.connect();
+    }
+}

game-business/src/main/java/com/game/business/controller/AppGameBettingController.java

@@ -142,115 +142,112 @@ public class AppGameBettingController extends BaseController{
         if(count > 0){
             return HttpRet.fail("游戏已开奖，无法下单。");
         }
-        AppUser appUser = null;
-        synchronized (this){
 
-            appUser = appUserService.selectAppUserByUserid(gameBetting.getUserId());
+        AppUser appUser = appUserService.selectAppUserByUserid(gameBetting.getUserId());
 
-            if(appUser == null){
-                return HttpRet.fail("用户不存在。");
-            }
+        if(appUser == null){
+            return HttpRet.fail("用户不存在。");
+        }
 
-            if(gameBetting.getBettingType() == 0){
+        if(gameBetting.getBettingType() == 0){
 
-                // 获取用户金额，判断投注金额是否大于余额
-                if(gameBetting.getBettingAmount() > appUser.getDiamondCoin()){
-                    return HttpRet.fail("余额不足，投注失败。");
-                }
+            // 获取用户金额，判断投注金额是否大于余额
+            if(gameBetting.getBettingAmount() > appUser.getDiamondCoin()){
+                return HttpRet.fail("余额不足，投注失败。");
+            }
 
-                // 更新用户余额
-                appUser.setDiamondCoin(appUser.getDiamondCoin() - gameBetting.getBettingAmount());
-                appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() - gameBetting.getBettingAmount());
-                appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() - gameBetting.getBettingAmount());
-            }else{
+            // 更新用户余额
+            //appUser.setDiamondCoin(appUser.getDiamondCoin() - gameBetting.getBettingAmount());
+            //appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() - gameBetting.getBettingAmount());
+            //appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() - gameBetting.getBettingAmount());
+        }else{
 
-                // 获取用户金额，判断投注金额是否大于余额
-                if(gameBetting.getBettingAmount() > appUser.getCoin()){
-                    return HttpRet.fail("金币不足，投注失败。");
-                }
+            // 获取用户金额，判断投注金额是否大于余额
+            if(gameBetting.getBettingAmount() > appUser.getCoin()){
+                return HttpRet.fail("金币不足，投注失败。");
+            }
 
-                appUser.setCoin(appUser.getCoin() - gameBetting.getBettingAmount());
+            //appUser.setCoin(appUser.getCoin() - gameBetting.getBettingAmount());
 
-                // 判断不可提现金币是否满足扣款
-                if(gameBetting.getBettingAmount() > (appUser.getCoin() - appUser.getCoinCash())){
-                    appUser.setCoinCash(gameBetting.getBettingAmount() - (appUser.getCoin() - appUser.getCoinCash()));
-                }
-            }
+            // 判断不可提现金币是否满足扣款
+            //if(gameBetting.getBettingAmount() > (appUser.getCoin() - appUser.getCoinCash())){
+            //    appUser.setCoinCash(gameBetting.getBettingAmount() - (appUser.getCoin() - appUser.getCoinCash()));
+            //}
+        }
 
-            appUserService.updateAppUser(appUser);
+        //appUserService.updateAppUser(appUser);
 
-            redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
+        //redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
 
-            gameBetting.setGameDate(appGame.getGameDate());
-            gameBetting.setIsLive(0);
-            if(gameBetting.getLiveRoomId() != null && gameBetting.getLiveUserId() != null){
-                gameBetting.setIsLive(1);
-            }
+        gameBetting.setGameDate(appGame.getGameDate());
+        gameBetting.setIsLive(0);
+        if(gameBetting.getLiveRoomId() != null && gameBetting.getLiveUserId() != null){
+            gameBetting.setIsLive(1);
+        }
 
-            gameBetting.setCreateTime(new Date());
-            // 插入投注记录
-            appGameBettingService.save(gameBetting);
+        gameBetting.setCreateTime(new Date());
+        // 插入投注记录
+        appGameBettingService.save(gameBetting);
 
-            // 分佣
-            if(gameBetting.getBettingType() == 0){
-                appAgentGameBettingTask.agentGameBettingTask(gameBetting);
-            }
+        // 分佣
+        if(gameBetting.getBettingType() == 0){
+            appAgentGameBettingTask.agentGameBettingTask(gameBetting);
+        }
 
-            FinTranRecord finTranRecord = new FinTranRecord();
+        FinTranRecord finTranRecord = new FinTranRecord();
 
-            finTranRecord.setAfterCoin(appUser.getCoin());
-            finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+        //finTranRecord.setAfterCoin(appUser.getCoin());
+        //finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
 
-            if(gameBetting.getBettingType() == 0){
-                finTranRecord.setCurrencyType(4);
-                finTranRecord.setDiamondCoinChange(gameBetting.getBettingAmount());
-                finTranRecord.setCoinChange(0.00);
-            }else{
-                finTranRecord.setCurrencyType(2);
-                finTranRecord.setCoinChange(gameBetting.getBettingAmount());
-                finTranRecord.setDiamondCoinChange(0.00);
-            }
+        if(gameBetting.getBettingType() == 0){
+            finTranRecord.setCurrencyType(4);
+            finTranRecord.setDiamondCoinChange(gameBetting.getBettingAmount());
+            finTranRecord.setCoinChange(0.00);
+        }else{
+            finTranRecord.setCurrencyType(2);
+            finTranRecord.setCoinChange(gameBetting.getBettingAmount());
+            finTranRecord.setDiamondCoinChange(0.00);
+        }
 
-            finTranRecord.setAfterMoney(0.00);
-            finTranRecord.setMoneyChange(0.00);
+        finTranRecord.setAfterMoney(0.00);
+        finTranRecord.setMoneyChange(0.00);
 
-            finTranRecord.setAfterTicket(0.00);
-            finTranRecord.setTicketChange(0.00);
+        finTranRecord.setAfterTicket(0.00);
+        finTranRecord.setTicketChange(0.00);
 
-            finTranRecord.setToUid(appUser.getUserid());
-            finTranRecord.setUid(appUser.getUserid());
+        finTranRecord.setToUid(appUser.getUserid());
+        finTranRecord.setUid(appUser.getUserid());
 
-            finTranRecord.setSceneId1(0L);
-            finTranRecord.setSceneId2(null);
-            finTranRecord.setSceneType(0L);
+        finTranRecord.setSceneId1(0L);
+        finTranRecord.setSceneId2(null);
+        finTranRecord.setSceneType(0L);
 
-            finTranRecord.setTranGroupId(gameBetting.getId());
-            finTranRecord.setTranType1(FinTranType1.U_Outcome_Balance.getType());
-            finTranRecord.setTranType2(FinTranType2.CONSUM_GAME.getType());
-            finTranRecord.setTranType3(FinTranType3.CONSUM_GAME_ANCHOR_ZHUANPAN.getType());
+        finTranRecord.setTranGroupId(gameBetting.getId());
+        finTranRecord.setTranType1(FinTranType1.U_Outcome_Balance.getType());
+        finTranRecord.setTranType2(FinTranType2.CONSUM_GAME.getType());
+        finTranRecord.setTranType3(FinTranType3.CONSUM_GAME_ANCHOR_ZHUANPAN.getType());
 
-            finTranRecord.setRemarks("游戏下注");
+        finTranRecord.setRemarks("游戏下注");
 
-            finTranRecord.setConsumptionCoin(gameBetting.getBettingAmount());
-            finTranRecord.setConsumptionMoney(0.00);
-            finTranRecord.setCommissionRelatedUid(0L);
-            finTranRecord.setAgentId(appUser.getAgentId());
+        finTranRecord.setConsumptionCoin(gameBetting.getBettingAmount());
+        finTranRecord.setConsumptionMoney(0.00);
+        finTranRecord.setCommissionRelatedUid(0L);
+        finTranRecord.setAgentId(appUser.getAgentId());
 
-            finTranRecord.setCreateTime(new Date());
+        finTranRecord.setCreateTime(new Date());
 
-            finTranRecord.setFromUid(appUser.getUserid());
-            finTranRecord.setGoodsId(0L);
-            finTranRecord.setGuildId(0L);
-            finTranRecord.setManagerCoId(0L);
-            finTranRecord.setManagerId(0L);
+        finTranRecord.setFromUid(appUser.getUserid());
+        finTranRecord.setGoodsId(0L);
+        finTranRecord.setGuildId(0L);
+        finTranRecord.setManagerCoId(0L);
+        finTranRecord.setManagerId(0L);
 
-            finTranRecord.setPerc(0.00);
-            finTranRecord.setProId(0L);
-            finTranRecord.setProCount(0L);
+        finTranRecord.setPerc(0.00);
+        finTranRecord.setProId(0L);
+        finTranRecord.setProCount(0L);
 
-            finTranRecord.setOrderId(gameBetting.getId());
-            finTranRecordService.insertFinTranRecord(finTranRecord);
-        }
+        finTranRecord.setOrderId(gameBetting.getId());
+        finTranRecordService.insertFinTranRecord(finTranRecord);
 
         return HttpRet.success("下注成功", appUser.getDiamondCoin());
     }

game-business/src/main/java/com/game/business/task/AppAgentGameBettingTask.java

@@ -159,20 +159,20 @@ public class AppAgentGameBettingTask {
             indexCommission = appGameCommission.getGameRate();
 
             // 更新用户余额
-            if(appGameBetting.getBettingType() == 0){
-                appUser.setDiamondCoin(appUser.getDiamondCoin() + userCommission.doubleValue());
-                appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() + userCommission.doubleValue());
-                appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + userCommission.doubleValue());
+            //if(appGameBetting.getBettingType() == 0){
+            //    appUser.setDiamondCoin(appUser.getDiamondCoin() + userCommission.doubleValue());
+            //    appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() + userCommission.doubleValue());
+            //    appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + userCommission.doubleValue());
 
             // 更新用户金币
-            }else{
-                appUser.setCoin(appUser.getCoin() + userCommission.doubleValue());
-                appUser.setCoinCash(appUser.getCoinCash() + userCommission.doubleValue());
-            }
+            //}else{
+            //    appUser.setCoin(appUser.getCoin() + userCommission.doubleValue());
+            //    appUser.setCoinCash(appUser.getCoinCash() + userCommission.doubleValue());
+            //}
 
-            appUserService.updateAppUser(appUser);
+            //appUserService.updateAppUser(appUser);
 
-            redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
+            //redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
 
             AppUserGameRecordCount appUserGameRecordCount = new AppUserGameRecordCount();
             appUserGameRecordCount.setGameId(appGameBetting.getGameId());
@@ -188,8 +188,8 @@ public class AppAgentGameBettingTask {
             recordCountList.add(appUserGameRecordCount);
 
             FinTranRecord finTranRecord = new FinTranRecord();
-            finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
-            finTranRecord.setAfterCoin(appUser.getCoin());
+            //finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+            //finTranRecord.setAfterCoin(appUser.getCoin());
 
             if(appGameBetting.getBettingType() == 0){
                 finTranRecord.setCurrencyType(4);
@@ -265,19 +265,18 @@ public class AppAgentGameBettingTask {
         double gameRateAmount = appGameBetting.getBettingAmount() * 0.003;
 
         // 更新用户余额
-        if(appGameBetting.getBettingType() == 0){
-            appUser.setDiamondCoin(appUser.getDiamondCoin() + gameRateAmount);
-            appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() + gameRateAmount);
-            appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + gameRateAmount);
+        //if(appGameBetting.getBettingType() == 0){
+        //    appUser.setDiamondCoin(appUser.getDiamondCoin() + gameRateAmount);
+        //    appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() + gameRateAmount);
+        //    appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + gameRateAmount);
         // 更新用户金币
-        }else{
-            appUser.setCoin(appUser.getCoin() + gameRateAmount);
-            appUser.setCoinCash(appUser.getCoinCash() + gameRateAmount);
-        }
-        appUserService.updateAppUser(appUser);
-
+        //}else{
+        //    appUser.setCoin(appUser.getCoin() + gameRateAmount);
+        //    appUser.setCoinCash(appUser.getCoinCash() + gameRateAmount);
+        //}
+        //appUserService.updateAppUser(appUser);
 
-        redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
+        //redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
 
         AppUserGameRecordCount appUserGameRecordCount = new AppUserGameRecordCount();
         appUserGameRecordCount.setGameId(appGameBetting.getGameId());
@@ -294,8 +293,8 @@ public class AppAgentGameBettingTask {
 
         FinTranRecord finTranRecord = new FinTranRecord();
 
-        finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
-        finTranRecord.setAfterCoin(appUser.getCoin());
+        //finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+        //finTranRecord.setAfterCoin(appUser.getCoin());
 
         if(appGameBetting.getBettingType() == 0){
             finTranRecord.setCurrencyType(4);

game-business/src/main/java/com/game/business/task/AppGameBettingTask.java

@@ -297,135 +297,143 @@ public class AppGameBettingTask {
             appGameBetting.setUpdateTime(new Date());
 
             String [] bettingItems = bettingItem.split(",");
-            for(int j = 0; j < bettingItems.length; j++){
-                String bettingItemStr = bettingItems[j];
+            List<String> bettingItemsList = Arrays.asList(bettingItems);
 
-                double bettingAmount = appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple();
+            double bettingAmount = appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple();
 
-                if(appGameBetting.getBettingGameType() == 0){
-                    if(!appGameBetting.getBettingItem().equals(bettingItemStr)){
-                        appGameBetting.setIsWinning(2);
-                        appGameBettingService.updateById(appGameBetting);
-                        continue;
-                    }
-                }else if(appGameBetting.getBettingGameType() == 1 || appGameBetting.getBettingGameType() == 2){
-                    List<AppGameItemBettingVO> itemList = JSON.parseArray(appGameBetting.getBettingItem(), AppGameItemBettingVO.class);
-                    if(itemList == null || itemList.isEmpty()){
-                        appGameBetting.setIsWinning(2);
-                        appGameBettingService.updateById(appGameBetting);
-                        continue;
-                    }
-                    List<String> bettingItemList = itemList.stream().map(AppGameItemBettingVO::getBettingItem).collect(Collectors.toList());
-                    if(!bettingItemList.contains(bettingItemStr)){
-                        appGameBetting.setIsWinning(2);
-                        appGameBettingService.updateById(appGameBetting);
-                        continue;
-                    }
-
-                    if(appGameBetting.getBettingGameType() == 2){
-                        for (int k = 0; k < itemList.size(); k++) {
-                            AppGameItemBettingVO appGameItemBettingVO = itemList.get(k);
-                            if(appGameItemBettingVO.getBettingItem().equals(bettingItemStr)){
-                                bettingAmount = appGameBetting.getBettingAmount() * appGameItemBettingVO.getBettingMultiple();
-                            }
-                        }
-                    }
+            if(appGameBetting.getBettingGameType() == 0){
+                if(!bettingItemsList.contains(appGameBetting.getBettingItem())){
+                    appGameBetting.setIsWinning(2);
+                    appGameBettingService.updateById(appGameBetting);
+                    continue;
                 }
-
-                AppUser appUser = appUserService.selectAppUserByUserid(appGameBetting.getUserId());
-                if(appUser == null){
-                    appGameBetting.setIsWinning(1);
+            }else if(appGameBetting.getBettingGameType() == 1 || appGameBetting.getBettingGameType() == 2){
+                List<AppGameItemBettingVO> itemList = JSON.parseArray(appGameBetting.getBettingItem(), AppGameItemBettingVO.class);
+                if(itemList == null || itemList.isEmpty()){
+                    appGameBetting.setIsWinning(2);
                     appGameBettingService.updateById(appGameBetting);
                     continue;
                 }
-
-                // 添加推送消息用户
-                String userId = appUser.getUserid() + "";
-                if(!userIds.contains(userId)){
-                    userIds.add(userId);
+                List<String> bettingItemList = itemList.stream().map(AppGameItemBettingVO::getBettingItem).collect(Collectors.toList());
+                boolean isWinning = false;
+                for (int j = 0; j < bettingItemList.size(); j++) {
+                    String bettingItemStr = bettingItemList.get(j);
+                    if(bettingItemsList.contains(bettingItemStr)){
+                        isWinning = true;
+                        break;
+                    }
                 }
 
-                // 更新用户余额
-                if(appGameBetting.getBettingType() == 0){
-                    appUser.setDiamondCoin(appUser.getDiamondCoin() + bettingAmount );
-                    appUser.setDiamondCoinTotal(appUser.getDiamondCoinCashTotal() + bettingAmount);
-                    appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + bettingAmount);
-                // 更新用户金币
-                }else{
-                    appUser.setCoin(appUser.getCoin() + bettingAmount);
-//                    if(appUser.getRole() == 1){
-//                        appUser.setCoinCash(appUser.getCoinCash() + bettingAmount);
-//                    }
+                if(!isWinning){
+                    appGameBetting.setIsWinning(2);
+                    appGameBettingService.updateById(appGameBetting);
+                    continue;
                 }
 
-                appUserService.updateAppUser(appUser);
-
-                redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
+                if(appGameBetting.getBettingGameType() == 2){
+                    for (int k = 0; k < itemList.size(); k++) {
+                        AppGameItemBettingVO appGameItemBettingVO = itemList.get(k);
+                        if(bettingItemsList.contains(appGameItemBettingVO.getBettingItem())){
+                            bettingAmount = appGameBetting.getBettingAmount() * appGameItemBettingVO.getBettingMultiple();
+                            break;
+                        }
+                    }
+                }
+            }
 
+            AppUser appUser = appUserService.selectAppUserByUserid(appGameBetting.getUserId());
+            if(appUser == null){
                 appGameBetting.setIsWinning(1);
                 appGameBettingService.updateById(appGameBetting);
+                continue;
+            }
 
-                FinTranRecord finTranRecord = new FinTranRecord();
-
-                finTranRecord.setAfterCoin(appUser.getCoin());
-                finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+            // 添加推送消息用户
+            String userId = appUser.getUserid() + "";
+            if(!userIds.contains(userId)){
+                userIds.add(userId);
+            }
 
-                if(appGameBetting.getBettingType() == 0){
-                    finTranRecord.setCurrencyType(4);
-                    finTranRecord.setDiamondCoinChange(bettingAmount);
-                    finTranRecord.setCoinChange(0.00);
-                }else{
-                    finTranRecord.setCurrencyType(2);
-                    finTranRecord.setCoinChange(bettingAmount);
-                    finTranRecord.setDiamondCoinChange(0.00);
-                }
+            // 更新用户余额
+            //if(appGameBetting.getBettingType() == 0){
+            //    appUser.setDiamondCoin(appUser.getDiamondCoin() + bettingAmount );
+            //    appUser.setDiamondCoinTotal(appUser.getDiamondCoinCashTotal() + bettingAmount);
+            //    appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + bettingAmount);
+            // 更新用户金币
+            //}else{
+            //    appUser.setCoin(appUser.getCoin() + bettingAmount);
+            //        if(appUser.getRole() == 1){
+            //            appUser.setCoinCash(appUser.getCoinCash() + bettingAmount);
+            //        }
+            //}
+
+            //appUserService.updateAppUser(appUser);
+
+            //redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
+
+            appGameBetting.setIsWinning(1);
+            appGameBettingService.updateById(appGameBetting);
+
+            FinTranRecord finTranRecord = new FinTranRecord();
+
+            //finTranRecord.setAfterCoin(appUser.getCoin());
+            //finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+
+            if(appGameBetting.getBettingType() == 0){
+                finTranRecord.setCurrencyType(4);
+                finTranRecord.setDiamondCoinChange(bettingAmount);
+                finTranRecord.setCoinChange(0.00);
+            }else{
+                finTranRecord.setCurrencyType(2);
+                finTranRecord.setCoinChange(bettingAmount);
+                finTranRecord.setDiamondCoinChange(0.00);
+            }
 
-                finTranRecord.setAfterMoney(0.00);
-                finTranRecord.setMoneyChange(0.00);
+            finTranRecord.setAfterMoney(0.00);
+            finTranRecord.setMoneyChange(0.00);
 
-                finTranRecord.setAfterTicket(0.00);
-                finTranRecord.setTicketChange(0.00);
+            finTranRecord.setAfterTicket(0.00);
+            finTranRecord.setTicketChange(0.00);
 
-                finTranRecord.setToUid(appUser.getUserid());
-                finTranRecord.setUid(appUser.getUserid());
+            finTranRecord.setToUid(appUser.getUserid());
+            finTranRecord.setUid(appUser.getUserid());
 
-                finTranRecord.setSceneId1(0L);
-                finTranRecord.setSceneId2(null);
-                finTranRecord.setSceneType(0L);
+            finTranRecord.setSceneId1(0L);
+            finTranRecord.setSceneId2(null);
+            finTranRecord.setSceneType(0L);
 
-                finTranRecord.setTranGroupId(appGameBetting.getId());
+            finTranRecord.setTranGroupId(appGameBetting.getId());
 
-                if(appGameBetting.getBettingType() == 0){
-                    finTranRecord.setTranType1(FinTranType1.U_Income_Coin_Balance.getType());
-                }else{
-                    finTranRecord.setTranType1(FinTranType1.U_Income_Coin.getType());
-                }
+            if(appGameBetting.getBettingType() == 0){
+                finTranRecord.setTranType1(FinTranType1.U_Income_Coin_Balance.getType());
+            }else{
+                finTranRecord.setTranType1(FinTranType1.U_Income_Coin.getType());
+            }
 
-                finTranRecord.setTranType2(FinTranType2.GAME_REWARD.getType());
-                finTranRecord.setTranType3(FinTranType3.CHARGE_WIN_GAME.getType());
+            finTranRecord.setTranType2(FinTranType2.GAME_REWARD.getType());
+            finTranRecord.setTranType3(FinTranType3.CHARGE_WIN_GAME.getType());
 
-                finTranRecord.setRemarks("游戏中奖");
+            finTranRecord.setRemarks("游戏中奖");
 
-                finTranRecord.setConsumptionCoin(appGameBetting.getBettingAmount());
-                finTranRecord.setConsumptionMoney(0.00);
-                finTranRecord.setCommissionRelatedUid(0L);
-                finTranRecord.setAgentId(appUser.getAgentId());
+            finTranRecord.setConsumptionCoin(appGameBetting.getBettingAmount());
+            finTranRecord.setConsumptionMoney(0.00);
+            finTranRecord.setCommissionRelatedUid(0L);
+            finTranRecord.setAgentId(appUser.getAgentId());
 
-                finTranRecord.setCreateTime(new Date());
+            finTranRecord.setCreateTime(new Date());
 
-                finTranRecord.setFromUid(appGameBetting.getUserId());
-                finTranRecord.setGoodsId(0L);
-                finTranRecord.setGuildId(0L);
-                finTranRecord.setManagerCoId(0L);
-                finTranRecord.setManagerId(0L);
+            finTranRecord.setFromUid(appGameBetting.getUserId());
+            finTranRecord.setGoodsId(0L);
+            finTranRecord.setGuildId(0L);
+            finTranRecord.setManagerCoId(0L);
+            finTranRecord.setManagerId(0L);
 
-                finTranRecord.setPerc(0.00);
-                finTranRecord.setProId(0L);
-                finTranRecord.setProCount(0L);
+            finTranRecord.setPerc(0.00);
+            finTranRecord.setProId(0L);
+            finTranRecord.setProCount(0L);
 
-                finTranRecord.setOrderId(appGameBetting.getId());
-                finTranRecordService.insertFinTranRecord(finTranRecord);
-            }
+            finTranRecord.setOrderId(appGameBetting.getId());
+            finTranRecordService.insertFinTranRecord(finTranRecord);
         }
         return userIds;
     }

game-business/src/main/java/com/game/business/task/AppGameLotteryTask.java

@@ -120,29 +120,29 @@ public class AppGameLotteryTask {
                 }
 
                 // 更新用户余额
-                if(appGameBetting.getBettingType() == 0){
-                    appUser.setDiamondCoin(appUser.getDiamondCoin() + bettingAmount );
-                    appUser.setDiamondCoinTotal(appUser.getDiamondCoinCashTotal() + bettingAmount);
-                    appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + bettingAmount);
-                    // 更新用户金币
-                }else{
-                    appUser.setCoin(appUser.getCoin() + bettingAmount);
-//                    if(appUser.getRole() == 1){
-//                        appUser.setCoinCash(appUser.getCoinCash() + bettingAmount);
-//                    }
-                }
-
-                appUserService.updateAppUser(appUser);
-
-                redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
+                //if(appGameBetting.getBettingType() == 0){
+                //    appUser.setDiamondCoin(appUser.getDiamondCoin() + bettingAmount );
+                //    appUser.setDiamondCoinTotal(appUser.getDiamondCoinCashTotal() + bettingAmount);
+                //    appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + bettingAmount);
+                // 更新用户金币
+                //}else{
+                //    appUser.setCoin(appUser.getCoin() + bettingAmount);
+                //    if(appUser.getRole() == 1){
+                //        appUser.setCoinCash(appUser.getCoinCash() + bettingAmount);
+                //    }
+                //}
+
+                //appUserService.updateAppUser(appUser);
+
+                //redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
 
                 appGameBetting.setIsWinning(1);
                 appGameBettingService.updateById(appGameBetting);
 
                 FinTranRecord finTranRecord = new FinTranRecord();
 
-                finTranRecord.setAfterCoin(appUser.getCoin());
-                finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+                //finTranRecord.setAfterCoin(appUser.getCoin());
+                //finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
 
                 if(appGameBetting.getBettingType() == 0){
                     finTranRecord.setCurrencyType(4);

game-business/src/main/java/com/game/business/task/AppUserLiveDividedTask.java

@@ -122,19 +122,19 @@ public class AppUserLiveDividedTask {
             indexCommission = appUserAgent.getLiveRate();
 
             // 更新用户余额
-            if(item.getCurrencyType() == 4){
-                appUser.setDiamondCoin(appUser.getDiamondCoin() + userCommission.doubleValue());
-                appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() + userCommission.doubleValue());
-                appUser.setDiamondCoinCash(appUser.getDiamondCoinTotal() + userCommission.doubleValue());
-                appUserService.updateAppUser(appUser);
+            //if(item.getCurrencyType() == 4){
+            //    appUser.setDiamondCoin(appUser.getDiamondCoin() + userCommission.doubleValue());
+            //    appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() + userCommission.doubleValue());
+            //    appUser.setDiamondCoinCash(appUser.getDiamondCoinTotal() + userCommission.doubleValue());
+            //    appUserService.updateAppUser(appUser);
                 // 更新用户金币
-            }else{
-                appUser.setCoin(appUser.getCoin() + userCommission.doubleValue());
-                appUser.setCoinCash(appUser.getCoinCash() + userCommission.doubleValue());
-                appUserService.updateAppUser(appUser);
-            }
+            //}else{
+            //    appUser.setCoin(appUser.getCoin() + userCommission.doubleValue());
+            //    appUser.setCoinCash(appUser.getCoinCash() + userCommission.doubleValue());
+            //    appUserService.updateAppUser(appUser);
+            //}
 
-            redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
+            //redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
 
             // 插入分佣记录
             AppUserLiveDividedRecord appUserLiveDividedRecord = new AppUserLiveDividedRecord();
@@ -148,8 +148,8 @@ public class AppUserLiveDividedTask {
 
             FinTranRecord finTranRecord = new FinTranRecord();
 
-            finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
-            finTranRecord.setAfterCoin(appUser.getCoin());
+            //finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+            //finTranRecord.setAfterCoin(appUser.getCoin());
 
             if(item.getCurrencyType() == 4){
                 finTranRecord.setCurrencyType(4);

game-business/src/main/java/com/game/business/task/WebSokcetTask.java

@@ -10,7 +10,7 @@ import java.io.IOException;
 @Component
 public class WebSokcetTask {
 
-    @Scheduled(cron = "0/5 * * * * ? ")
+    @Scheduled(cron = "0/10 * * * * ? ")
     public void liveDividedTask() throws IOException {
 
         if(Common.sessionMap.containsKey(Common.GAME_ONE_CODE)){
@@ -32,5 +32,25 @@ public class WebSokcetTask {
                 session.getBasicRemote().sendText("ping");
             }
         }
+
+        if(Common.sessionMap.containsKey(Common.GAME_THREES_CODE)){
+            Session session = Common.sessionMap.get(Common.GAME_THREES_CODE);
+            if(!session.isOpen()){
+                Common.sessionMap.remove(Common.GAME_THREES_CODE);
+                session.close();
+            }else{
+                session.getBasicRemote().sendText("ping");
+            }
+        }
+
+        if(Common.sessionMap.containsKey(Common.GAME_FOUR_CODE)){
+            Session session = Common.sessionMap.get(Common.GAME_FOUR_CODE);
+            if(!session.isOpen()){
+                Common.sessionMap.remove(Common.GAME_FOUR_CODE);
+                session.close();
+            }else{
+                session.getBasicRemote().sendText("ping");
+            }
+        }
     }
 }

game-business/src/main/java/com/game/business/util/Common.java

@@ -10,14 +10,19 @@ public class Common {
     public static final String GAME_ONE_CODE = "1";
     public static final String GANME_TWO_NAME = "two";
     public static final String GAME_TWO_CODE = "2";
-    public static final String GANME_THREES_NAME = "threes";
-    public static final String GANME_THREES_CODE = "3";
+    public static final String GAME_THREES_NAME = "threes";
+    public static final String GAME_THREES_CODE = "3";
+    public static final String GAME_FOUR_NAME = "four";
+    public static final String GAME_FOUR_CODE = "4";
 
     public static final String WS_GAME_ONE_URL = "ws://47.115.49.14:8000/ws";
     public static final String WS_GAME_ONE_REMARK_URL = "ws://47.238.102.31:8000/ws";
-    public static final String WS_GAME_TWO_URL = "ws://47.115.54.173:8000/ws";
-    public static final String WS_GAME_TWO_REMARK_URL = "ws://47.115.54.173:8000/ws";
-
+    public static final String WS_GAME_TWO_URL = "ws://43.154.162.11:8000/ws";
+    public static final String WS_GAME_TWO_REMARK_URL = "ws://43.154.162.11:8000/ws";
+    public static final String WS_GAME_THREES_URL = "ws://43.154.162.11:8000/ws";
+    public static final String WS_GAME_THREES_REMARK_URL = "ws://43.154.162.11:8000/ws";
+    public static final String WS_GAME_FOUR_URL = "ws://43.154.162.11:8000/ws";
+    public static final String WS_GAME_FOUR_REMARK_URL = "ws://43.154.162.11:8000/ws";
 
     public static Map<String, Session> sessionMap = new HashMap<>();
 }

game-business/src/main/java/com/game/business/websocket/WebSocketConnent.java

@@ -5,6 +5,7 @@ import com.game.business.config.GameTwoConfig;
 import com.game.business.config.SpringContextSetting;
 import com.game.business.util.Common;
 import com.game.business.websocket.client.GameOneClient;
+import com.game.business.websocket.client.GameThreesClient;
 import com.game.business.websocket.client.GameTwoClient;
 import org.apache.commons.lang3.StringUtils;
 
@@ -53,6 +54,16 @@ public class WebSocketConnent {
                     ContainerProvider.getWebSocketContainer().connectToServer(client, new URI(this.WS_NOW_URL));
                 }
 
+                if(Common.GAME_THREES_NAME.equals(this.WS_URL_NAME)){
+                    GameThreesClient client = SpringContextSetting.getBean(GameThreesClient.class);
+                    ContainerProvider.getWebSocketContainer().connectToServer(client, new URI(this.WS_NOW_URL));
+                }
+
+                if(Common.GAME_FOUR_NAME.equals(this.WS_URL_NAME)){
+                    GameThreesClient client = SpringContextSetting.getBean(GameThreesClient.class);
+                    ContainerProvider.getWebSocketContainer().connectToServer(client, new URI(this.WS_NOW_URL));
+                }
+
                 System.out.println(this.WS_URL_NAME + " 已成功连接Websocket[" + this.WS_NOW_URL + "]");
                 this.WS_CONNENT_NUM = 0;
                 break;

game-business/src/main/java/com/game/business/websocket/client/GameFourClient.java

@@ -0,0 +1,71 @@
+package com.game.business.websocket.client;
+
+import com.game.business.config.GameFourConfig;
+import com.game.business.config.GameThreesConfig;
+import com.game.business.task.AppGameBettingTask;
+import com.game.business.util.Common;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.*;
+import java.util.Date;
+
+
+@Component
+@ClientEndpoint
+public class GameFourClient {
+
+    @Autowired
+    private AppGameBettingTask appGameBettingTask;
+
+    @OnOpen
+    public void onOpen(Session session) throws Exception{
+        System.out.println("game four 游戏已连接 server");
+        session.getBasicRemote().sendText("ping");
+        Common.sessionMap.put(Common.GAME_FOUR_CODE, session);
+    }
+
+    @OnClose
+    public void onClose(Session session) throws Exception{
+        System.out.println("game four 游戏已断开 server：" + new Date());
+        connect();
+    }
+
+    @OnError
+    public void onError(Session session, Throwable throwable) throws Exception{
+        System.out.println("game four 连接异常 [" + throwable.getMessage() + "]");
+        connect();
+    }
+
+    public void connect(){
+        synchronized (this){
+            try {
+                GameFourConfig.webSocketConnent.connect();
+            }catch (Exception e){
+                System.out.println("连接 game four [socket] 异常" + e.getMessage());
+            }
+        }
+    }
+
+    @OnMessage
+    public void onMessage(Session session, String message){
+        try {
+            if(StringUtils.isBlank(message)){
+                System.out.println("game four 数据为空");
+                return;
+            }
+
+            System.out.println("game four 接收数据" + message);
+
+            if(message.equals("pong")){
+                return;
+            }
+
+            appGameBettingTask.gameDataTask(message, Common.GAME_FOUR_CODE);
+        }catch (Exception e){
+            e.printStackTrace();
+            System.out.println("game four 接收数据异常[" + e.getMessage() + "]");
+        }
+    }
+}

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

@@ -70,7 +70,6 @@ public class GameOneClient {
             System.out.println("game one 接收数据" + message);
 
             if(message.equals("pong")){
-//                session.getBasicRemote().sendText("ping");
                 return;
             }
 

game-business/src/main/java/com/game/business/websocket/client/GameThreesClient.java

@@ -0,0 +1,71 @@
+package com.game.business.websocket.client;
+
+import com.game.business.config.GameThreesConfig;
+import com.game.business.config.GameTwoConfig;
+import com.game.business.task.AppGameBettingTask;
+import com.game.business.util.Common;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.*;
+import java.util.Date;
+
+
+@Component
+@ClientEndpoint
+public class GameThreesClient {
+
+    @Autowired
+    private AppGameBettingTask appGameBettingTask;
+
+    @OnOpen
+    public void onOpen(Session session) throws Exception{
+        System.out.println("game threes 游戏已连接 server");
+        session.getBasicRemote().sendText("ping");
+        Common.sessionMap.put(Common.GAME_THREES_CODE, session);
+    }
+
+    @OnClose
+    public void onClose(Session session) throws Exception{
+        System.out.println("game threes 游戏已断开 server：" + new Date());
+        connect();
+    }
+
+    @OnError
+    public void onError(Session session, Throwable throwable) throws Exception{
+        System.out.println("game threes 连接异常 [" + throwable.getMessage() + "]");
+        connect();
+    }
+
+    public void connect(){
+        synchronized (this){
+            try {
+                GameThreesConfig.webSocketConnent.connect();
+            }catch (Exception e){
+                System.out.println("连接 game threes [socket] 异常" + e.getMessage());
+            }
+        }
+    }
+
+    @OnMessage
+    public void onMessage(Session session, String message){
+        try {
+            if(StringUtils.isBlank(message)){
+                System.out.println("game threes 数据为空");
+                return;
+            }
+
+            System.out.println("game threes 接收数据" + message);
+
+            if(message.equals("pong")){
+                return;
+            }
+
+            appGameBettingTask.gameDataTask(message, Common.GAME_THREES_CODE);
+        }catch (Exception e){
+            e.printStackTrace();
+            System.out.println("game threes 接收数据异常[" + e.getMessage() + "]");
+        }
+    }
+}

game-business/src/main/java/com/game/business/websocket/client/GameTwoClient.java

@@ -59,14 +59,13 @@ public class GameTwoClient {
             System.out.println("game two 接收数据" + message);
 
             if(message.equals("pong")){
-//                session.getBasicRemote().sendText("ping");
                 return;
             }
 
             appGameBettingTask.gameDataTask(message, Common.GAME_TWO_CODE);
         }catch (Exception e){
             e.printStackTrace();
-            System.out.println("game one 接收数据异常[" + e.getMessage() + "]");
+            System.out.println("game two 接收数据异常[" + e.getMessage() + "]");
         }
     }
 }