Merge remote-tracking branch 'origin/master'

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

@@ -153,7 +153,10 @@ public class AppGameBettingController extends BaseController{
             redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
 
             gameBetting.setGameDate(appGame.getGameDate());
-
+            gameBetting.setIsLive(0);
+            if(gameBetting.getLiveRoomId() != null && gameBetting.getLiveUserId() != null){
+                gameBetting.setIsLive(1);
+            }
 
             gameBetting.setCreateTime(new Date());
             // 插入投注记录

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

@@ -74,17 +74,21 @@ public class AppGameLotteryController extends BaseController{
 
                     String [] itmeArr = appGameLotteryVO.getGameLotterySucc().split(",");
                     String itemName = "";
+                    String itemMultiple = "";
                     for (int j = 0; j < itmeArr.length; j++) {
                         String item = itmeArr[j];
                         if(codeItmeMap.containsKey(item)){
                             if(StringUtils.isNotBlank(itemName)){
                                 itemName += "," + codeItmeMap.get(item).get(0).getItemName();
+                                itemMultiple += "," + codeItmeMap.get(item).get(0).getItemMultiple();
                             }else{
                                 itemName += codeItmeMap.get(item).get(0).getItemName();
+                                itemMultiple += codeItmeMap.get(item).get(0).getItemMultiple();
                             }
                         }
                     }
                     appGameLotteryVO.setItemName(itemName);
+                    appGameLotteryVO.setItemMultiple(itemMultiple);
                 }
                 resultList.add(appGameLotteryVO);
             }

game-business/src/main/java/com/game/business/domain/AppGameBetting.java

@@ -48,7 +48,7 @@ public class AppGameBetting {
 
     @Excel(name = "是否直播间投注 0：否 1：是")
     @TableField(value = "is_live")
-    @ApiModelProperty(value = "直播房间号")
+    @ApiModelProperty(value = "是否直播间投注 0：否 1：是")
     private Integer isLive;
 
     @Excel(name = "游戏期号")

game-business/src/main/java/com/game/business/vo/AppGameLotteryVO.java

@@ -21,4 +21,7 @@ public class AppGameLotteryVO extends AppGameLottery {
 
     @ApiModelProperty(value = "游戏选项名称")
     private String itemName;
+
+    @ApiModelProperty(value = "游戏选项倍数")
+    private String itemMultiple;
 }