Merge remote-tracking branch 'origin/master'

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

@@ -109,6 +109,12 @@ private static final long serialVersionUID=1L;
     @TableField(value = "betting_count")
     private Integer bettingCount;
 
+    /** 每期投注次数 */
+    @ApiModelProperty(value = "每期投注上限金额")
+    @Excel(name = "每期投注上限金额")
+    @TableField(value = "betting_max_money")
+    private Integer bettingMaxMoney;
+
     /** 排序 */
     @ApiModelProperty(value = "排序")
     @Excel(name = "排序")

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

@@ -33,8 +33,8 @@ public class Common {
     public static final String WS_GAME_ONE_URL = "ws://119.29.174.68:8000/ws";
     public static final String WS_GAME_ONE_REMARK_URL = "ws://81.71.95.104:8000/ws";
 
-    public static final String WS_GAME_TWO_URL = "ws://159.75.147.253:8000/ws";
-    public static final String WS_GAME_TWO_REMARK_URL = "ws://175.178.88.93:8000/ws";
+    public static final String WS_GAME_TWO_URL = "ws://10.0.0.15:8000/ws";
+    public static final String WS_GAME_TWO_REMARK_URL = "ws://10.0.0.10:8000/ws";
 
     public static final String WS_GAME_THREES_URL = "ws://114.132.186.201:8000/ws";
     public static final String WS_GAME_THREES_REMARK_URL = "ws://43.138.214.132:8000/ws";

game-business/src/main/resources/mapper/business/AppGameMapper.xml

@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderno"    column="orderno"    />
         <result property="enable"    column="enable"    />
         <result property="bettingCount"    column="betting_count"    />
+        <result property="bettingMaxMoney"    column="betting_max_money"    />
         <result property="gameExpand1"    column="game_expand1"    />
         <result property="gameExpand2"    column="game_expand2"    />
         <result property="gameExpand3"    column="game_expand3"    />
@@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAppGameVo">
-        select id, name, code, classify_id, game_date, game_time, up_item, logo_url, live_img_url, my_img_url, game_path, status, create_time, orderno, enable, betting_count, game_expand1, game_expand2, game_expand3, game_expand4 from app_game
+        select id, name, code, classify_id, game_date, game_time, up_item, logo_url, live_img_url, my_img_url, game_path, status, create_time, orderno, enable, betting_count,betting_max_money, game_expand1, game_expand2, game_expand3, game_expand4 from app_game
     </sql>
 
     <select id="selectAppGameList" parameterType="com.game.business.domain.AppGame" resultMap="AppGameResult">
@@ -47,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderno != null "> and orderno = #{orderno}</if>
             <if test="enable != null "> and enable = #{enable}</if>
             <if test="bettingCount != null "> and betting_count = #{bettingCount}</if>
+            <if test="bettingMaxMoney != null "> and betting_max_money = #{bettingMaxMoney}</if>
             <if test="gameExpand1 != null  and gameExpand1 != ''"> and game_expand1 = #{gameExpand1}</if>
             <if test="gameExpand2 != null  and gameExpand2 != ''"> and game_expand2 = #{gameExpand2}</if>
             <if test="gameExpand3 != null  and gameExpand3 != ''"> and game_expand3 = #{gameExpand3}</if>
@@ -78,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderno != null">orderno,</if>
             <if test="enable != null">enable,</if>
             <if test="bettingCount != null">betting_count,</if>
+            <if test="bettingMaxMoney != null">betting_max_money,</if>
             <if test="gameExpand1 != null">game_expand1,</if>
             <if test="gameExpand2 != null">game_expand2,</if>
             <if test="gameExpand3 != null">game_expand3,</if>
@@ -100,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderno != null">#{orderno},</if>
             <if test="enable != null">#{enable},</if>
             <if test="bettingCount != null">#{bettingCount},</if>
+            <if test="bettingMaxMoney != null">#{bettingMaxMoney},</if>
             <if test="gameExpand1 != null">#{gameExpand1},</if>
             <if test="gameExpand2 != null">#{gameExpand2},</if>
             <if test="gameExpand3 != null">#{gameExpand3},</if>
@@ -125,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderno != null">orderno = #{orderno},</if>
             <if test="enable != null">enable = #{enable},</if>
             <if test="bettingCount != null">betting_count = #{bettingCount},</if>
+            <if test="bettingMaxMoney != null">betting_max_money = #{bettingMaxMoney},</if>
             <if test="gameExpand1 != null">game_expand1 = #{gameExpand1},</if>
             <if test="gameExpand2 != null">game_expand2 = #{gameExpand2},</if>
             <if test="gameExpand3 != null">game_expand3 = #{gameExpand3},</if>