Merge remote-tracking branch 'origin/master'

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

@@ -187,7 +187,7 @@ public class AppGameBettingController extends BaseController{
 
         gameBetting.setGameDate(appGame.getGameDate());
         gameBetting.setIsLive(0);
-        if(gameBetting.getLiveRoomId() != null && gameBetting.getLiveUserId() != null){
+        if(gameBetting.getLiveRoomId() != null && gameBetting.getLiveRoomId() > 0 && gameBetting.getLiveUserId() != null && gameBetting.getLiveUserId() > 0){
             gameBetting.setIsLive(1);
         }
 

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

@@ -111,6 +111,18 @@ public class AppGameBettingTask {
                 return;
             }
 
+            if(gameCode.equals(Common.GAME_FOUR_CODE)){
+                if(state == null || state != 0){
+                    return;
+                }
+            }
+
+            if(gameCode.equals(Common.GAME_FIVE_CODE)){
+                if(state == null || state != 1){
+                    return;
+                }
+            }
+
             AppGameClassify appGameClassify = appGameClassifyService.getByCode(classCode);
             if(appGameClassify == null){
 //                System.out.println("开奖游戏平台不存在：" + classCode);
@@ -132,12 +144,6 @@ public class AppGameBettingTask {
                 return;
             }
 
-            if(gameCode.equals(Common.GAME_FOUR_CODE)){
-                if(state == null || state != 0){
-                    return;
-                }
-            }
-
             AppGame appGame = codeGameMap.get(gameCode).get(0);
             appGame.setGameTime(time);
             appGameService.updateAppGame(appGame);