kk 1 månad sedan
förälder
incheckning
daf3b0b49b

+ 0 - 1
game-business/src/main/java/com/game/business/controller/AppGameBettingController.java

@@ -200,7 +200,6 @@ public class AppGameBettingController extends BaseController{
                         }
 
                         if(checkItemList.size() == 4){
-                            return HttpRet.fail("当前期投注选项已超过限额,无法下单!");
                         }
 
                         // 当前投注是否已经满足3个投注选项了

+ 5 - 0
game-business/src/main/java/com/game/business/vo/AppUserGameBettingCountVO.java

@@ -1,5 +1,7 @@
 package com.game.business.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.game.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -29,6 +31,9 @@ public class AppUserGameBettingCountVO {
     @ApiModelProperty(value = "当前开奖项")
     private String gameLotterySucc;
 
+    @ApiModelProperty(value = "是否开奖:0 否;1是")
+    private Integer isLottery;
+
     @ApiModelProperty(value = "当前开奖时间")
     private Date gameRecordDate;
 

+ 3 - 1
game-business/src/main/resources/mapper/business/AppGameBettingMapper.xml

@@ -38,7 +38,9 @@
     </select>
 
     <select id="getUserCount" resultType="com.game.business.vo.AppUserGameBettingCountVO">
-        select tmp.*,agl.game_lottery_succ as gameLotterySucc,agl.game_record_date as gameRecordDate from (
+        select tmp.*,
+               agl.game_lottery_succ as gameLotterySucc,agl.game_record_date as gameRecordDate,agl.is_lottery as isLottery
+        from (
           select
               game_date as gameDate,
               count(id) as bettingCount,