Merge remote-tracking branch 'origin/master'

src/main/java/com/izouma/awesomeadmin/constant/AppConstant.java

@@ -99,6 +99,33 @@ public interface AppConstant {
         Integer COIN = 2;
     }
 
+    /**
+     * 充值类型
+     */
+    public interface RechargeType {
+
+        /**
+         * 支付宝
+         */
+        Integer ALIPAY = 0;
+
+        /**
+         * 微信
+         */
+        Integer WEI_XIN = 1;
+
+        /**
+         * 后台管理员
+         */
+        Integer ADMIN = 2;
+
+
+        /**
+         * 其他
+         */
+        Integer OTHER = 3;
+    }
+
     public interface InergralUpdateType {
 
         /**
@@ -289,14 +316,14 @@ public interface AppConstant {
     public interface ProductType {
 
         /**
-         * 修图
+         * 充值
          */
-        String IMAGE = "0";
+        Integer RECHARGE = 0;
 
         /**
-         * 实体商品
+         * 消费
          */
-        String PHYSICAL = "1";
+        Integer CONSUMPTION = 1;
     }
 
     /**
@@ -437,6 +464,11 @@ public interface AppConstant {
          */
         Integer RECEIVE = 2;
 
+        /**
+         * 赛季奖金
+         */
+        Integer SEASON_BONUS = 3;
+
     }
 
     /**
@@ -463,4 +495,6 @@ public interface AppConstant {
         Integer END = 3;
 
     }
+
+
 }

src/main/java/com/izouma/awesomeadmin/dao/CompetitionSeasonMapper.java

@@ -28,6 +28,10 @@ public interface CompetitionSeasonMapper{
 
     CompetitionSeason queryCompetitionSeason(CompetitionSeason record);
 
+    CompetitionSeason queryStartCompetitionSeason(CompetitionSeason record);
+
     List<CompetitionSeason> query(CompetitionSeason record);
+
+    int addBonus(CompetitionSeason addBonus);
 }
 

src/main/java/com/izouma/awesomeadmin/dao/CompetitionSeasonMapper.xml

@@ -17,6 +17,10 @@
         <result column="rank" property="rank" jdbcType="INTEGER"/>
         <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
         <result column="game_id" property="gameId" jdbcType="INTEGER"/>
+        <result column="first_ratio" property="firstRatio" jdbcType="DECIMAL"/>
+        <result column="second_ratio" property="secondRatio" jdbcType="DECIMAL"/>
+        <result column="third_ratio" property="thirdRatio" jdbcType="DECIMAL"/>
+        <result column="bonus_paid" property="bonusPaid" jdbcType="DECIMAL"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -50,6 +54,14 @@
 
             game_id,
 
+            first_ratio,
+
+            second_ratio,
+
+            third_ratio,
+
+            bonus_paid,
+
         </trim>
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -111,6 +123,18 @@
             <if test="gameId!= null">
                 game_id,
             </if>
+            <if test="firstRatio!= null">
+                first_ratio,
+            </if>
+            <if test="secondRatio!= null">
+                second_ratio,
+            </if>
+            <if test="thirdRatio!= null">
+                third_ratio,
+            </if>
+            <if test="bonusPaid!= null">
+                bonus_paid,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -158,6 +182,18 @@
             <if test="gameId != null">
                 #{gameId,jdbcType=INTEGER},
             </if>
+            <if test="firstRatio != null">
+                #{firstRatio,jdbcType=DECIMAL},
+            </if>
+            <if test="secondRatio != null">
+                #{secondRatio,jdbcType=DECIMAL},
+            </if>
+            <if test="thirdRatio != null">
+                #{thirdRatio,jdbcType=DECIMAL},
+            </if>
+            <if test="bonusPaid != null">
+                #{bonusPaid,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.CompetitionSeason">
@@ -208,6 +244,35 @@
             <if test="gameId != null">
                 game_id= #{gameId,jdbcType=INTEGER},
             </if>
+            <if test="firstRatio != null">
+                first_ratio= #{firstRatio,jdbcType=DECIMAL},
+            </if>
+            <if test="secondRatio != null">
+                second_ratio= #{secondRatio,jdbcType=DECIMAL},
+            </if>
+            <if test="thirdRatio != null">
+                third_ratio= #{thirdRatio,jdbcType=DECIMAL},
+            </if>
+            <if test="bonusPaid != null">
+                bonus_paid= #{bonusPaid,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+
+    </update>
+    <update id="addBonus" parameterType="com.izouma.awesomeadmin.model.CompetitionSeason">
+        update competition_season
+        <set>
+            <if test="bonus != null">
+                bonus = bonus + #{bonus,jdbcType=DECIMAL},
+            </if>
         </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">
@@ -278,8 +343,6 @@
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR season LIKE concat('%',#{record.searchKey},'%')
                     OR short_name LIKE concat('%',#{record.searchKey},'%')
-                    OR begin_time LIKE concat('%',#{record.searchKey},'%')
-                    OR end_time LIKE concat('%',#{record.searchKey},'%')
                     OR bonus LIKE concat('%',#{record.searchKey},'%')
                     OR remark LIKE concat('%',#{record.searchKey},'%')
                     OR rank LIKE concat('%',#{record.searchKey},'%')
@@ -398,8 +461,6 @@
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR season LIKE concat('%',#{searchKey},'%')
                     OR short_name LIKE concat('%',#{searchKey},'%')
-                    OR begin_time LIKE concat('%',#{searchKey},'%')
-                    OR end_time LIKE concat('%',#{searchKey},'%')
                     OR bonus LIKE concat('%',#{searchKey},'%')
                     OR remark LIKE concat('%',#{searchKey},'%')
                     OR rank LIKE concat('%',#{searchKey},'%')
@@ -513,6 +574,68 @@
             </if>
 
 
+        </where>
+        LIMIT 1
+    </select>
+    <select id="queryStartCompetitionSeason" parameterType="java.util.Map"
+            resultMap="RankCompetitionSeasonResult">
+        select
+        <include refid="Base_Column_List"/>
+        ,
+        #{userId} as user_id
+
+        from competition_season
+        <where>
+            and del_flag = 'N'
+            and status_flag = 1
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
+            </if>
+            <if test="season != null and !&quot;&quot;.equals(season)">
+                and season = #{season}
+            </if>
+            <if test="shortName != null and !&quot;&quot;.equals(shortName)">
+                and short_name = #{shortName}
+            </if>
+            <if test="beginTime != null and !&quot;&quot;.equals(beginTime)">
+                and begin_time = #{beginTime}
+            </if>
+            <if test="endTime != null and !&quot;&quot;.equals(endTime)">
+                and end_time = #{endTime}
+            </if>
+            <if test="bonus != null and !&quot;&quot;.equals(bonus)">
+                and bonus = #{bonus}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+            <if test="rank != null and !&quot;&quot;.equals(rank)">
+                and rank = #{rank}
+            </if>
+            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
+                and status_flag = #{statusFlag}
+            </if>
+
+            <if test="gameId != null and !&quot;&quot;.equals(gameId)">
+                and game_id = #{gameId}
+            </if>
+
+
         </where>
         LIMIT 1
     </select>
@@ -548,5 +671,15 @@
 
     </resultMap>
 
+    <resultMap id="RankCompetitionSeasonResult" type="com.izouma.awesomeadmin.model.CompetitionSeason"
+               extends="BaseResultMap">
+
+        <association property="playerInfo"
+                     javaType="com.izouma.awesomeadmin.model.PlayerInfo"
+                     select="com.izouma.awesomeadmin.dao.PlayerInfoMapper.seasonUserRank"
+                     column="{ gameId = game_id, userId = user_id, seasonId = id }"/>
+
+    </resultMap>
+
 </mapper>
 

src/main/java/com/izouma/awesomeadmin/dao/GameInfoMapper.java

@@ -29,5 +29,7 @@ public interface GameInfoMapper{
     GameInfo queryGameInfo(GameInfo record);
 
     List<GameInfo> query(GameInfo record);
+
+    List<GameInfo> getGameInfoSeasonsList(GameInfo record);
 }
 

src/main/java/com/izouma/awesomeadmin/dao/GameInfoMapper.xml

@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.izouma.awesomeadmin.dao.GameInfoMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.GameInfo" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
-                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
-                                <result column="game_name" property="gameName" jdbcType="VARCHAR" />
-                                <result column="type_flag" property="typeFlag" jdbcType="INTEGER" />
-                                <result column="icon" property="icon" jdbcType="VARCHAR" />
-                                <result column="rank" property="rank" jdbcType="INTEGER" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-                                <result column="use_flag" property="useFlag" jdbcType="CHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
+<mapper namespace="com.izouma.awesomeadmin.dao.GameInfoMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.GameInfo">
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
+        <result column="game_name" property="gameName" jdbcType="VARCHAR"/>
+        <result column="type_flag" property="typeFlag" jdbcType="INTEGER"/>
+        <result column="icon" property="icon" jdbcType="VARCHAR"/>
+        <result column="rank" property="rank" jdbcType="INTEGER"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+        <result column="use_flag" property="useFlag" jdbcType="CHAR"/>
+        <result column="short_name" property="shortName" jdbcType="VARCHAR"/>
+        <result column="profile" property="profile" jdbcType="VARCHAR"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <trim suffixOverrides=",">
             id,
 
             del_flag,
@@ -40,138 +42,159 @@
             remark,
 
             use_flag,
+            short_name,
+            profile,
 
-            </trim>
+        </trim>
     </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from game_info
         where id = #{id,jdbcType=INTEGER}
     </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
         delete from game_info
         where id = #{id,jdbcType=INTEGER}
     </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.GameInfo" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.GameInfo" useGeneratedKeys="true"
+            keyProperty="id">
         insert into game_info
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id!= null">
                 id,
             </if>
-                <if test="delFlag!= null" >
+            <if test="delFlag!= null">
                 del_flag,
             </if>
-                <if test="updateTime!= null" >
+            <if test="updateTime!= null">
                 update_time,
             </if>
-                <if test="updateUser!= null" >
+            <if test="updateUser!= null">
                 update_user,
             </if>
-                <if test="createTime!= null" >
+            <if test="createTime!= null">
                 create_time,
             </if>
-                <if test="createUser!= null" >
+            <if test="createUser!= null">
                 create_user,
             </if>
-                <if test="gameName!= null" >
+            <if test="gameName!= null">
                 game_name,
             </if>
-                <if test="typeFlag!= null" >
+            <if test="typeFlag!= null">
                 type_flag,
             </if>
-                <if test="icon!= null" >
+            <if test="icon!= null">
                 icon,
             </if>
-                <if test="rank!= null" >
+            <if test="rank!= null">
                 rank,
             </if>
-                <if test="remark!= null" >
+            <if test="remark!= null">
                 remark,
             </if>
-                <if test="useFlag!= null" >
+            <if test="useFlag!= null">
                 use_flag,
             </if>
-            </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides="," >
-                    <if test="id != null" >
+            <if test="shortName!= null">
+                short_name,
+            </if>
+            <if test="profile!= null">
+                profile,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
                 #{id,jdbcType=INTEGER},
             </if>
-                    <if test="delFlag != null" >
+            <if test="delFlag != null">
                 #{delFlag,jdbcType=CHAR},
             </if>
-                    <if test="updateTime != null" >
+            <if test="updateTime != null">
                 #{updateTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="updateUser != null" >
+            <if test="updateUser != null">
                 #{updateUser,jdbcType=VARCHAR},
             </if>
-                    <if test="createTime != null" >
+            <if test="createTime != null">
                 #{createTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="createUser != null" >
+            <if test="createUser != null">
                 #{createUser,jdbcType=VARCHAR},
             </if>
-                    <if test="gameName != null" >
+            <if test="gameName != null">
                 #{gameName,jdbcType=VARCHAR},
             </if>
-                    <if test="typeFlag != null" >
+            <if test="typeFlag != null">
                 #{typeFlag,jdbcType=INTEGER},
             </if>
-                    <if test="icon != null" >
+            <if test="icon != null">
                 #{icon,jdbcType=VARCHAR},
             </if>
-                    <if test="rank != null" >
+            <if test="rank != null">
                 #{rank,jdbcType=INTEGER},
             </if>
-                    <if test="remark != null" >
+            <if test="remark != null">
                 #{remark,jdbcType=VARCHAR},
             </if>
-                    <if test="useFlag != null" >
+            <if test="useFlag != null">
                 #{useFlag,jdbcType=CHAR},
             </if>
-                </trim>
+            <if test="shortName != null">
+                #{shortName,jdbcType=VARCHAR},
+            </if>
+            <if test="profile != null">
+                #{profile,jdbcType=VARCHAR},
+            </if>
+        </trim>
     </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.GameInfo" >
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.GameInfo">
         update game_info
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
+        <set>
+            <if test="id != null">
+                id= #{id,jdbcType=INTEGER},
+            </if>
+            <if test="delFlag != null">
+                del_flag= #{delFlag,jdbcType=CHAR},
             </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
+            <if test="updateTime != null">
+                update_time= #{updateTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="updateTime != null" >
-               update_time= #{updateTime,jdbcType=TIMESTAMP},
+            <if test="updateUser != null">
+                update_user= #{updateUser,jdbcType=VARCHAR},
             </if>
-                     <if test="updateUser != null" >
-               update_user= #{updateUser,jdbcType=VARCHAR},
+            <if test="createTime != null">
+                create_time= #{createTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="createTime != null" >
-               create_time= #{createTime,jdbcType=TIMESTAMP},
+            <if test="createUser != null">
+                create_user= #{createUser,jdbcType=VARCHAR},
             </if>
-                     <if test="createUser != null" >
-               create_user= #{createUser,jdbcType=VARCHAR},
+            <if test="gameName != null">
+                game_name= #{gameName,jdbcType=VARCHAR},
             </if>
-                     <if test="gameName != null" >
-               game_name= #{gameName,jdbcType=VARCHAR},
+            <if test="typeFlag != null">
+                type_flag= #{typeFlag,jdbcType=INTEGER},
             </if>
-                     <if test="typeFlag != null" >
-               type_flag= #{typeFlag,jdbcType=INTEGER},
+            <if test="icon != null">
+                icon= #{icon,jdbcType=VARCHAR},
             </if>
-                     <if test="icon != null" >
-               icon= #{icon,jdbcType=VARCHAR},
+            <if test="rank != null">
+                rank= #{rank,jdbcType=INTEGER},
             </if>
-                     <if test="rank != null" >
-               rank= #{rank,jdbcType=INTEGER},
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
             </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
+            <if test="useFlag != null">
+                use_flag= #{useFlag,jdbcType=CHAR},
             </if>
-                     <if test="useFlag != null" >
-               use_flag= #{useFlag,jdbcType=CHAR},
+            <if test="shortName != null">
+                short_name = #{shortName,jdbcType=VARCHAR},
             </if>
-                 </set>
+            <if test="profile != null">
+                profile= #{profile,jdbcType=VARCHAR},
+            </if>
+        </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">
             id = #{id,jdbcType=INTEGER}
@@ -183,58 +206,60 @@
 
     </update>
     <select id="queryGameInfoByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.GameInfo">
-        select <include refid="Base_Column_List"/> from game_info
+        select
+        <include refid="Base_Column_List"/>
+        from game_info
         <where>
             and del_flag = 'N'
             <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
                 and id in (${record.idStr})
             </if>
-                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and  id = #{record.id}
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and id = #{record.id}
+            </if>
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and del_flag = #{record.delFlag}
             </if>
-                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and  del_flag = #{record.delFlag}
+            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                and update_time = #{record.updateTime}
             </if>
-                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
-                and  update_time = #{record.updateTime}
+            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                and update_user = #{record.updateUser}
             </if>
-                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
-                and  update_user = #{record.updateUser}
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and create_time = #{record.createTime}
             </if>
-                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
-                and  create_time = #{record.createTime}
+            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                and create_user = #{record.createUser}
             </if>
-                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
-                and  create_user = #{record.createUser}
+            <if test="record.gameName != null and !&quot;&quot;.equals(record.gameName)">
+                and game_name = #{record.gameName}
             </if>
-                     <if test="record.gameName != null and !&quot;&quot;.equals(record.gameName)">
-                and  game_name = #{record.gameName}
+            <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
+                and type_flag = #{record.typeFlag}
             </if>
-                     <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and  type_flag = #{record.typeFlag}
+            <if test="record.icon != null and !&quot;&quot;.equals(record.icon)">
+                and icon = #{record.icon}
             </if>
-                     <if test="record.icon != null and !&quot;&quot;.equals(record.icon)">
-                and  icon = #{record.icon}
+            <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
+                and rank = #{record.rank}
             </if>
-                     <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
-                and  rank = #{record.rank}
+            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and remark = #{record.remark}
             </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
+            <if test="record.useFlag != null and !&quot;&quot;.equals(record.useFlag)">
+                and use_flag = #{record.useFlag}
             </if>
-                     <if test="record.useFlag != null and !&quot;&quot;.equals(record.useFlag)">
-                and  use_flag = #{record.useFlag}
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR game_name LIKE concat('%',#{record.searchKey},'%')
+                    OR type_flag LIKE concat('%',#{record.searchKey},'%')
+                    OR icon LIKE concat('%',#{record.searchKey},'%')
+                    OR rank LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                    OR use_flag LIKE concat('%',#{record.searchKey},'%')
+                </trim>
             </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  game_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  type_flag LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  icon LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  rank LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  use_flag LIKE concat('%',#{record.searchKey},'%')
-                                                             </trim>
-         </if>
 
             <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
                 <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
@@ -289,92 +314,204 @@
         id desc
     </select>
     <select id="queryAllGameInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.GameInfo">
-        select <include refid="Base_Column_List"/> from game_info
+        select
+        <include refid="Base_Column_List"/>
+        from game_info
         <where>
             and del_flag = 'N'
             <if test="idStr != null and !&quot;&quot;.equals(idStr)">
                 and id in (${idStr})
             </if>
-                    <if test="id != null and !&quot;&quot;.equals(id)">
-                and  id = #{id}
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
             </if>
-                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and  del_flag = #{delFlag}
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
             </if>
-                    <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and  update_time = #{updateTime}
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
             </if>
-                    <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and  update_user = #{updateUser}
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
             </if>
-                    <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and  create_time = #{createTime}
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
             </if>
-                    <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and  create_user = #{createUser}
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
             </if>
-                    <if test="gameName != null and !&quot;&quot;.equals(gameName)">
-                and  game_name = #{gameName}
+            <if test="gameName != null and !&quot;&quot;.equals(gameName)">
+                and game_name = #{gameName}
             </if>
-                    <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and  type_flag = #{typeFlag}
+            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
+                and type_flag = #{typeFlag}
             </if>
-                    <if test="icon != null and !&quot;&quot;.equals(icon)">
-                and  icon = #{icon}
+            <if test="icon != null and !&quot;&quot;.equals(icon)">
+                and icon = #{icon}
             </if>
-                    <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and  rank = #{rank}
+            <if test="rank != null and !&quot;&quot;.equals(rank)">
+                and rank = #{rank}
             </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
             </if>
-                    <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
-                and  use_flag = #{useFlag}
+            <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
+                and use_flag = #{useFlag}
             </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  game_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  type_flag LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  icon LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  rank LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  use_flag LIKE concat('%',#{searchKey},'%')
-                                                                                        </trim>
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR game_name LIKE concat('%',#{searchKey},'%')
+                    OR type_flag LIKE concat('%',#{searchKey},'%')
+                    OR icon LIKE concat('%',#{searchKey},'%')
+                    OR rank LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                    OR use_flag LIKE concat('%',#{searchKey},'%')
+                </trim>
             </if>
-<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
-    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
-        <choose>
-            <when test="item.indexOf('like') != -1">
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        concat('%',#{itemDetail},'%')
-                    </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
 
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
 
                 </foreach>
-            </when>
-            <otherwise>
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        #{itemDetail}
-                    </if>
-
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
 
+
+            </if>
+        </where>
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
                 </foreach>
-            </otherwise>
-        </choose>
+            </trim>
+            ,
+        </if>
+
+        id desc
+    </select>
+    <select id="getGameInfoSeasonsList" parameterType="java.util.Map"
+            resultMap="SeasonResult">
+        select
+        <include refid="Base_Column_List"/>
+        ,
+        #{userId}  as user_id
+        from game_info
+        <where>
+            and del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                and id in (${idStr})
+            </if>
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
+            </if>
+            <if test="gameName != null and !&quot;&quot;.equals(gameName)">
+                and game_name = #{gameName}
+            </if>
+            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
+                and type_flag = #{typeFlag}
+            </if>
+            <if test="icon != null and !&quot;&quot;.equals(icon)">
+                and icon = #{icon}
+            </if>
+            <if test="rank != null and !&quot;&quot;.equals(rank)">
+                and rank = #{rank}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+            <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
+                and use_flag = #{useFlag}
+            </if>
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR game_name LIKE concat('%',#{searchKey},'%')
+                    OR type_flag LIKE concat('%',#{searchKey},'%')
+                    OR icon LIKE concat('%',#{searchKey},'%')
+                    OR rank LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                    OR use_flag LIKE concat('%',#{searchKey},'%')
+                </trim>
+            </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
 
+                            </foreach>
+                        </otherwise>
+                    </choose>
 
-    </foreach>
+
+                </foreach>
 
 
-</if>
+            </if>
         </where>
         order by
 
@@ -394,46 +531,48 @@
         id desc
     </select>
     <select id="queryGameInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.GameInfo">
-        select <include refid="Base_Column_List"/> from game_info
+        select
+        <include refid="Base_Column_List"/>
+        from game_info
         <where>
             and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
+            <if test="id != null and !&quot;&quot;.equals(id)">
                 and id = #{id}
             </if>
-                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
                 and del_flag = #{delFlag}
             </if>
-                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
                 and update_time = #{updateTime}
             </if>
-                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
                 and update_user = #{updateUser}
             </if>
-                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
                 and create_time = #{createTime}
             </if>
-                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
                 and create_user = #{createUser}
             </if>
-                     <if test="gameName != null and !&quot;&quot;.equals(gameName)">
+            <if test="gameName != null and !&quot;&quot;.equals(gameName)">
                 and game_name = #{gameName}
             </if>
-                     <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
+            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
                 and type_flag = #{typeFlag}
             </if>
-                     <if test="icon != null and !&quot;&quot;.equals(icon)">
+            <if test="icon != null and !&quot;&quot;.equals(icon)">
                 and icon = #{icon}
             </if>
-                     <if test="rank != null and !&quot;&quot;.equals(rank)">
+            <if test="rank != null and !&quot;&quot;.equals(rank)">
                 and rank = #{rank}
             </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
                 and remark = #{remark}
             </if>
-                     <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
+            <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
                 and use_flag = #{useFlag}
             </if>
-         
+
         </where>
         LIMIT 1
     </select>
@@ -449,11 +588,23 @@
         </if>
     </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.GameInfo">
-        select <include refid="Base_Column_List"/> from game_info
+        select
+        <include refid="Base_Column_List"/>
+        from game_info
         <where>
             and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+        </where>
         order by id desc
     </select>
+
+    <resultMap id="SeasonResult" type="com.izouma.awesomeadmin.model.GameInfo" extends="BaseResultMap">
+
+        <association property="competitionSeason"
+                     javaType="com.izouma.awesomeadmin.model.CompetitionSeason"
+                     select="com.izouma.awesomeadmin.dao.CompetitionSeasonMapper.queryStartCompetitionSeason"
+                     column="{ gameId = id , userId = user_id}"/>
+
+    </resultMap>
+
 </mapper>
 

src/main/java/com/izouma/awesomeadmin/dao/HouseInfoMapper.xml

@@ -489,25 +489,12 @@
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR house_name LIKE concat('%',#{record.searchKey},'%')
                     OR house_abstract LIKE concat('%',#{record.searchKey},'%')
-                    OR icon LIKE concat('%',#{record.searchKey},'%')
                     OR house_code LIKE concat('%',#{record.searchKey},'%')
                     OR user_id LIKE concat('%',#{record.searchKey},'%')
-                    OR house_type LIKE concat('%',#{record.searchKey},'%')
-                    OR house_level LIKE concat('%',#{record.searchKey},'%')
-                    OR game_id LIKE concat('%',#{record.searchKey},'%')
-                    OR status_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR recommend_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR rank LIKE concat('%',#{record.searchKey},'%')
-                    OR use_flag LIKE concat('%',#{record.searchKey},'%')
                     OR game_house_id LIKE concat('%',#{record.searchKey},'%')
                     OR game_house_password LIKE concat('%',#{record.searchKey},'%')
-                    OR begin_time LIKE concat('%',#{record.searchKey},'%')
-                    OR end_time LIKE concat('%',#{record.searchKey},'%')
                     OR match_name LIKE concat('%',#{record.searchKey},'%')
-                    OR player_number LIKE concat('%',#{record.searchKey},'%')
                     OR bonus LIKE concat('%',#{record.searchKey},'%')
-                    OR season_id LIKE concat('%',#{record.searchKey},'%')
-                    OR video LIKE concat('%',#{record.searchKey},'%')
                 </trim>
             </if>
 
@@ -661,25 +648,10 @@
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR house_name LIKE concat('%',#{searchKey},'%')
                     OR house_abstract LIKE concat('%',#{searchKey},'%')
-                    OR icon LIKE concat('%',#{searchKey},'%')
                     OR house_code LIKE concat('%',#{searchKey},'%')
                     OR user_id LIKE concat('%',#{searchKey},'%')
-                    OR house_type LIKE concat('%',#{searchKey},'%')
-                    OR house_level LIKE concat('%',#{searchKey},'%')
-                    OR game_id LIKE concat('%',#{searchKey},'%')
-                    OR status_flag LIKE concat('%',#{searchKey},'%')
-                    OR recommend_flag LIKE concat('%',#{searchKey},'%')
-                    OR rank LIKE concat('%',#{searchKey},'%')
-                    OR use_flag LIKE concat('%',#{searchKey},'%')
                     OR game_house_id LIKE concat('%',#{searchKey},'%')
-                    OR game_house_password LIKE concat('%',#{searchKey},'%')
-                    OR begin_time LIKE concat('%',#{searchKey},'%')
-                    OR end_time LIKE concat('%',#{searchKey},'%')
                     OR match_name LIKE concat('%',#{searchKey},'%')
-                    OR player_number LIKE concat('%',#{searchKey},'%')
-                    OR bonus LIKE concat('%',#{searchKey},'%')
-                    OR season_id LIKE concat('%',#{searchKey},'%')
-                    OR video LIKE concat('%',#{searchKey},'%')
                 </trim>
             </if>
             <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
@@ -853,7 +825,7 @@
             WHERE
                 player_info.del_flag = 'N'
             AND player_info.house_id = house_info.id
-            AND player_info.status_flag in (3,9)
+            AND player_info.status_flag = 3
         ) = 0
     </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.HouseInfo">
@@ -876,10 +848,10 @@
         AND use_flag = 'Y'
         AND status_flag = 0
         AND (
-            player_number = max_number
+            <![CDATA[ player_number >= max_number ]]>
             OR DATE_SUB(
                 CURRENT_TIMESTAMP(),
-                INTERVAL 10 MINUTE
+                INTERVAL 9 MINUTE
             )  <![CDATA[>=]]> create_time
         )
     </select>
@@ -893,10 +865,29 @@
         del_flag = 'N'
         AND use_flag = 'Y'
         AND status_flag = 2
-        AND DATE_SUB(
+        AND (DATE_SUB(
         CURRENT_TIMESTAMP (),
-        INTERVAL 60 MINUTE
+        INTERVAL 55 MINUTE
         ) <![CDATA[ >= ]]> begin_time
+
+        OR (
+		(
+			SELECT
+				COUNT(player_info.id)
+			FROM
+				player_info
+			WHERE
+				player_info.del_flag = 'N'
+			AND player_info.house_id = house_info.id
+			AND player_info.status_flag = 2
+		) = 0
+		AND DATE_SUB(
+			CURRENT_TIMESTAMP (),
+			INTERVAL 5 MINUTE
+		) <![CDATA[ >= ]]> begin_time
+	)
+	)
+
     </select>
 
     <resultMap id="OneHouseInfoResult" type="com.izouma.awesomeadmin.model.HouseInfo" extends="BaseResultMap">

src/main/java/com/izouma/awesomeadmin/dao/PlayerInfoMapper.java

@@ -38,6 +38,8 @@ public interface PlayerInfoMapper {
 
     int userRank(PlayerInfo record);
 
+    int endNum(PlayerInfo record);
+
     PlayerInfo seasonUserRank(PlayerInfo record);
 
     List<PlayerInfo> queryNoStartPlayer(HouseInfo record);

src/main/java/com/izouma/awesomeadmin/dao/PlayerInfoMapper.xml

@@ -1232,6 +1232,95 @@
 
         </where>
     </select>
+    <select id="endNum" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(player_info.id)
+        FROM
+        player_info
+        <where>
+            and del_flag = 'N'
+            <![CDATA[  and status_flag  >= 3 ]]>
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
+            </if>
+            <if test="gameId != null and !&quot;&quot;.equals(gameId)">
+                and game_id = #{gameId}
+            </if>
+            <if test="houseId != null and !&quot;&quot;.equals(houseId)">
+                and house_id = #{houseId}
+            </if>
+            <if test="joinTime != null and !&quot;&quot;.equals(joinTime)">
+                and join_time = #{joinTime}
+            </if>
+            <if test="principal != null and !&quot;&quot;.equals(principal)">
+                and principal = #{principal}
+            </if>
+            <if test="bonus != null and !&quot;&quot;.equals(bonus)">
+                and bonus = #{bonus}
+            </if>
+            <if test="userId != null and !&quot;&quot;.equals(userId)">
+                and user_id = #{userId}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+            <if test="image != null and !&quot;&quot;.equals(image)">
+                and image = #{image}
+            </if>
+            <if test="killNumber != null and !&quot;&quot;.equals(killNumber)">
+                and kill_number = #{killNumber}
+            </if>
+            <if test="ranking != null and !&quot;&quot;.equals(ranking)">
+                and ranking = #{ranking}
+            </if>
+            <if test="beginTime != null and !&quot;&quot;.equals(beginTime)">
+                and begin_time = #{beginTime}
+            </if>
+            <if test="endTime != null and !&quot;&quot;.equals(endTime)">
+                and end_time = #{endTime}
+            </if>
+            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
+                and status_flag = #{statusFlag}
+            </if>
+            <if test="examineUser != null and !&quot;&quot;.equals(examineUser)">
+                and examine_user = #{examineUser}
+            </if>
+            <if test="examineTime != null and !&quot;&quot;.equals(examineTime)">
+                and examine_time = #{examineTime}
+            </if>
+            <if test="examineType != null and !&quot;&quot;.equals(examineType)">
+                and examine_type = #{examineType}
+            </if>
+            <if test="video != null and !&quot;&quot;.equals(video)">
+                and video = #{video}
+            </if>
+            <if test="liveTime != null and !&quot;&quot;.equals(liveTime)">
+                and live_time = #{liveTime}
+            </if>
+            <if test="gameType != null and !&quot;&quot;.equals(gameType)">
+                and game_type = #{gameType}
+            </if>
+            <if test="seasonId != null and !&quot;&quot;.equals(seasonId)">
+                and season_id = #{seasonId}
+            </if>
+
+        </where>
+    </select>
 
 
     <select id="queryNoStartPlayer" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.PlayerInfo">
@@ -1268,7 +1357,7 @@
             player_info
         WHERE
             del_flag = 'N'
-        AND status_flag IN (3, 7 , 8)
+        AND status_flag IN (3, 7 , 8, 9)
         AND house_id = #{houseId}
 
         order by

src/main/java/com/izouma/awesomeadmin/dao/ProductInfoMapper.java

@@ -0,0 +1,33 @@
+package com.izouma.awesomeadmin.dao;
+
+import java.util.*;
+import com.izouma.awesomeadmin.datasource.DataSource;
+import org.springframework.stereotype.Repository;
+import com.izouma.awesomeadmin.model.ProductInfo;
+
+
+/**
+*  Dao接口
+*/
+@Repository("com.zoumaframe.dao.ProductInfoMapper")
+public interface ProductInfoMapper{
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insertSelective(ProductInfo record);
+
+    ProductInfo selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(ProductInfo record);
+
+    List<ProductInfo> queryAllProductInfo(ProductInfo record);
+
+    List<ProductInfo> queryProductInfoByPage(Map<String, Object> parameter);
+
+    int delete(ProductInfo record);
+
+    ProductInfo queryProductInfo(ProductInfo record);
+
+    List<ProductInfo> query(ProductInfo record);
+}
+

src/main/java/com/izouma/awesomeadmin/dao/ProductInfoMapper.xml

@@ -0,0 +1,470 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.izouma.awesomeadmin.dao.ProductInfoMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ProductInfo">
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
+        <result column="product_name" property="productName" jdbcType="VARCHAR"/>
+        <result column="money" property="money" jdbcType="DECIMAL"/>
+        <result column="coin" property="coin" jdbcType="DECIMAL"/>
+        <result column="type_flag" property="typeFlag" jdbcType="INTEGER"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+        <result column="rank" property="rank" jdbcType="INTEGER"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <trim suffixOverrides=",">
+            id,
+
+            del_flag,
+
+            update_time,
+
+            update_user,
+
+            create_time,
+
+            create_user,
+
+            product_name,
+
+            money,
+
+            coin,
+
+            type_flag,
+
+            remark,
+
+            rank,
+
+        </trim>
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+        select
+        <include refid="Base_Column_List"/>
+        from product_info
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete from product_info
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ProductInfo" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into product_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id!= null">
+                id,
+            </if>
+            <if test="delFlag!= null">
+                del_flag,
+            </if>
+            <if test="updateTime!= null">
+                update_time,
+            </if>
+            <if test="updateUser!= null">
+                update_user,
+            </if>
+            <if test="createTime!= null">
+                create_time,
+            </if>
+            <if test="createUser!= null">
+                create_user,
+            </if>
+            <if test="productName!= null">
+                product_name,
+            </if>
+            <if test="money!= null">
+                money,
+            </if>
+            <if test="coin!= null">
+                coin,
+            </if>
+            <if test="typeFlag!= null">
+                type_flag,
+            </if>
+            <if test="remark!= null">
+                remark,
+            </if>
+            <if test="rank!= null">
+                rank,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="delFlag != null">
+                #{delFlag,jdbcType=CHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null">
+                #{updateUser,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="createUser != null">
+                #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="productName != null">
+                #{productName,jdbcType=VARCHAR},
+            </if>
+            <if test="money != null">
+                #{money,jdbcType=DECIMAL},
+            </if>
+            <if test="coin != null">
+                #{coin,jdbcType=DECIMAL},
+            </if>
+            <if test="typeFlag != null">
+                #{typeFlag,jdbcType=INTEGER},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="rank != null">
+                #{rank,jdbcType=INTEGER},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ProductInfo">
+        update product_info
+        <set>
+            <if test="id != null">
+                id= #{id,jdbcType=INTEGER},
+            </if>
+            <if test="delFlag != null">
+                del_flag= #{delFlag,jdbcType=CHAR},
+            </if>
+            <if test="updateTime != null">
+                update_time= #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null">
+                update_user= #{updateUser,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time= #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="createUser != null">
+                create_user= #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="productName != null">
+                product_name= #{productName,jdbcType=VARCHAR},
+            </if>
+            <if test="money != null">
+                money= #{money,jdbcType=DECIMAL},
+            </if>
+            <if test="coin != null">
+                coin= #{coin,jdbcType=DECIMAL},
+            </if>
+            <if test="typeFlag != null">
+                type_flag= #{typeFlag,jdbcType=INTEGER},
+            </if>
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="rank != null">
+                rank= #{rank,jdbcType=INTEGER},
+            </if>
+        </set>
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+
+    </update>
+    <select id="queryProductInfoByPage" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.ProductInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from product_info
+        <where>
+            and del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                and id in (${record.idStr})
+            </if>
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and id = #{record.id}
+            </if>
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and del_flag = #{record.delFlag}
+            </if>
+            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                and update_time = #{record.updateTime}
+            </if>
+            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                and update_user = #{record.updateUser}
+            </if>
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and create_time = #{record.createTime}
+            </if>
+            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                and create_user = #{record.createUser}
+            </if>
+            <if test="record.productName != null and !&quot;&quot;.equals(record.productName)">
+                and product_name = #{record.productName}
+            </if>
+            <if test="record.money != null and !&quot;&quot;.equals(record.money)">
+                and money = #{record.money}
+            </if>
+            <if test="record.coin != null and !&quot;&quot;.equals(record.coin)">
+                and coin = #{record.coin}
+            </if>
+            <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
+                and type_flag = #{record.typeFlag}
+            </if>
+            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and remark = #{record.remark}
+            </if>
+            <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
+                and rank = #{record.rank}
+            </if>
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR product_name LIKE concat('%',#{record.searchKey},'%')
+                    OR money LIKE concat('%',#{record.searchKey},'%')
+                    OR coin LIKE concat('%',#{record.searchKey},'%')
+                    OR type_flag LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                    OR rank LIKE concat('%',#{record.searchKey},'%')
+                </trim>
+            </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+        order by
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        rank desc , id desc
+    </select>
+    <select id="queryAllProductInfo" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.ProductInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from product_info
+        <where>
+            and del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                and id in (${idStr})
+            </if>
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
+            </if>
+            <if test="productName != null and !&quot;&quot;.equals(productName)">
+                and product_name = #{productName}
+            </if>
+            <if test="money != null and !&quot;&quot;.equals(money)">
+                and money = #{money}
+            </if>
+            <if test="coin != null and !&quot;&quot;.equals(coin)">
+                and coin = #{coin}
+            </if>
+            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
+                and type_flag = #{typeFlag}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+            <if test="rank != null and !&quot;&quot;.equals(rank)">
+                and rank = #{rank}
+            </if>
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR product_name LIKE concat('%',#{searchKey},'%')
+                    OR money LIKE concat('%',#{searchKey},'%')
+                    OR coin LIKE concat('%',#{searchKey},'%')
+                    OR type_flag LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                    OR rank LIKE concat('%',#{searchKey},'%')
+                </trim>
+            </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+        </where>
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+
+        rank desc , id desc
+    </select>
+    <select id="queryProductInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from product_info
+        <where>
+            and del_flag = 'N'
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
+            </if>
+            <if test="productName != null and !&quot;&quot;.equals(productName)">
+                and product_name = #{productName}
+            </if>
+            <if test="money != null and !&quot;&quot;.equals(money)">
+                and money = #{money}
+            </if>
+            <if test="coin != null and !&quot;&quot;.equals(coin)">
+                and coin = #{coin}
+            </if>
+            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
+                and type_flag = #{typeFlag}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+            <if test="rank != null and !&quot;&quot;.equals(rank)">
+                and rank = #{rank}
+            </if>
+
+        </where>
+        LIMIT 1
+    </select>
+    <update id="delete">
+        UPDATE product_info SET del_flag = 'Y'
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+    </update>
+    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from product_info
+        <where>
+            and del_flag = 'N'
+        </where>
+        order by id desc
+    </select>
+</mapper>
+

src/main/java/com/izouma/awesomeadmin/dao/SystemNoticeMapper.xml

@@ -17,6 +17,8 @@
         <result column="content" property="content" jdbcType="VARCHAR"/>
         <result column="season_id" property="seasonId" jdbcType="INTEGER"/>
         <result column="player_id" property="playerId" jdbcType="INTEGER"/>
+        <result column="bonus" property="bonus" jdbcType="DECIMAL"/>
+
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -50,6 +52,8 @@
 
             player_id,
 
+            bonus,
+
         </trim>
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -111,6 +115,9 @@
             <if test="playerId!= null">
                 player_id,
             </if>
+            <if test="bonus!= null">
+                bonus,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -158,6 +165,9 @@
             <if test="playerId != null">
                 #{playerId,jdbcType=INTEGER},
             </if>
+            <if test="bonus != null">
+                #{bonus},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.SystemNotice">
@@ -208,6 +218,9 @@
             <if test="playerId != null">
                 player_id= #{playerId,jdbcType=INTEGER},
             </if>
+            <if test="bonus != null">
+                bonus= #{bonus},
+            </if>
         </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">

src/main/java/com/izouma/awesomeadmin/dao/UserInfoMapper.xml

@@ -32,6 +32,7 @@
         <result column="company_flag" property="companyFlag" jdbcType="CHAR"/>
         <result column="approve_step" property="approveStep" jdbcType="INTEGER"/>
         <result column="notice_flag" property="noticeFlag" jdbcType="CHAR"/>
+        <result column="remind_flag" property="remindFlag" jdbcType="CHAR"/>
         <association property="departId" javaType="string" column="id"
                      select="com.izouma.awesomeadmin.dao.DepartInfoMapper.getUserDepartId"/>
         <association property="roleId" javaType="string" column="id"
@@ -41,7 +42,7 @@
         id, username, nickname, icon, birthday, sex, open_id, union_id, phone, mail,
         country, province, city, district, create_time, del_flag, money_coin, money_point,
         contacter, contact_phone, company_name, company_type, admin_flag, cash_pledge,
-        approve_flag, store_flag, company_flag, approve_step, notice_flag
+        approve_flag, store_flag, company_flag, approve_step, notice_flag, remind_flag
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
@@ -151,6 +152,9 @@
             <if test="noticeFlag != null">
                 notice_flag,
             </if>
+            <if test="remindFlag != null">
+                remind_flag,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -246,6 +250,9 @@
             <if test="noticeFlag != null">
                 #{noticeFlag},
             </if>
+            <if test="remindFlag != null">
+                #{remindFlag},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.UserInfo">
@@ -341,6 +348,9 @@
             <if test="noticeFlag != null">
                 notice_flag = #{noticeFlag},
             </if>
+            <if test="remindFlag != null">
+                remind_flag = #{remindFlag},
+            </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
@@ -436,6 +446,15 @@
                 and approve_step = #{record.approveStep}
             </if>
 
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR nickname LIKE concat('%',#{record.searchKey},'%')
+                    OR phone LIKE concat('%',#{record.searchKey},'%')
+                    OR username LIKE concat('%',#{record.searchKey},'%')
+                </trim>
+            </if>
+
+
         </where>
         order by id desc
     </select>
@@ -531,6 +550,15 @@
                 and approve_step = #{approveStep}
             </if>
 
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR nickname LIKE concat('%',#{searchKey},'%')
+                    OR phone LIKE concat('%',#{searchKey},'%')
+                    OR username LIKE concat('%',#{searchKey},'%')
+                </trim>
+            </if>
+
+
         </where>
         order by id desc
     </select>
@@ -664,7 +692,8 @@
         SELECT
         <include refid="Base_Column_List"/>
         from sys_user
-        WHERE (username = #{username} or phone = #{username} or mail = #{username}) AND password = #{password} AND del_flag = 'N'
+        WHERE (username = #{username} or phone = #{username} or mail = #{username}) AND password = #{password} AND
+        del_flag = 'N'
     </select>
     <select id="findDepartLeader" resultType="java.lang.String">
         SELECT *

src/main/java/com/izouma/awesomeadmin/model/CompetitionSeason.java

@@ -33,6 +33,15 @@ public class CompetitionSeason {
 
     private GameInfo gameInfo;
 
+
+    private BigDecimal firstRatio;
+    private BigDecimal secondRatio;
+    private BigDecimal thirdRatio;
+    /**
+     * 已发放奖金
+     */
+    private BigDecimal bonusPaid;
+
     /**
      * and,test_name,like,value;or,remark,=,123
      */
@@ -43,6 +52,10 @@ public class CompetitionSeason {
      */
     private String orderByStr;
 
+    private int userId;
+
+    private PlayerInfo playerInfo;
+
     public Integer getId() {
         return this.id;
     }
@@ -202,5 +215,53 @@ public class CompetitionSeason {
     public void setGameInfo(GameInfo gameInfo) {
         this.gameInfo = gameInfo;
     }
+
+    public BigDecimal getFirstRatio() {
+        return firstRatio;
+    }
+
+    public void setFirstRatio(BigDecimal firstRatio) {
+        this.firstRatio = firstRatio;
+    }
+
+    public BigDecimal getSecondRatio() {
+        return secondRatio;
+    }
+
+    public void setSecondRatio(BigDecimal secondRatio) {
+        this.secondRatio = secondRatio;
+    }
+
+    public BigDecimal getThirdRatio() {
+        return thirdRatio;
+    }
+
+    public void setThirdRatio(BigDecimal thirdRatio) {
+        this.thirdRatio = thirdRatio;
+    }
+
+    public BigDecimal getBonusPaid() {
+        return bonusPaid;
+    }
+
+    public void setBonusPaid(BigDecimal bonusPaid) {
+        this.bonusPaid = bonusPaid;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    public PlayerInfo getPlayerInfo() {
+        return playerInfo;
+    }
+
+    public void setPlayerInfo(PlayerInfo playerInfo) {
+        this.playerInfo = playerInfo;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/model/GameInfo.java

@@ -1,13 +1,14 @@
 package com.izouma.awesomeadmin.model;
 
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class GameInfo{
+public class GameInfo {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -20,137 +21,186 @@ public class GameInfo{
     private Integer rank;
     private String remark;
     private String useFlag;
+    private String shortName;
+
+    private String profile;
+
+    private String idStr;
 
-private String idStr;
+    private String searchKey;
 
-private String searchKey;
+    private int userId;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    private CompetitionSeason competitionSeason;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
 
-    public Integer getId(){
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
+
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
+
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public String getGameName(){
+
+    public String getGameName() {
         return this.gameName;
     }
 
-    public void setGameName(String gameName){
+    public void setGameName(String gameName) {
         this.gameName = gameName;
     }
-    public Integer getTypeFlag(){
+
+    public Integer getTypeFlag() {
         return this.typeFlag;
     }
 
-    public void setTypeFlag(Integer typeFlag){
+    public void setTypeFlag(Integer typeFlag) {
         this.typeFlag = typeFlag;
     }
-    public String getIcon(){
+
+    public String getIcon() {
         return this.icon;
     }
 
-    public void setIcon(String icon){
+    public void setIcon(String icon) {
         this.icon = icon;
     }
-    public Integer getRank(){
+
+    public Integer getRank() {
         return this.rank;
     }
 
-    public void setRank(Integer rank){
+    public void setRank(Integer rank) {
         this.rank = rank;
     }
-    public String getRemark(){
+
+    public String getRemark() {
         return this.remark;
     }
 
-    public void setRemark(String remark){
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-    public String getUseFlag(){
+
+    public String getUseFlag() {
         return this.useFlag;
     }
 
-    public void setUseFlag(String useFlag){
+    public void setUseFlag(String useFlag) {
         this.useFlag = useFlag;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
-public String getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
 
-}
+    public String getShortName() {
+        return shortName;
+    }
+
+    public void setShortName(String shortName) {
+        this.shortName = shortName;
+    }
 
+    public String getProfile() {
+        return profile;
+    }
+
+    public void setProfile(String profile) {
+        this.profile = profile;
+    }
+
+    public CompetitionSeason getCompetitionSeason() {
+        return competitionSeason;
+    }
+
+    public void setCompetitionSeason(CompetitionSeason competitionSeason) {
+        this.competitionSeason = competitionSeason;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+}

src/main/java/com/izouma/awesomeadmin/model/MemberCoin.java

@@ -2,13 +2,14 @@ package com.izouma.awesomeadmin.model;
 
 import java.math.BigDecimal;
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class MemberCoin{
+public class MemberCoin {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -25,157 +26,183 @@ public class MemberCoin{
     private Integer seasonId;
     private Integer playerId;
 
-private String idStr;
+    /**
+     * 充值类型
+     */
+    private Integer rechargeType;
+
+    private String idStr;
 
-private String searchKey;
+    private String searchKey;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
 
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public Integer getGameId(){
+
+    public Integer getGameId() {
         return this.gameId;
     }
 
-    public void setGameId(Integer gameId){
+    public void setGameId(Integer gameId) {
         this.gameId = gameId;
     }
-    public Integer getHouseId(){
+
+    public Integer getHouseId() {
         return this.houseId;
     }
 
-    public void setHouseId(Integer houseId){
+    public void setHouseId(Integer houseId) {
         this.houseId = houseId;
     }
-    public Integer getUserId(){
+
+    public Integer getUserId() {
         return this.userId;
     }
 
-    public void setUserId(Integer userId){
+    public void setUserId(Integer userId) {
         this.userId = userId;
     }
-    public String getRemark(){
+
+    public String getRemark() {
         return this.remark;
     }
 
-    public void setRemark(String remark){
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-    public Integer getTypeFlag(){
+
+    public Integer getTypeFlag() {
         return this.typeFlag;
     }
 
-    public void setTypeFlag(Integer typeFlag){
+    public void setTypeFlag(Integer typeFlag) {
         this.typeFlag = typeFlag;
     }
-    public BigDecimal getMoney(){
+
+    public BigDecimal getMoney() {
         return this.money;
     }
 
-    public void setMoney(BigDecimal money){
+    public void setMoney(BigDecimal money) {
         this.money = money;
     }
-    public BigDecimal getBalance(){
+
+    public BigDecimal getBalance() {
         return this.balance;
     }
 
-    public void setBalance(BigDecimal balance){
+    public void setBalance(BigDecimal balance) {
         this.balance = balance;
     }
-    public Integer getSeasonId(){
+
+    public Integer getSeasonId() {
         return this.seasonId;
     }
 
-    public void setSeasonId(Integer seasonId){
+    public void setSeasonId(Integer seasonId) {
         this.seasonId = seasonId;
     }
-    public Integer getPlayerId(){
+
+    public Integer getPlayerId() {
         return this.playerId;
     }
 
-    public void setPlayerId(Integer playerId){
+    public void setPlayerId(Integer playerId) {
         this.playerId = playerId;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
-public String getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
+
+    public Integer getRechargeType() {
+        return rechargeType;
+    }
 
+    public void setRechargeType(Integer rechargeType) {
+        this.rechargeType = rechargeType;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/model/ProductInfo.java

@@ -0,0 +1,178 @@
+package com.izouma.awesomeadmin.model;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ProductInfo {
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String productName;
+    private BigDecimal money;
+    private BigDecimal coin;
+    private Integer typeFlag;
+    private String remark;
+    private Integer rank;
+
+    private Integer userId;
+
+    private String idStr;
+
+    private String searchKey;
+
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
+
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
+
+    public Integer getId() {
+        return this.id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getDelFlag() {
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUser() {
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getCreateTime() {
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateUser() {
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public String getProductName() {
+        return this.productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public BigDecimal getMoney() {
+        return this.money;
+    }
+
+    public void setMoney(BigDecimal money) {
+        this.money = money;
+    }
+
+    public BigDecimal getCoin() {
+        return this.coin;
+    }
+
+    public void setCoin(BigDecimal coin) {
+        this.coin = coin;
+    }
+
+    public Integer getTypeFlag() {
+        return this.typeFlag;
+    }
+
+    public void setTypeFlag(Integer typeFlag) {
+        this.typeFlag = typeFlag;
+    }
+
+    public String getRemark() {
+        return this.remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getRank() {
+        return this.rank;
+    }
+
+    public void setRank(Integer rank) {
+        this.rank = rank;
+    }
+
+    public String getSearchKey() {
+        return searchKey;
+    }
+
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
+
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
+
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
+
+    public String getOrderByStr() {
+        return orderByStr;
+    }
+
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
+
+    public String getIdStr() {
+        return idStr;
+    }
+
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/model/SystemNotice.java

@@ -1,5 +1,6 @@
 package com.izouma.awesomeadmin.model;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
@@ -48,6 +49,8 @@ public class SystemNotice {
      */
     private String orderByStr;
 
+    private BigDecimal bonus;
+
     public Integer getId() {
         return this.id;
     }
@@ -231,5 +234,13 @@ public class SystemNotice {
     public void setPlayerInfo(PlayerInfo playerInfo) {
         this.playerInfo = playerInfo;
     }
+
+    public BigDecimal getBonus() {
+        return bonus;
+    }
+
+    public void setBonus(BigDecimal bonus) {
+        this.bonus = bonus;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/model/UserInfo.java

@@ -77,6 +77,10 @@ public class UserInfo {
 
     private String noticeFlag;
 
+    private String remindFlag;
+
+    private String searchKey;
+
 
     public String getDepartId() {
         return departId;
@@ -333,5 +337,21 @@ public class UserInfo {
     public void setNoticeFlag(String noticeFlag) {
         this.noticeFlag = noticeFlag;
     }
+
+    public String getRemindFlag() {
+        return remindFlag;
+    }
+
+    public void setRemindFlag(String remindFlag) {
+        this.remindFlag = remindFlag;
+    }
+
+    public String getSearchKey() {
+        return searchKey;
+    }
+
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/CompetitionSeasonService.java

@@ -2,6 +2,7 @@ package com.izouma.awesomeadmin.service;
 
 import java.util.*;
 import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
 import com.izouma.awesomeadmin.model.CompetitionSeason;
 
 
@@ -23,5 +24,7 @@ public interface CompetitionSeasonService{
     boolean deleteCompetitionSeason(CompetitionSeason record);
 
     boolean updateCompetitionSeason(CompetitionSeason record);
+
+    Result bonusPayment(CompetitionSeason record);
 }
 

src/main/java/com/izouma/awesomeadmin/service/GameInfoService.java

@@ -23,5 +23,7 @@ public interface GameInfoService{
     boolean deleteGameInfo(GameInfo record);
 
     boolean updateGameInfo(GameInfo record);
+
+    List<GameInfo> getGameInfoSeasonsList(GameInfo record);
 }
 

src/main/java/com/izouma/awesomeadmin/service/MemberCoinService.java

@@ -25,5 +25,9 @@ public interface MemberCoinService{
     boolean updateMemberCoin(MemberCoin record);
 
     int song(MemberCoin memberCoin);
+
+    int recharge(MemberCoin memberCoin);
+
+    int consumption(MemberCoin memberCoin);
 }
 

src/main/java/com/izouma/awesomeadmin/service/PlayerInfoService.java

@@ -42,5 +42,7 @@ public interface PlayerInfoService {
     List<PlayerInfo> getSettlementPlayer(PlayerInfo record);
 
     Result receiveBonus(PlayerInfo record);
+
+    int endNum(PlayerInfo record);
 }
 

src/main/java/com/izouma/awesomeadmin/service/ProductInfoService.java

@@ -0,0 +1,29 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.ProductInfo;
+
+
+/**
+*  service接口类
+*/
+public interface ProductInfoService{
+
+    List<ProductInfo> getProductInfoList(ProductInfo record);
+
+    List<ProductInfo> getProductInfoByPage(Page page, ProductInfo record);
+
+    ProductInfo getProductInfoById(String id);
+
+    ProductInfo getProductInfo(ProductInfo record);
+
+    boolean createProductInfo(ProductInfo record);
+
+    boolean deleteProductInfo(ProductInfo record);
+
+    boolean updateProductInfo(ProductInfo record);
+
+    boolean buyProductInfo(ProductInfo record);
+}
+

src/main/java/com/izouma/awesomeadmin/service/SystemNoticeService.java

@@ -2,6 +2,7 @@ package com.izouma.awesomeadmin.service;
 
 import java.util.*;
 import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
 import com.izouma.awesomeadmin.model.SystemNotice;
 
 
@@ -25,5 +26,7 @@ public interface SystemNoticeService{
     boolean updateSystemNotice(SystemNotice record);
 
     int getUnreadSystemNotice(SystemNotice record);
+
+    Result receiveBonus(SystemNotice record);
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/CompetitionSeasonServiceImpl.java

@@ -1,52 +1,70 @@
 package com.izouma.awesomeadmin.service.impl;
 
+import java.math.BigDecimal;
 import java.util.*;
+
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.*;
+import com.izouma.awesomeadmin.service.BonusRecordService;
+import com.izouma.awesomeadmin.service.PlayerInfoService;
+import com.izouma.awesomeadmin.service.SystemNoticeService;
+import com.izouma.awesomeadmin.util.DateTimeTool;
+import com.izouma.awesomeadmin.util.PushUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.izouma.awesomeadmin.constant.AppConstant;
 import com.izouma.awesomeadmin.dto.Page;
-import com.izouma.awesomeadmin.model.CompetitionSeason;
 import com.izouma.awesomeadmin.service.CompetitionSeasonService;
 import com.izouma.awesomeadmin.dao.CompetitionSeasonMapper;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class CompetitionSeasonServiceImpl implements CompetitionSeasonService{
+public class CompetitionSeasonServiceImpl implements CompetitionSeasonService {
 
     private static Logger logger = Logger.getLogger(CompetitionSeasonServiceImpl.class);
 
     @Autowired
     private CompetitionSeasonMapper competitionSeasonMapper;
 
+    @Autowired
+    private PlayerInfoService playerInfoService;
+
+    @Autowired
+    private SystemNoticeService systemNoticeService;
+    @Autowired
+    private BonusRecordService bonusRecordService;
+
     @Override
     public List<CompetitionSeason> getCompetitionSeasonList(CompetitionSeason record) {
 
         logger.info("getCompetitionSeasonList");
         try {
 
-        return competitionSeasonMapper.queryAllCompetitionSeason(record);
+            return competitionSeasonMapper.queryAllCompetitionSeason(record);
         } catch (Exception e) {
-        logger.error("getCompetitionSeasonList", e);
+            logger.error("getCompetitionSeasonList", e);
         }
 
         return null;
     }
+
     @Override
     public List<CompetitionSeason> getCompetitionSeasonByPage(Page page, CompetitionSeason record) {
 
         logger.info("getCompetitionSeasonByPage");
         try {
 
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
 
-        return competitionSeasonMapper.queryCompetitionSeasonByPage(parameter);
+            return competitionSeasonMapper.queryCompetitionSeasonByPage(parameter);
         } catch (Exception e) {
-        logger.error("getCompetitionSeasonByPage", e);
+            logger.error("getCompetitionSeasonByPage", e);
         }
 
         return null;
@@ -60,7 +78,7 @@ public class CompetitionSeasonServiceImpl implements CompetitionSeasonService{
 
             return competitionSeasonMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getCompetitionSeasonById", e);
+            logger.error("getCompetitionSeasonById", e);
         }
 
         return null;
@@ -74,7 +92,7 @@ public class CompetitionSeasonServiceImpl implements CompetitionSeasonService{
 
             return competitionSeasonMapper.queryCompetitionSeason(record);
         } catch (Exception e) {
-        logger.error("getCompetitionSeason", e);
+            logger.error("getCompetitionSeason", e);
         }
 
         return null;
@@ -89,7 +107,7 @@ public class CompetitionSeasonServiceImpl implements CompetitionSeasonService{
             int updates = competitionSeasonMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createCompetitionSeason", e);
@@ -104,13 +122,13 @@ public class CompetitionSeasonServiceImpl implements CompetitionSeasonService{
         logger.info("deleteCompetitionSeason");
         try {
 
-             int updates = competitionSeasonMapper.delete(record);
+            int updates = competitionSeasonMapper.delete(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteCompetitionSeason", e);
+            logger.error("deleteCompetitionSeason", e);
         }
 
         return false;
@@ -125,13 +143,130 @@ public class CompetitionSeasonServiceImpl implements CompetitionSeasonService{
             int updates = competitionSeasonMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateCompetitionSeason", e);
+            logger.error("updateCompetitionSeason", e);
         }
 
         return false;
     }
+
+
+    @Override
+    public Result bonusPayment(CompetitionSeason record) {
+
+        logger.info("bonusPayment");
+        try {
+
+            CompetitionSeason competitionSeason = competitionSeasonMapper.queryCompetitionSeason(record);
+
+            if (competitionSeason != null) {
+
+                BigDecimal firstRatio = competitionSeason.getFirstRatio();
+                BigDecimal secondRatio = competitionSeason.getSecondRatio();
+                BigDecimal thirdRatio = competitionSeason.getThirdRatio();
+
+                BigDecimal canUseBonus = competitionSeason.getBonus().subtract(competitionSeason.getBonusPaid());
+
+                Page page = new Page();
+                page.setPageNumber(3);
+                page.setCurrentPage(1);
+
+                PlayerInfo param = new PlayerInfo();
+                param.setSeasonId(competitionSeason.getId());
+
+                List<PlayerInfo> pp = playerInfoService.getPlayerInfoSeasonRankPageByPage(page, param);
+
+                if (CollectionUtils.isNotEmpty(pp) && canUseBonus.doubleValue() > 0) {
+
+                    String remark = competitionSeason.getSeason() + "赛季奖金发放，";
+
+                    for (int i = 0; i < pp.size(); i++) {
+
+                        String content = "";
+                        PlayerInfo playerInfo = pp.get(i);
+                        UserInfo userInfo = playerInfo.getUserInfo();
+                        BigDecimal bonus = BigDecimal.ZERO;
+                        if (playerInfo.getRank() == 1) {//第一名
+                            bonus = BigDecimal.valueOf((firstRatio.doubleValue() / 100) * canUseBonus.doubleValue());
+
+
+                        }
+                        if (playerInfo.getRank() == 2) {//第二名
+                            bonus = BigDecimal.valueOf((secondRatio.doubleValue() / 100) * canUseBonus.doubleValue());
+                        }
+                        if (playerInfo.getRank() == 3) {//第三名
+                            bonus = BigDecimal.valueOf((thirdRatio.doubleValue() / 100) * canUseBonus.doubleValue());
+                        }
+
+                        if (bonus.doubleValue() > 0) {
+
+
+                            remark += userInfo.getNickname() + "获得第" + playerInfo.getRank() + ",获得" + bonus + "积分；";
+                            content = "恭喜你，在" + competitionSeason.getSeason()
+                                    + " 取得第" + playerInfo.getRank()
+                                    + "名，获得" + bonus + "积分，赶快领取你的奖励吧。";
+                            SystemNotice systemNotice = new SystemNotice();
+                            systemNotice.setGameId(playerInfo.getGameId());
+                            systemNotice.setUserId(playerInfo.getUserId());
+                            systemNotice.setSeasonId(playerInfo.getSeasonId());
+                            systemNotice.setRemark("赛季奖金发放");
+                            systemNotice.setBonus(bonus);
+
+                            systemNotice.setContent(content);
+                            systemNotice.setTypeFlag(AppConstant.NoticeType.SEASON_BONUS);
+
+                            systemNoticeService.createSystemNotice(systemNotice);
+
+                            //推送
+                            try {
+                                if (userInfo != null) {
+                                    if ("Y".equals(userInfo.getNoticeFlag())) {
+                                        String[] ids = new String[]{userInfo.getId().toString()};
+
+                                        PushUtil.pushMsg(ids, content);
+                                    }
+
+                                }
+
+
+                            } catch (Exception e) {
+                                logger.error("发放赛季奖金推送消息异常。", e);
+                            }
+
+
+                        }
+
+
+                    }
+
+                    BonusRecord bonusRecord = new BonusRecord();
+
+                    bonusRecord.setRemark(remark);
+                    bonusRecord.setSeasonId(competitionSeason.getId());
+                    bonusRecord.setGameId(competitionSeason.getGameId());
+                    bonusRecord.setMoney(canUseBonus.multiply(new BigDecimal(-1)));
+                    bonusRecord.setBonus(BigDecimal.ZERO);
+                    bonusRecord.setTypeFlag(1);
+
+                    bonusRecordService.createBonusRecord(bonusRecord);
+
+                    competitionSeason.setBonusPaid(competitionSeason.getBonus());
+                    competitionSeasonMapper.updateByPrimaryKeySelective(competitionSeason);
+
+
+                }
+
+
+            }
+
+
+        } catch (Exception e) {
+            logger.error("bonusPayment", e);
+        }
+
+        return new Result(false, "发放失败");
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/GameInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.izouma.awesomeadmin.service.impl;
 
 import java.util.*;
+
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,10 +12,10 @@ import com.izouma.awesomeadmin.service.GameInfoService;
 import com.izouma.awesomeadmin.dao.GameInfoMapper;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class GameInfoServiceImpl implements GameInfoService{
+public class GameInfoServiceImpl implements GameInfoService {
 
     private static Logger logger = Logger.getLogger(GameInfoServiceImpl.class);
 
@@ -27,26 +28,41 @@ public class GameInfoServiceImpl implements GameInfoService{
         logger.info("getGameInfoList");
         try {
 
-        return gameInfoMapper.queryAllGameInfo(record);
+            return gameInfoMapper.queryAllGameInfo(record);
+        } catch (Exception e) {
+            logger.error("getGameInfoList", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<GameInfo> getGameInfoSeasonsList(GameInfo record) {
+
+        logger.info("getGameInfoSeasonsList");
+        try {
+
+            return gameInfoMapper.getGameInfoSeasonsList(record);
         } catch (Exception e) {
-        logger.error("getGameInfoList", e);
+            logger.error("getGameInfoSeasonsList", e);
         }
 
         return null;
     }
+
     @Override
     public List<GameInfo> getGameInfoByPage(Page page, GameInfo record) {
 
         logger.info("getGameInfoByPage");
         try {
 
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
 
-        return gameInfoMapper.queryGameInfoByPage(parameter);
+            return gameInfoMapper.queryGameInfoByPage(parameter);
         } catch (Exception e) {
-        logger.error("getGameInfoByPage", e);
+            logger.error("getGameInfoByPage", e);
         }
 
         return null;
@@ -60,7 +76,7 @@ public class GameInfoServiceImpl implements GameInfoService{
 
             return gameInfoMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getGameInfoById", e);
+            logger.error("getGameInfoById", e);
         }
 
         return null;
@@ -74,7 +90,7 @@ public class GameInfoServiceImpl implements GameInfoService{
 
             return gameInfoMapper.queryGameInfo(record);
         } catch (Exception e) {
-        logger.error("getGameInfo", e);
+            logger.error("getGameInfo", e);
         }
 
         return null;
@@ -89,7 +105,7 @@ public class GameInfoServiceImpl implements GameInfoService{
             int updates = gameInfoMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createGameInfo", e);
@@ -104,13 +120,13 @@ public class GameInfoServiceImpl implements GameInfoService{
         logger.info("deleteGameInfo");
         try {
 
-             int updates = gameInfoMapper.delete(record);
+            int updates = gameInfoMapper.delete(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteGameInfo", e);
+            logger.error("deleteGameInfo", e);
         }
 
         return false;
@@ -125,10 +141,10 @@ public class GameInfoServiceImpl implements GameInfoService{
             int updates = gameInfoMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateGameInfo", e);
+            logger.error("updateGameInfo", e);
         }
 
         return false;

src/main/java/com/izouma/awesomeadmin/service/impl/HouseInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.izouma.awesomeadmin.service.impl;
 import java.math.BigDecimal;
 import java.util.*;
 
+import com.izouma.awesomeadmin.dao.BonusRecordMapper;
 import com.izouma.awesomeadmin.dao.CompetitionSeasonMapper;
 import com.izouma.awesomeadmin.dto.Result;
 import com.izouma.awesomeadmin.model.*;
@@ -44,6 +45,9 @@ public class HouseInfoServiceImpl implements HouseInfoService {
     @Autowired
     private SystemNoticeService systemNoticeService;
 
+    @Autowired
+    private BonusRecordService bonusRecordService;
+
     @Override
     public List<HouseInfo> getHouseInfoList(HouseInfo record) {
 
@@ -220,7 +224,8 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                             PlayerInfo playerInfo = playerInfoList.get(i);
                             playerInfo.setHouseRank(i + 1);
                             BigDecimal bonus = BigDecimal.ZERO;
-
+                            String content = "";
+                            int typeFlag = AppConstant.NoticeType.RECEIVE;
                             if (playerInfo.getRanking() != null && 1 == playerInfo.getRanking()) {//只有吃鸡才能获得奖励
 
                                 if (i == 0) {//第一名
@@ -234,47 +239,66 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                                 if (i == 2) {//第三名
                                     bonus = BigDecimal.valueOf((thirdRatio.doubleValue() / 100) * houseInfo.getBonus().doubleValue());
                                 }
+
+                                content = "恭喜你，在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
+                                        + "开始的游戏竞赛 " + houseInfo.getHouseName() + "获得了第" + playerInfo.getHouseRank()
+                                        + "名，获得" + bonus + "积分，赶快领取你的奖励吧。";
+                            } else {
+                                if (AppConstant.PlayerStatus.PROCESSED_FAIL == playerInfo.getStatusFlag()) {
+
+                                    content = "很遗憾，你在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
+                                            + "开始的游戏竞赛 " + houseInfo.getHouseName()
+                                            + "，未解析到结果，无法获得奖励。";
+                                } else if (AppConstant.PlayerStatus.OVERTIME == playerInfo.getStatusFlag()) {
+                                    content = "很遗憾，你在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
+                                            + "开始的游戏竞赛 " + houseInfo.getHouseName()
+                                            + "，比赛超时，无法获得奖励。";
+                                } else {
+                                    content = "恭喜你，在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
+                                            + "开始的游戏竞赛 " + houseInfo.getHouseName() + "获得了第" + playerInfo.getHouseRank()
+                                            + "名，但未能吃鸡,因此无法获得奖励。";
+                                }
+                                typeFlag = AppConstant.NoticeType.RESULT;
                             }
                             playerInfo.setBonus(bonus);
 
-                            if (AppConstant.PlayerStatus.PROCESSED == playerInfo.getStatusFlag()) {//如果是正常结束且解析完成的则更新为结束完成
-                                playerInfo.setStatusFlag(AppConstant.PlayerStatus.SETTLEMENT);
 
-                                SystemNotice systemNotice = new SystemNotice();
-                                systemNotice.setGameId(playerInfo.getGameId());
-                                systemNotice.setHouseId(playerInfo.getHouseId());
-                                systemNotice.setUserId(playerInfo.getUserId());
-                                systemNotice.setSeasonId(playerInfo.getSeasonId());
-                                systemNotice.setPlayerId(playerInfo.getId());
-                                systemNotice.setRemark("定时任务");
-                                String content = "恭喜你，在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
-                                        + "开始的游戏竞赛 " + houseInfo.getHouseName() + "获得了第" + playerInfo.getHouseRank()
-                                        + "名，赶快领取你的奖励吧。";
-                                systemNotice.setContent(content);
-                                systemNotice.setTypeFlag(AppConstant.NoticeType.RECEIVE);
+                            SystemNotice systemNotice = new SystemNotice();
+                            systemNotice.setGameId(playerInfo.getGameId());
+                            systemNotice.setHouseId(playerInfo.getHouseId());
+                            systemNotice.setUserId(playerInfo.getUserId());
+                            systemNotice.setSeasonId(playerInfo.getSeasonId());
+                            systemNotice.setPlayerId(playerInfo.getId());
+                            systemNotice.setRemark("定时任务");
 
-                                systemNoticeService.createSystemNotice(systemNotice);
+                            systemNotice.setContent(content);
+                            systemNotice.setTypeFlag(typeFlag);
 
-                                //推送
-                                try {
-                                    UserInfo userInfo = new UserInfo();
-                                    userInfo.setId(playerInfo.getUserId());
-                                    userInfo = userInfoService.getSingleUserInfo(userInfo);
-                                    if (userInfo != null) {
-                                        if ("Y".equals(userInfo.getNoticeFlag())) {
-                                            String[] ids = new String[]{userInfo.getId().toString()};
+                            systemNoticeService.createSystemNotice(systemNotice);
 
-                                            PushUtil.pushMsg(ids, content);
-                                        }
+                            //推送
+                            try {
+                                UserInfo userInfo = new UserInfo();
+                                userInfo.setId(playerInfo.getUserId());
+                                userInfo = userInfoService.getSingleUserInfo(userInfo);
+                                if (userInfo != null) {
+                                    if ("Y".equals(userInfo.getNoticeFlag())) {
+                                        String[] ids = new String[]{userInfo.getId().toString()};
 
+                                        PushUtil.pushMsg(ids, content);
                                     }
 
-
-                                } catch (Exception e) {
-                                    logger.error("结算推送消息异常。", e);
                                 }
+
+
+                            } catch (Exception e) {
+                                logger.error("结算推送消息异常。", e);
                             }
 
+                            if (AppConstant.PlayerStatus.PROCESSED == playerInfo.getStatusFlag()) {//如果正常结束的则更新状态
+                                playerInfo.setStatusFlag(AppConstant.PlayerStatus.SETTLEMENT);
+
+                            }
                             playerInfoService.updatePlayerInfo(playerInfo);
 
 
@@ -282,9 +306,42 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                     }
 
                     if (poolRatio.doubleValue() > 0) {
-                        BigDecimal pool = BigDecimal.valueOf((poolRatio.doubleValue() / 100) * houseInfo.getBonus().doubleValue());
+                        //加入到赛季奖金池中
+                        try {
+
+                            BigDecimal pool = BigDecimal.valueOf((poolRatio.doubleValue() / 100) * houseInfo.getBonus().doubleValue());
+
+                            CompetitionSeason competitionSeason = competitionSeasonMapper.selectByPrimaryKey(houseInfo.getSeasonId());
+
+                            if (competitionSeason != null) {
+
+
+                                double balance = competitionSeason.getBonus().doubleValue();
+                                double moneyCoin = balance + pool.doubleValue();
+
+                                BonusRecord bonusRecord = new BonusRecord();
+                                bonusRecord.setMoney(pool);
+                                bonusRecord.setBonus(BigDecimal.valueOf(moneyCoin));
+                                bonusRecord.setSeasonId(houseInfo.getSeasonId());
+                                bonusRecord.setGameId(houseInfo.getGameId());
+                                bonusRecord.setHouseId(houseInfo.getId());
+                                bonusRecord.setTypeFlag(0);
+                                bonusRecord.setRemark(houseInfo.getHouseName() + "比赛结算，" + pool.doubleValue() + " 积分");
+                                bonusRecordService.createBonusRecord(bonusRecord);
+
+                                CompetitionSeason addBonus = new CompetitionSeason();
+                                addBonus.setId(competitionSeason.getId());
+                                addBonus.setBonus(pool);
+
+                                competitionSeasonMapper.addBonus(addBonus);
+
+
+                            }
+
+                        } catch (Exception e) {
+                            logger.error("赛季奖金池添加奖金异常！", e);
+                        }
 
-                        //TODO 加入到赛季奖金池中
                     }
 
 

src/main/java/com/izouma/awesomeadmin/service/impl/MemberCoinServiceImpl.java

@@ -3,8 +3,11 @@ package com.izouma.awesomeadmin.service.impl;
 import java.math.BigDecimal;
 import java.util.*;
 
+import com.izouma.awesomeadmin.dao.RechargeRecordMapper;
+import com.izouma.awesomeadmin.model.RechargeRecord;
 import com.izouma.awesomeadmin.model.UserInfo;
 import com.izouma.awesomeadmin.service.UserInfoService;
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +28,9 @@ public class MemberCoinServiceImpl implements MemberCoinService {
     @Autowired
     private MemberCoinMapper memberCoinMapper;
 
+    @Autowired
+    private RechargeRecordMapper rechargeRecordMapper;
+
     @Autowired
     private UserInfoService userInfoService;
 
@@ -181,5 +187,124 @@ public class MemberCoinServiceImpl implements MemberCoinService {
 
         return 0;
     }
+
+    @Override
+    public int recharge(MemberCoin memberCoin) {
+
+        logger.info("recharge：充值电子币  ");
+        try {
+
+            int key = 0;
+
+            double money = memberCoin.getMoney().doubleValue();
+
+
+            int userId = Integer.valueOf(memberCoin.getUserId());
+            UserInfo userInfo = userInfoService.getUserInfoById(userId + "");
+
+            UserInfo updateUser = new UserInfo();
+            updateUser.setId(userId);
+            String remark = "充值";
+
+            switch (memberCoin.getRechargeType()) {
+                case 0:
+                    remark = "支付宝充值";
+                    break;
+                case 1:
+                    remark = "微信充值";
+                    break;
+                case 2:
+                    remark = "管理员手动充值";
+                    break;
+                case 3:
+                    remark = "其他途径充值";
+                    break;
+
+            }
+
+            if (StringUtils.isNotEmpty(memberCoin.getRemark())) {
+                remark = memberCoin.getRemark();
+            }
+
+
+            double balance = userInfo.getMoneyCoin();
+            double moneyCoin = balance + money;
+
+            memberCoin.setCreateUser(remark);
+            memberCoin.setBalance(BigDecimal.valueOf(moneyCoin));
+            memberCoin.setTypeFlag(AppConstant.CoinType.RECHARGE);
+            memberCoin.setRemark(remark + money + "余额");
+            key += memberCoinMapper.insertSelective(memberCoin);
+
+
+            updateUser.setMoneyCoin(moneyCoin);
+            userInfoService.updateUserInfo(updateUser);
+
+
+            //充值记录
+            RechargeRecord rechargeRecord = new RechargeRecord();
+            rechargeRecord.setCreateUser(remark);
+            rechargeRecord.setUserId(userInfo.getId());
+            rechargeRecord.setTypeFlag(memberCoin.getRechargeType());
+            rechargeRecord.setMoney(BigDecimal.valueOf(money));
+            rechargeRecord.setCash(BigDecimal.valueOf(money));
+            rechargeRecord.setBalance(BigDecimal.valueOf(moneyCoin + money));
+            rechargeRecord.setRemark(remark + money + "余额");
+
+            rechargeRecordMapper.insertSelective(rechargeRecord);
+
+
+            return key;
+        } catch (Exception e) {
+            logger.error("recharge：充值电子币异常  ", e);
+        }
+
+        return 0;
+    }
+
+    @Override
+    public int consumption(MemberCoin memberCoin) {
+
+        logger.info("consumption：电子币消耗  ");
+        try {
+
+            int key = 0;
+
+            double money = memberCoin.getMoney().doubleValue();
+
+
+            int userId = Integer.valueOf(memberCoin.getUserId());
+            UserInfo userInfo = userInfoService.getUserInfoById(userId + "");
+
+            UserInfo updateUser = new UserInfo();
+            updateUser.setId(userId);
+            String remark = "消费";
+
+            if (StringUtils.isNotEmpty(memberCoin.getRemark())) {
+                remark = memberCoin.getRemark();
+            }
+
+
+            double balance = userInfo.getMoneyCoin();
+            double moneyCoin = balance - money;
+
+            memberCoin.setMoney(BigDecimal.valueOf(-money));
+            memberCoin.setCreateUser(remark);
+            memberCoin.setBalance(BigDecimal.valueOf(moneyCoin));
+            memberCoin.setTypeFlag(AppConstant.CoinType.CONSUMPTION);
+            memberCoin.setRemark(remark + money + "余额");
+            key += memberCoinMapper.insertSelective(memberCoin);
+
+
+            updateUser.setMoneyCoin(moneyCoin);
+            userInfoService.updateUserInfo(updateUser);
+
+            return key;
+        } catch (Exception e) {
+            logger.error("consumption：电子币电子币消耗异常  ", e);
+        }
+
+        return 0;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/PlayerInfoServiceImpl.java

@@ -176,6 +176,21 @@ public class PlayerInfoServiceImpl implements PlayerInfoService {
         return 0;
     }
 
+    @Override
+    public int endNum(PlayerInfo record) {
+
+        logger.info("endNum");
+        try {
+
+            return playerInfoMapper.endNum(record);
+
+        } catch (Exception e) {
+            logger.error("endNum", e);
+        }
+
+        return 0;
+    }
+
     @Override
     public PlayerInfo seasonUserRank(PlayerInfo record) {
 

src/main/java/com/izouma/awesomeadmin/service/impl/ProductInfoServiceImpl.java

@@ -0,0 +1,189 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.model.MemberCoin;
+import com.izouma.awesomeadmin.service.MemberCoinService;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.ProductInfo;
+import com.izouma.awesomeadmin.service.ProductInfoService;
+import com.izouma.awesomeadmin.dao.ProductInfoMapper;
+
+/**
+ * service接口实现类
+ */
+@Service
+public class ProductInfoServiceImpl implements ProductInfoService {
+
+    private static Logger logger = Logger.getLogger(ProductInfoServiceImpl.class);
+
+    @Autowired
+    private ProductInfoMapper productInfoMapper;
+
+    @Autowired
+    private MemberCoinService memberCoinService;
+
+    @Override
+    public List<ProductInfo> getProductInfoList(ProductInfo record) {
+
+        logger.info("getProductInfoList");
+        try {
+
+            return productInfoMapper.queryAllProductInfo(record);
+        } catch (Exception e) {
+            logger.error("getProductInfoList", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<ProductInfo> getProductInfoByPage(Page page, ProductInfo record) {
+
+        logger.info("getProductInfoByPage");
+        try {
+
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
+
+            return productInfoMapper.queryProductInfoByPage(parameter);
+        } catch (Exception e) {
+            logger.error("getProductInfoByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public ProductInfo getProductInfoById(String id) {
+
+        logger.info("getProductInfoyId");
+        try {
+
+            return productInfoMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+            logger.error("getProductInfoById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public ProductInfo getProductInfo(ProductInfo record) {
+
+        logger.info("getProductInfo");
+        try {
+
+            return productInfoMapper.queryProductInfo(record);
+        } catch (Exception e) {
+            logger.error("getProductInfo", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createProductInfo(ProductInfo record) {
+
+        logger.info("createProductInfo");
+        try {
+
+            int updates = productInfoMapper.insertSelective(record);
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            logger.error("createProductInfo", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteProductInfo(ProductInfo record) {
+
+        logger.info("deleteProductInfo");
+        try {
+
+            int updates = productInfoMapper.delete(record);
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            logger.error("deleteProductInfo", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateProductInfo(ProductInfo record) {
+
+        logger.info("updateProductInfo");
+        try {
+
+            int updates = productInfoMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            logger.error("updateProductInfo", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean buyProductInfo(ProductInfo record) {
+
+        logger.info("buyProductInfo");
+        try {
+            ProductInfo productInfo = productInfoMapper.selectByPrimaryKey(record.getId());
+            int updates = 0;
+            if (productInfo != null) {
+                if (AppConstant.ProductType.RECHARGE == productInfo.getTypeFlag()) {//如果是充值类型
+                    if (record.getMoney().compareTo(productInfo.getMoney()) >= 0) {
+
+                        MemberCoin memberCoin = new MemberCoin();
+                        memberCoin.setMoney(productInfo.getCoin());
+                        memberCoin.setUserId(record.getUserId());
+                        memberCoin.setRemark("购买" + productInfo.getProductName() + "套餐，充值");
+                        memberCoin.setRechargeType(AppConstant.RechargeType.OTHER);
+
+                        updates = memberCoinService.recharge(memberCoin);
+
+                    }
+
+
+                } else {
+                    if (record.getMoney().compareTo(productInfo.getCoin()) >= 0) {
+                        MemberCoin memberCoin = new MemberCoin();
+                        memberCoin.setMoney(productInfo.getCoin());
+                        memberCoin.setUserId(record.getUserId());
+                        memberCoin.setRemark("购买" + productInfo.getProductName() + "套餐，消费");
+
+                        updates = memberCoinService.consumption(memberCoin);
+                    }
+                }
+
+            }
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            logger.error("buyProductInfo", e);
+        }
+
+        return false;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/SystemNoticeServiceImpl.java

@@ -1,6 +1,15 @@
 package com.izouma.awesomeadmin.service.impl;
 
+import java.math.BigDecimal;
 import java.util.*;
+
+import com.izouma.awesomeadmin.dao.MemberCoinMapper;
+import com.izouma.awesomeadmin.dao.UserInfoMapper;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.MemberCoin;
+import com.izouma.awesomeadmin.model.PlayerInfo;
+import com.izouma.awesomeadmin.model.UserInfo;
+import com.izouma.awesomeadmin.util.PushUtil;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,42 +20,49 @@ import com.izouma.awesomeadmin.service.SystemNoticeService;
 import com.izouma.awesomeadmin.dao.SystemNoticeMapper;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class SystemNoticeServiceImpl implements SystemNoticeService{
+public class SystemNoticeServiceImpl implements SystemNoticeService {
 
     private static Logger logger = Logger.getLogger(SystemNoticeServiceImpl.class);
 
     @Autowired
     private SystemNoticeMapper systemNoticeMapper;
 
+    @Autowired
+    private UserInfoMapper userInfoMapper;
+
+    @Autowired
+    private MemberCoinMapper memberCoinMapper;
+
     @Override
     public List<SystemNotice> getSystemNoticeList(SystemNotice record) {
 
         logger.info("getSystemNoticeList");
         try {
 
-        return systemNoticeMapper.queryAllSystemNotice(record);
+            return systemNoticeMapper.queryAllSystemNotice(record);
         } catch (Exception e) {
-        logger.error("getSystemNoticeList", e);
+            logger.error("getSystemNoticeList", e);
         }
 
         return null;
     }
+
     @Override
     public List<SystemNotice> getSystemNoticeByPage(Page page, SystemNotice record) {
 
         logger.info("getSystemNoticeByPage");
         try {
 
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
 
-        return systemNoticeMapper.querySystemNoticeByPage(parameter);
+            return systemNoticeMapper.querySystemNoticeByPage(parameter);
         } catch (Exception e) {
-        logger.error("getSystemNoticeByPage", e);
+            logger.error("getSystemNoticeByPage", e);
         }
 
         return null;
@@ -60,7 +76,7 @@ public class SystemNoticeServiceImpl implements SystemNoticeService{
 
             return systemNoticeMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getSystemNoticeById", e);
+            logger.error("getSystemNoticeById", e);
         }
 
         return null;
@@ -74,7 +90,7 @@ public class SystemNoticeServiceImpl implements SystemNoticeService{
 
             return systemNoticeMapper.querySystemNotice(record);
         } catch (Exception e) {
-        logger.error("getSystemNotice", e);
+            logger.error("getSystemNotice", e);
         }
 
         return null;
@@ -89,7 +105,7 @@ public class SystemNoticeServiceImpl implements SystemNoticeService{
             int updates = systemNoticeMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createSystemNotice", e);
@@ -104,13 +120,13 @@ public class SystemNoticeServiceImpl implements SystemNoticeService{
         logger.info("deleteSystemNotice");
         try {
 
-             int updates = systemNoticeMapper.delete(record);
+            int updates = systemNoticeMapper.delete(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteSystemNotice", e);
+            logger.error("deleteSystemNotice", e);
         }
 
         return false;
@@ -125,10 +141,10 @@ public class SystemNoticeServiceImpl implements SystemNoticeService{
             int updates = systemNoticeMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateSystemNotice", e);
+            logger.error("updateSystemNotice", e);
         }
 
         return false;
@@ -142,12 +158,84 @@ public class SystemNoticeServiceImpl implements SystemNoticeService{
 
             int unreads = systemNoticeMapper.getUnreadSystemNotice(record);
 
-                 return unreads;
+            return unreads;
         } catch (Exception e) {
-             logger.error("getUnreadSystemNotice", e);
+            logger.error("getUnreadSystemNotice", e);
         }
 
         return 0;
     }
+
+    @Override
+    public Result receiveBonus(SystemNotice record) {
+
+        logger.info("receiveBonus");
+        try {
+            SystemNotice systemNotice = systemNoticeMapper.querySystemNotice(record);
+            if (systemNotice != null) {
+                if (0 != systemNotice.getStatusFlag()) {//未领取
+                    return new Result(false, "邮件处于非领取状态，不能领取！");
+                }
+
+                double money = systemNotice.getBonus().doubleValue();
+                if (money > 0) {
+                    int userId = Integer.valueOf(systemNotice.getUserId());
+
+                    MemberCoin memberCoin = new MemberCoin();
+                    memberCoin.setUserId(userId);
+                    memberCoin.setMoney(BigDecimal.valueOf(money));
+
+                    UserInfo userInfo = userInfoMapper.selectByPrimaryKey(userId);
+
+
+                    double balance = userInfo.getMoneyCoin();
+                    double moneyCoin = balance + money;
+
+                    memberCoin.setGameId(systemNotice.getGameId());
+                    memberCoin.setSeasonId(systemNotice.getSeasonId());
+
+                    memberCoin.setCreateUser("奖金领取");
+                    memberCoin.setBalance(BigDecimal.valueOf(moneyCoin));
+                    memberCoin.setTypeFlag(AppConstant.CoinType.BONUS);
+                    memberCoin.setRemark("获得赛季奖励：" + money + "余额");
+                    memberCoinMapper.insertSelective(memberCoin);
+
+                    UserInfo updateUser = new UserInfo();
+                    updateUser.setId(userId);
+                    updateUser.setMoneyCoin(moneyCoin);
+                    userInfoMapper.updateByPrimaryKeySelective(updateUser);
+
+
+                    //推送
+                    try {
+                        if (userInfo != null) {
+                            if ("Y".equals(userInfo.getNoticeFlag())) {
+                                String[] ids = new String[]{userInfo.getId().toString()};
+
+                                PushUtil.pushMsg(ids, "获得赛季奖励：" + money + "余额");
+                            }
+
+                        }
+
+
+                    } catch (Exception e) {
+                        logger.error("推送消息异常。", e);
+                    }
+
+                }
+
+                systemNotice.setStatusFlag(2);
+                systemNoticeMapper.updateByPrimaryKeySelective(systemNotice);
+
+                return new Result(true, "领取成功");
+            }
+
+
+        } catch (Exception e) {
+            logger.error("receiveBonus", e);
+        }
+
+        return new Result(false, "领取失败");
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/web/CompetitionSeasonController.java

@@ -18,8 +18,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/competitionSeason")
 public class CompetitionSeasonController {
@@ -28,8 +28,8 @@ public class CompetitionSeasonController {
     private CompetitionSeasonService competitionSeasonService;
 
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -39,8 +39,8 @@ public class CompetitionSeasonController {
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getCompetitionSeason", method = RequestMethod.GET)
     @ResponseBody
     public Result getCompetitionSeason(@RequestParam(required = false, value = "id") String id) {
@@ -49,8 +49,8 @@ public class CompetitionSeasonController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(CompetitionSeason record) {
@@ -60,14 +60,14 @@ public class CompetitionSeasonController {
 
 
     /**
-    * <p>分页查询。</p>
-    */
+     * <p>分页查询。</p>
+     */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, CompetitionSeason record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<CompetitionSeason> pp =competitionSeasonService.getCompetitionSeasonByPage(page, record);
+        List<CompetitionSeason> pp = competitionSeasonService.getCompetitionSeasonByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -76,90 +76,104 @@ public class CompetitionSeasonController {
 
 
     /**
-    * <p>保存。</p>
-    */
+     * <p>保存。</p>
+     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(CompetitionSeason record) {
         boolean num = competitionSeasonService.createCompetitionSeason(record);
         if (num) {
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>更新信息。</p>
-    */
+     * <p>更新信息。</p>
+     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateCompetitionSeason(CompetitionSeason record) {
         boolean num = competitionSeasonService.updateCompetitionSeason(record);
         if (num) {
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>删除。</p>
-    */
+     * <p>删除。</p>
+     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteCompetitionSeason(CompetitionSeason record) {
 
         boolean num = competitionSeasonService.deleteCompetitionSeason(record);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 发放奖金
+     *
+     * @param record
+     * @return
+     */
+    @RequestMapping(value = "/bonusPayment", method = RequestMethod.POST)
+    @ResponseBody
+    public Result bonusPayment(CompetitionSeason record) {
+
+        return competitionSeasonService.bonusPayment(record);
+    }
+
+    /**
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, CompetitionSeason record) throws Exception {
 
-    List<CompetitionSeason> competitionSeasons = competitionSeasonService.getCompetitionSeasonList(record);
+        List<CompetitionSeason> competitionSeasons = competitionSeasonService.getCompetitionSeasonList(record);
 
 
         String sheetName = "competition_season";
         String titleName = "赛季数据表";
         String fileName = "赛季表";
         int columnNumber = 14;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "名称" ,   "简称" ,   "开始时间" ,   "结束时间" ,   "奖金数" ,   "备注" ,   "排序" ,   "状态"  };
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "名称", "简称", "开始时间", "结束时间", "奖金数", "备注", "排序", "状态"};
         String[][] dataList = new String[competitionSeasons.size()][14];
 
         for (int i = 0; i < competitionSeasons.size(); i++) {
 
-                        dataList[i][0] = String.valueOf(competitionSeasons.get(i).getId());
-                        dataList[i][1] = String.valueOf(competitionSeasons.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(competitionSeasons.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(competitionSeasons.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(competitionSeasons.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(competitionSeasons.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(competitionSeasons.get(i).getSeason());
-                        dataList[i][7] = String.valueOf(competitionSeasons.get(i).getShortName());
-                        dataList[i][8] = String.valueOf(competitionSeasons.get(i).getBeginTime());
-                        dataList[i][9] = String.valueOf(competitionSeasons.get(i).getEndTime());
-                        dataList[i][10] = String.valueOf(competitionSeasons.get(i).getBonus());
-                        dataList[i][11] = String.valueOf(competitionSeasons.get(i).getRemark());
-                        dataList[i][12] = String.valueOf(competitionSeasons.get(i).getRank());
-                        dataList[i][13] = String.valueOf(competitionSeasons.get(i).getStatusFlag());
-                    }
+            dataList[i][0] = String.valueOf(competitionSeasons.get(i).getId());
+            dataList[i][1] = String.valueOf(competitionSeasons.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(competitionSeasons.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(competitionSeasons.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(competitionSeasons.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(competitionSeasons.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(competitionSeasons.get(i).getSeason());
+            dataList[i][7] = String.valueOf(competitionSeasons.get(i).getShortName());
+            dataList[i][8] = String.valueOf(competitionSeasons.get(i).getBeginTime());
+            dataList[i][9] = String.valueOf(competitionSeasons.get(i).getEndTime());
+            dataList[i][10] = String.valueOf(competitionSeasons.get(i).getBonus());
+            dataList[i][11] = String.valueOf(competitionSeasons.get(i).getRemark());
+            dataList[i][12] = String.valueOf(competitionSeasons.get(i).getRank());
+            dataList[i][13] = String.valueOf(competitionSeasons.get(i).getStatusFlag());
+        }
 
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
+                columnNumber, columnWidth, columnName, dataList, response);
 
 
-        }
     }
+}
 

src/main/java/com/izouma/awesomeadmin/web/GameInfoController.java

@@ -18,8 +18,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/gameInfo")
 public class GameInfoController {
@@ -28,8 +28,8 @@ public class GameInfoController {
     private GameInfoService gameInfoService;
 
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -39,8 +39,8 @@ public class GameInfoController {
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getGameInfo", method = RequestMethod.GET)
     @ResponseBody
     public Result getGameInfo(@RequestParam(required = false, value = "id") String id) {
@@ -49,8 +49,8 @@ public class GameInfoController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(GameInfo record) {
@@ -60,14 +60,14 @@ public class GameInfoController {
 
 
     /**
-    * <p>分页查询。</p>
-    */
+     * <p>分页查询。</p>
+     */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, GameInfo record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<GameInfo> pp =gameInfoService.getGameInfoByPage(page, record);
+        List<GameInfo> pp = gameInfoService.getGameInfoByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -76,88 +76,97 @@ public class GameInfoController {
 
 
     /**
-    * <p>保存。</p>
-    */
+     * <p>保存。</p>
+     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(GameInfo record) {
         boolean num = gameInfoService.createGameInfo(record);
         if (num) {
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>更新信息。</p>
-    */
+     * <p>更新信息。</p>
+     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateGameInfo(GameInfo record) {
         boolean num = gameInfoService.updateGameInfo(record);
         if (num) {
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>删除。</p>
-    */
+     * <p>删除。</p>
+     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteGameInfo(GameInfo record) {
 
         boolean num = gameInfoService.deleteGameInfo(record);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, GameInfo record) throws Exception {
 
-    List<GameInfo> gameInfos = gameInfoService.getGameInfoList(record);
+        List<GameInfo> gameInfos = gameInfoService.getGameInfoList(record);
 
 
         String sheetName = "game_info";
         String titleName = "游戏数据表";
         String fileName = "游戏表";
         int columnNumber = 12;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "游戏名" ,   "类型" ,   "图标" ,   "排序" ,   "备注" ,   "可用"  };
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"ID", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "游戏名", "类型", "图标", "排序", "备注", "可用"};
         String[][] dataList = new String[gameInfos.size()][12];
 
         for (int i = 0; i < gameInfos.size(); i++) {
 
-                        dataList[i][0] = String.valueOf(gameInfos.get(i).getId());
-                        dataList[i][1] = String.valueOf(gameInfos.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(gameInfos.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(gameInfos.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(gameInfos.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(gameInfos.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(gameInfos.get(i).getGameName());
-                        dataList[i][7] = String.valueOf(gameInfos.get(i).getTypeFlag());
-                        dataList[i][8] = String.valueOf(gameInfos.get(i).getIcon());
-                        dataList[i][9] = String.valueOf(gameInfos.get(i).getRank());
-                        dataList[i][10] = String.valueOf(gameInfos.get(i).getRemark());
-                        dataList[i][11] = String.valueOf(gameInfos.get(i).getUseFlag());
-                    }
+            dataList[i][0] = String.valueOf(gameInfos.get(i).getId());
+            dataList[i][1] = String.valueOf(gameInfos.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(gameInfos.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(gameInfos.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(gameInfos.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(gameInfos.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(gameInfos.get(i).getGameName());
+            dataList[i][7] = String.valueOf(gameInfos.get(i).getTypeFlag());
+            dataList[i][8] = String.valueOf(gameInfos.get(i).getIcon());
+            dataList[i][9] = String.valueOf(gameInfos.get(i).getRank());
+            dataList[i][10] = String.valueOf(gameInfos.get(i).getRemark());
+            dataList[i][11] = String.valueOf(gameInfos.get(i).getUseFlag());
+        }
 
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
+                columnNumber, columnWidth, columnName, dataList, response);
 
 
-        }
     }
 
+    @RequestMapping(value = "/seasons", method = RequestMethod.GET)
+    @ResponseBody
+    public Result seasons(GameInfo record) {
+        List<GameInfo> pp = gameInfoService.getGameInfoSeasonsList(record);
+        return new Result(true, pp);
+    }
+
+}
+

src/main/java/com/izouma/awesomeadmin/web/MemberCoinController.java

@@ -18,8 +18,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/memberCoin")
 public class MemberCoinController {
@@ -28,8 +28,8 @@ public class MemberCoinController {
     private MemberCoinService memberCoinService;
 
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -39,8 +39,8 @@ public class MemberCoinController {
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getMemberCoin", method = RequestMethod.GET)
     @ResponseBody
     public Result getMemberCoin(@RequestParam(required = false, value = "id") String id) {
@@ -49,8 +49,8 @@ public class MemberCoinController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(MemberCoin record) {
@@ -60,14 +60,14 @@ public class MemberCoinController {
 
 
     /**
-    * <p>分页查询。</p>
-    */
+     * <p>分页查询。</p>
+     */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, MemberCoin record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<MemberCoin> pp =memberCoinService.getMemberCoinByPage(page, record);
+        List<MemberCoin> pp = memberCoinService.getMemberCoinByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -76,92 +76,93 @@ public class MemberCoinController {
 
 
     /**
-    * <p>保存。</p>
-    */
+     * <p>保存。</p>
+     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(MemberCoin record) {
         boolean num = memberCoinService.createMemberCoin(record);
         if (num) {
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>更新信息。</p>
-    */
+     * <p>更新信息。</p>
+     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateMemberCoin(MemberCoin record) {
         boolean num = memberCoinService.updateMemberCoin(record);
         if (num) {
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>删除。</p>
-    */
+     * <p>删除。</p>
+     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteMemberCoin(MemberCoin record) {
 
         boolean num = memberCoinService.deleteMemberCoin(record);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, MemberCoin record) throws Exception {
 
-    List<MemberCoin> memberCoins = memberCoinService.getMemberCoinList(record);
+        List<MemberCoin> memberCoins = memberCoinService.getMemberCoinList(record);
 
 
         String sheetName = "member_coin";
         String titleName = "金币记录数据表";
         String fileName = "金币记录表";
         int columnNumber = 15;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "游戏" ,   "房间" ,   "用户" ,   "备注" ,   "类型" ,   "金额" ,   "余额" ,   "赛季ID" ,   "选手ID"  };
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "游戏", "房间", "用户", "备注", "类型", "金额", "余额", "赛季ID", "选手ID"};
         String[][] dataList = new String[memberCoins.size()][15];
 
         for (int i = 0; i < memberCoins.size(); i++) {
 
-                        dataList[i][0] = String.valueOf(memberCoins.get(i).getId());
-                        dataList[i][1] = String.valueOf(memberCoins.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(memberCoins.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(memberCoins.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(memberCoins.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(memberCoins.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(memberCoins.get(i).getGameId());
-                        dataList[i][7] = String.valueOf(memberCoins.get(i).getHouseId());
-                        dataList[i][8] = String.valueOf(memberCoins.get(i).getUserId());
-                        dataList[i][9] = String.valueOf(memberCoins.get(i).getRemark());
-                        dataList[i][10] = String.valueOf(memberCoins.get(i).getTypeFlag());
-                        dataList[i][11] = String.valueOf(memberCoins.get(i).getMoney());
-                        dataList[i][12] = String.valueOf(memberCoins.get(i).getBalance());
-                        dataList[i][13] = String.valueOf(memberCoins.get(i).getSeasonId());
-                        dataList[i][14] = String.valueOf(memberCoins.get(i).getPlayerId());
-                    }
+            dataList[i][0] = String.valueOf(memberCoins.get(i).getId());
+            dataList[i][1] = String.valueOf(memberCoins.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(memberCoins.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(memberCoins.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(memberCoins.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(memberCoins.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(memberCoins.get(i).getGameId());
+            dataList[i][7] = String.valueOf(memberCoins.get(i).getHouseId());
+            dataList[i][8] = String.valueOf(memberCoins.get(i).getUserId());
+            dataList[i][9] = String.valueOf(memberCoins.get(i).getRemark());
+            dataList[i][10] = String.valueOf(memberCoins.get(i).getTypeFlag());
+            dataList[i][11] = String.valueOf(memberCoins.get(i).getMoney());
+            dataList[i][12] = String.valueOf(memberCoins.get(i).getBalance());
+            dataList[i][13] = String.valueOf(memberCoins.get(i).getSeasonId());
+            dataList[i][14] = String.valueOf(memberCoins.get(i).getPlayerId());
+        }
 
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
+                columnNumber, columnWidth, columnName, dataList, response);
 
 
-        }
+    }
 
     @RequestMapping(value = "/song", method = RequestMethod.POST)
     @ResponseBody
@@ -175,5 +176,29 @@ public class MemberCoinController {
 
     }
 
+    @RequestMapping(value = "/recharge", method = RequestMethod.POST)
+    @ResponseBody
+    public Result recharge(MemberCoin memberCoin) {
+
+        int num = memberCoinService.recharge(memberCoin);
+        if (num > 0) {
+            return new Result(true, "充值成功");
+        }
+        return new Result(false, "充值异常");
+
+    }
+
+    @RequestMapping(value = "/consumption", method = RequestMethod.POST)
+    @ResponseBody
+    public Result consumption(MemberCoin memberCoin) {
+
+        int num = memberCoinService.consumption(memberCoin);
+        if (num > 0) {
+            return new Result(true, "消费成功");
+        }
+        return new Result(false, "消费异常");
+
     }
 
+}
+

src/main/java/com/izouma/awesomeadmin/web/PlayerInfoController.java

@@ -134,6 +134,21 @@ public class PlayerInfoController {
         return new Result(true, rank);
     }
 
+    /**
+     * 查询已完成数量
+     *
+     * @param record
+     * @return
+     */
+    @RequestMapping(value = "/endNum", method = RequestMethod.GET)
+    @ResponseBody
+    public Result endNum(PlayerInfo record) {
+
+        int rank = playerInfoService.endNum(record);
+
+        return new Result(true, rank);
+    }
+
     @RequestMapping(value = "/seasonUserRank", method = RequestMethod.GET)
     @ResponseBody
     public Result seasonUserRank(PlayerInfo record) {

src/main/java/com/izouma/awesomeadmin/web/ProductInfoController.java

@@ -0,0 +1,174 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.ProductInfo;
+import com.izouma.awesomeadmin.service.ProductInfoService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * controller类
+ */
+@Controller
+@RequestMapping("/productInfo")
+public class ProductInfoController {
+
+    @Autowired
+    private ProductInfoService productInfoService;
+
+    /**
+     * <p>获取全部记录。</p>
+     */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(ProductInfo record) {
+        List<ProductInfo> pp = productInfoService.getProductInfoList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+     * <p>根据Id。</p>
+     */
+    @RequestMapping(value = "/getProductInfo", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getProductInfo(@RequestParam(required = false, value = "id") String id) {
+        ProductInfo data = productInfoService.getProductInfoById(id);
+        return new Result(true, data);
+    }
+
+    /**
+     * <p>根据条件获取。</p>
+     */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(ProductInfo record) {
+        ProductInfo data = productInfoService.getProductInfo(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+     * <p>分页查询。</p>
+     */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, ProductInfo record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<ProductInfo> pp = productInfoService.getProductInfoByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+
+    /**
+     * <p>保存。</p>
+     */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(ProductInfo record) {
+        boolean num = productInfoService.createProductInfo(record);
+        if (num) {
+            return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+     * <p>更新信息。</p>
+     */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateProductInfo(ProductInfo record) {
+        boolean num = productInfoService.updateProductInfo(record);
+        if (num) {
+            return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    @RequestMapping(value = "/buy", method = RequestMethod.POST)
+    @ResponseBody
+    public Result buyProductInfo(ProductInfo record) {
+        boolean num = productInfoService.buyProductInfo(record);
+        if (num) {
+            return new Result(true, "购买成功");
+        }
+        return new Result(false, "购买异常");
+    }
+
+    /**
+     * <p>删除。</p>
+     */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteProductInfo(ProductInfo record) {
+
+        boolean num = productInfoService.deleteProductInfo(record);
+        if (num) {
+            return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    /**
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, ProductInfo record) throws Exception {
+
+        List<ProductInfo> productInfos = productInfoService.getProductInfoList(record);
+
+
+        String sheetName = "product_info";
+        String titleName = "商品信息数据表";
+        String fileName = "商品信息表";
+        int columnNumber = 12;
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "名称", "现金", "余额", "类型", "备注", "排序"};
+        String[][] dataList = new String[productInfos.size()][12];
+
+        for (int i = 0; i < productInfos.size(); i++) {
+
+            dataList[i][0] = String.valueOf(productInfos.get(i).getId());
+            dataList[i][1] = String.valueOf(productInfos.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(productInfos.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(productInfos.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(productInfos.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(productInfos.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(productInfos.get(i).getProductName());
+            dataList[i][7] = String.valueOf(productInfos.get(i).getMoney());
+            dataList[i][8] = String.valueOf(productInfos.get(i).getCoin());
+            dataList[i][9] = String.valueOf(productInfos.get(i).getTypeFlag());
+            dataList[i][10] = String.valueOf(productInfos.get(i).getRemark());
+            dataList[i][11] = String.valueOf(productInfos.get(i).getRank());
+        }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+                columnNumber, columnWidth, columnName, dataList, response);
+
+
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/web/SystemNoticeController.java

@@ -130,6 +130,17 @@ public class SystemNoticeController {
     }
 
 
+    /**
+     * <p>领取奖励。</p>
+     */
+    @RequestMapping(value = "/receive", method = RequestMethod.POST)
+    @ResponseBody
+    public Result receiveBonus(SystemNotice record) {
+
+        return systemNoticeService.receiveBonus(record);
+
+    }
+
     /**
      * 导出Excel
      *

src/main/resources/spring/appWebService.xml

@@ -30,11 +30,11 @@
 	<bean id="houseInfoTask" class="com.izouma.awesomeadmin.web.HouseInfoController"></bean>
 
 	<task:scheduled-tasks>
-		<task:scheduled ref="houseInfoTask" method="autoBegin" cron="0 0/5 * * * ? "/>
+		<task:scheduled ref="houseInfoTask" method="autoBegin" cron="0 0/1 * * * ? "/>
 		<task:scheduled ref="houseInfoTask" method="autoNoStartPlay" cron="0 0/2 * * * ? "/>
-		<task:scheduled ref="houseInfoTask" method="autoEnd" cron="0 0/10 * * * ? "/>
-		<task:scheduled ref="houseInfoTask" method="updateToAnalysis" cron="0 0/5 * * * ? "/>
-		<task:scheduled ref="houseInfoTask" method="autoSettlement" cron="0 0/10 * * * ? "/>
+		<task:scheduled ref="houseInfoTask" method="autoEnd" cron="0 0/5 * * * ? "/>
+		<task:scheduled ref="houseInfoTask" method="updateToAnalysis" cron="0 0/3 * * * ? "/>
+		<task:scheduled ref="houseInfoTask" method="autoSettlement" cron="0 0/5 * * * ? "/>
 	</task:scheduled-tasks>
 
 

src/main/vue/src/pages/CompetitionSeason.vue

@@ -34,7 +34,7 @@
                     </div>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="bonus" label="奖金数">
+                                                                                                                                                                                                                                                                                                        <el-form-item prop="bonus" label="奖励数">
                 <el-input type="number" v-model="formData.bonus" :disabled="'bonus'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                     <el-form-item prop="remark" label="备注">
@@ -67,7 +67,19 @@
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                    <el-form-item>
+                                                                                                                                                                                                                                                                <el-form-item prop="firstRatio" label="第一比率">
+                <el-input type="number" v-model="formData.firstRatio" :disabled="'firstRatio'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="secondRatio" label="第二比率">
+                <el-input type="number" v-model="formData.secondRatio" :disabled="'secondRatio'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="thirdRatio" label="第三比率">
+                <el-input type="number" v-model="formData.thirdRatio" :disabled="'thirdRatio'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="bonusPaid" label="已发奖励">
+                <el-input type="number" v-model="formData.bonusPaid" :disabled="'bonusPaid'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
                 <el-button @click="$router.go(-1)">取消</el-button>
@@ -94,7 +106,7 @@
                 }).then(res => {
                     if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
                         this.formData = res.data;
 
                     if (this.$route.query.column) {
@@ -123,13 +135,13 @@
                         }
                         }
                         });
-                                                        },
+                                                                                                                                                                        },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
                                                                                                                                 statusFlagOptions:[{
           value: 0,
           label: '准备'
@@ -144,7 +156,7 @@
           label: '结束'
         }],
                                             gameIdOptions:[],
-                                subColumn: '',
+                                                                subColumn: '',
             subValue: '',
         }
         },

src/main/vue/src/pages/CompetitionSeasons.vue

@@ -1,25 +1,22 @@
 <template>
     <div>
         <div class="filters-container">
-        
+
             <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
             </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push({path:'/competitionSeason',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
+            <el-button @click="$router.push({path:'/competitionSeason',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
             </el-button>
             <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
             </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
                     <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
@@ -27,103 +24,49 @@
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
-        <el-table
-                :data="tableData"
-                :height="tableHeight"
-                row-key="id"
-                ref="table">
-            <el-table-column
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+            </el-table-column>
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('id')" prop="id" label="" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('season')" prop="season" label="名称" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('shortName')" prop="shortName" label="简称" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('beginTime')" prop="beginTime" label="开始时间" :formatter="DateFormatter" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('endTime')" prop="endTime" label="结束时间" :formatter="DateFormatter" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('bonus')" prop="bonus" label="奖励数" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('rank')" prop="rank" label="排序" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('statusFlag')" prop="statusFlag" label="状态" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('gameId')" prop="gameId" label="游戏" min-width="100">
             </el-table-column>
-            <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
+
+            <el-table-column v-if="isColumnShow('bonusPaid')" prop="bonusPaid" label="已发奖励" min-width="100">
             </el-table-column>
-                            
-                                            <el-table-column
-                                v-if="isColumnShow('id')"
-                                prop="id"
-                                label=""
-                                min-width="100">
-                        </el-table-column>
-                                                                                                                                                                                                            
-                                            <el-table-column
-                                v-if="isColumnShow('season')"
-                                prop="season"
-                                label="名称"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('shortName')"
-                                prop="shortName"
-                                label="简称"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('beginTime')"
-                                prop="beginTime"
-                                label="开始时间"
-                                :formatter="DateFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('endTime')"
-                                prop="endTime"
-                                label="结束时间"
-                                :formatter="DateFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('bonus')"
-                                prop="bonus"
-                                label="奖金数"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark')"
-                                prop="remark"
-                                label="备注"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('rank')"
-                                prop="rank"
-                                label="排序"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('statusFlag')"
-                                prop="statusFlag"
-                                label="状态"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('gameId')"
-                                prop="gameId"
-                                label="游戏"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
+            <el-table-column label="操作" align="center" fixed="right" min-width="200">
                 <template slot-scope="scope">
-                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                    <el-button @click="bonusPayment(scope.row)" type="primary" size="mini" plain>发放奖励</el-button>
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <!-- <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
             </el-table-column>
         </el-table>
@@ -136,15 +79,7 @@
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
-            <el-pagination
-                    background
-                    @size-change="pageSizeChange"
-                    @current-change="currentPageChange"
-                    :current-page="currentPage"
-                    :page-sizes="[10, 20, 30, 40, 50]"
-                    :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="totalNumber">
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
             </el-pagination>
         </div>
         <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
@@ -165,16 +100,14 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
                 <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
                     <template slot-scope="{row}">
                         <el-select v-model="row.searchMethod">
-                            <el-option v-for="item in searchMethods" :label="item" :value="item"
-                                       :key="item"></el-option>
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -204,8 +137,7 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -239,315 +171,340 @@
     </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
-
-    export default {
-        created() {
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: '',
+                    value: 'id',
+                    show: true
+                },
+                {
+                    label: '名称',
+                    value: 'season',
+                    show: true
+                },
+                {
+                    label: '简称',
+                    value: 'shortName',
+                    show: true
+                },
+                {
+                    label: '开始时间',
+                    value: 'beginTime',
+                    show: true
+                },
+                {
+                    label: '结束时间',
+                    value: 'endTime',
+                    show: true
+                },
+                {
+                    label: '奖励数',
+                    value: 'bonus',
+                    show: true
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true
+                },
+                {
+                    label: '排序',
+                    value: 'rank',
+                    show: true
+                },
+                {
+                    label: '状态',
+                    value: 'statusFlag',
+                    show: true
+                },
+                {
+                    label: '游戏',
+                    value: 'gameId',
+                    show: true
+                },
+                {
+                    label: '已发奖励',
+                    value: 'bonusPaid',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: '',
+                    value: 'id'
+                },
+                {
+                    label: '名称',
+                    value: 'season'
+                },
+                {
+                    label: '简称',
+                    value: 'short_name'
+                },
+                {
+                    label: '开始时间',
+                    value: 'begin_time'
+                },
+                {
+                    label: '结束时间',
+                    value: 'end_time'
+                },
+                {
+                    label: '奖励数',
+                    value: 'bonus'
+                },
+                {
+                    label: '备注',
+                    value: 'remark'
+                },
+                {
+                    label: '排序',
+                    value: 'rank'
+                },
+                {
+                    label: '状态',
+                    value: 'status_flag'
+                },
+                {
+                    label: '游戏',
+                    value: 'game_id'
+                },
+                {
+                    label: '已发奖励',
+                    value: 'bonus_paid'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
             this.getData();
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                        {
-                                label: '',
-                                value: 'id',
-                                show: true
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '名称',
-                                value: 'season',
-                                show: true
-                            },
-                                                                                                {
-                                label: '简称',
-                                value: 'shortName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '开始时间',
-                                value: 'beginTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '结束时间',
-                                value: 'endTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '奖金数',
-                                value: 'bonus',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark',
-                                show: true
-                            },
-                                                                                                {
-                                label: '排序',
-                                value: 'rank',
-                                show: true
-                            },
-                                                                                                {
-                                label: '状态',
-                                value: 'statusFlag',
-                                show: true
-                            },
-                                                                                                {
-                                label: '游戏',
-                                value: 'gameId',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                        {
-                                label: '',
-                                value: 'id'
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '名称',
-                                value: 'season'
-                            },
-                                                                                                {
-                                label: '简称',
-                                value: 'short_name'
-                            },
-                                                                                                {
-                                label: '开始时间',
-                                value: 'begin_time'
-                            },
-                                                                                                {
-                                label: '结束时间',
-                                value: 'end_time'
-                            },
-                                                                                                {
-                                label: '奖金数',
-                                value: 'bonus'
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark'
-                            },
-                                                                                                {
-                                label: '排序',
-                                value: 'rank'
-                            },
-                                                                                                {
-                                label: '状态',
-                                value: 'status_flag'
-                            },
-                                                                                                {
-                                label: '游戏',
-                                value: 'game_id'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
             }
-        },
-        methods: {
-            pageSizeChange(size) {
-                this.currentPage = 1;
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-
-                var data = {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                    orderByStr: this.orderByStr,
-                }
 
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
 
-                this.$http.get({
-                    url: '/competitionSeason/page',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
-                })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
+            this.$http.get({
+                url: '/competitionSeason/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
                 }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/competitionSeason',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            addField() {
-                this.advancedQueryFields.push({
-                    link: 'AND',
-                    name: '',
-                    searchMethod: '=',
-                    value: '',
-                });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/competitionSeason',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
                 }
-            },
-            advancedQuery() {
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
 
-                this.advancedQuerySearchKey = '';
+            this.advancedQuerySearchKey = '';
 
-                if (this.advancedQueryFields.length > 0) {
+            if (this.advancedQueryFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.advancedQueryFields.forEach(item => {
-                        if (item.link && item.name && item.searchMethod && item.value) {
-                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.advancedQuerySearchKey = templist.join('_;');
-                    }
+                    this.advancedQuerySearchKey = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showAdvancedQueryDialog = false;
-            },
-            addSortField() {
-                this.tableSortFields.push({
-                    name: '',
-                    order: 'asc',
-                });
-            },
-            removeSortField(i) {
-                if (this.tableSortFields.length > 0) {
-                    this.tableSortFields.splice(i, 1);
-                }
-            },
-            tableSortQuery() {
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
 
-                this.orderByStr = '';
+            this.orderByStr = '';
 
-                if (this.tableSortFields.length > 0) {
+            if (this.tableSortFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.orderByStr = templist.join('_;');
-                    }
+                    this.orderByStr = templist.join('_;');
                 }
+            }
 
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/competitionSeason/exportExcel?searchKey="
+                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/competitionSeason/del',
+                    data: { id: row.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
                 this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/competitionSeason/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/competitionSeason/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
+        bonusPayment(row) {
+            this.$alert('发放后将无法恢复，确认要发放么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/competitionSeason/bonusPayment',
+                    data: { id: row.id }
                 })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+            }).then(() => {
+                this.$message.success('发放成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('发放取消');
+                } else {
+                    this.$message.error('发放失败');
                 }
+            })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
 
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
-                }
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
 
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
 
-        }
     }
+}
 </script>
 <style lang="less" scoped>
-
 </style>

src/main/vue/src/pages/GameInfo.vue

@@ -15,6 +15,14 @@
             <el-form-item prop="icon" label="图标">
                 <single-upload v-model="formData.icon" :disabled="'icon'==subColumn"></single-upload>
             </el-form-item>
+
+            <el-form-item prop="shortName" label="简称">
+                <el-input v-model="formData.shortName"></el-input>
+            </el-form-item>
+            <el-form-item prop="profile" label="介绍">
+                <el-input v-model="formData.profile"></el-input>
+            </el-form-item>
+
             <el-form-item prop="rank" label="排序">
                 <el-input type="number" v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
             </el-form-item>

src/main/vue/src/pages/MemberCoinSong.vue

@@ -0,0 +1,83 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="userId" label="用户">
+                <template>
+                    <el-select v-model="formData.userId" clearable  filterable  placeholder="请选择">
+                        <el-option v-for="item in userIdOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+            <el-form-item prop="money" label="金额">
+                <el-input v-model="formData.money"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">赠送</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+import formValidator from '../formValidator'
+
+export default {
+    created() {
+
+        this.$http.get({
+            url: '/userInfo/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.userIdOptions.push({ label: item.username, value: item.id });
+                    })
+                }
+            }
+        });
+
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                money: 10
+            },
+            rules: {
+            },
+            subColumn: '',
+            subValue: '',
+            userIdOptions: [],
+        }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            var data = JSON.parse(JSON.stringify(this.formData));
+            this.$http.post({
+                url: '/memberCoin/song',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
+        },
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/MemberCoins.vue

@@ -1,25 +1,26 @@
 <template>
     <div>
         <div class="filters-container">
-        
+
             <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
             </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push({path:'/memberCoin',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
+            <el-button @click="$router.push({path:'/memberCoin',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
             </el-button>
             <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
             </el-button>
+
+            <el-button @click="$router.push({path:'/memberCoinSong',query:{}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">赠送
+            </el-button>
+
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
                     <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
@@ -27,93 +28,41 @@
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
-        <el-table
-                :data="tableData"
-                :height="tableHeight"
-                row-key="id"
-                ref="table">
-            <el-table-column
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+            </el-table-column>
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('gameId')" prop="gameId" label="游戏" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('houseId')" prop="houseId" label="房间" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('userId')" prop="userId" label="用户" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('typeFlag')" prop="typeFlag" label="类型" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('money')" prop="money" label="金额" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('balance')" prop="balance" label="余额" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('seasonId')" prop="seasonId" label="赛季ID" min-width="100">
             </el-table-column>
-            <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
+
+            <el-table-column v-if="isColumnShow('playerId')" prop="playerId" label="选手ID" min-width="100">
             </el-table-column>
-                                                                                                                                                                                                    
-                                            <el-table-column
-                                v-if="isColumnShow('gameId')"
-                                prop="gameId"
-                                label="游戏"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('houseId')"
-                                prop="houseId"
-                                label="房间"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('userId')"
-                                prop="userId"
-                                label="用户"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark')"
-                                prop="remark"
-                                label="备注"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('typeFlag')"
-                                prop="typeFlag"
-                                label="类型"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('money')"
-                                prop="money"
-                                label="金额"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('balance')"
-                                prop="balance"
-                                label="余额"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('seasonId')"
-                                prop="seasonId"
-                                label="赛季ID"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('playerId')"
-                                prop="playerId"
-                                label="选手ID"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="scope">
-                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
             </el-table-column>
@@ -127,15 +76,7 @@
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
-            <el-pagination
-                    background
-                    @size-change="pageSizeChange"
-                    @current-change="currentPageChange"
-                    :current-page="currentPage"
-                    :page-sizes="[10, 20, 30, 40, 50]"
-                    :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="totalNumber">
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
             </el-pagination>
         </div>
         <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
@@ -156,16 +97,14 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
                 <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
                     <template slot-scope="{row}">
                         <el-select v-model="row.searchMethod">
-                            <el-option v-for="item in searchMethods" :label="item" :value="item"
-                                       :key="item"></el-option>
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -195,8 +134,7 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -230,306 +168,305 @@
     </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
-
-    export default {
-        created() {
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: '游戏',
+                    value: 'gameId',
+                    show: true
+                },
+                {
+                    label: '房间',
+                    value: 'houseId',
+                    show: true
+                },
+                {
+                    label: '用户',
+                    value: 'userId',
+                    show: true
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true
+                },
+                {
+                    label: '类型',
+                    value: 'typeFlag',
+                    show: true
+                },
+                {
+                    label: '金额',
+                    value: 'money',
+                    show: true
+                },
+                {
+                    label: '余额',
+                    value: 'balance',
+                    show: true
+                },
+                {
+                    label: '赛季ID',
+                    value: 'seasonId',
+                    show: true
+                },
+                {
+                    label: '选手ID',
+                    value: 'playerId',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: '游戏',
+                    value: 'game_id'
+                },
+                {
+                    label: '房间',
+                    value: 'house_id'
+                },
+                {
+                    label: '用户',
+                    value: 'user_id'
+                },
+                {
+                    label: '备注',
+                    value: 'remark'
+                },
+                {
+                    label: '类型',
+                    value: 'type_flag'
+                },
+                {
+                    label: '金额',
+                    value: 'money'
+                },
+                {
+                    label: '余额',
+                    value: 'balance'
+                },
+                {
+                    label: '赛季ID',
+                    value: 'season_id'
+                },
+                {
+                    label: '选手ID',
+                    value: 'player_id'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
             this.getData();
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
-                                label: '游戏',
-                                value: 'gameId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '房间',
-                                value: 'houseId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '用户',
-                                value: 'userId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark',
-                                show: true
-                            },
-                                                                                                {
-                                label: '类型',
-                                value: 'typeFlag',
-                                show: true
-                            },
-                                                                                                {
-                                label: '金额',
-                                value: 'money',
-                                show: true
-                            },
-                                                                                                {
-                                label: '余额',
-                                value: 'balance',
-                                show: true
-                            },
-                                                                                                {
-                                label: '赛季ID',
-                                value: 'seasonId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '选手ID',
-                                value: 'playerId',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
-                                label: '游戏',
-                                value: 'game_id'
-                            },
-                                                                                                {
-                                label: '房间',
-                                value: 'house_id'
-                            },
-                                                                                                {
-                                label: '用户',
-                                value: 'user_id'
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark'
-                            },
-                                                                                                {
-                                label: '类型',
-                                value: 'type_flag'
-                            },
-                                                                                                {
-                                label: '金额',
-                                value: 'money'
-                            },
-                                                                                                {
-                                label: '余额',
-                                value: 'balance'
-                            },
-                                                                                                {
-                                label: '赛季ID',
-                                value: 'season_id'
-                            },
-                                                                                                {
-                                label: '选手ID',
-                                value: 'player_id'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
             }
-        },
-        methods: {
-            pageSizeChange(size) {
-                this.currentPage = 1;
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-
-                var data = {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                    orderByStr: this.orderByStr,
-                }
 
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
 
-                this.$http.get({
-                    url: '/memberCoin/page',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
-                })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
+            this.$http.get({
+                url: '/memberCoin/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
                 }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/memberCoin',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            addField() {
-                this.advancedQueryFields.push({
-                    link: 'AND',
-                    name: '',
-                    searchMethod: '=',
-                    value: '',
-                });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/memberCoin',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
                 }
-            },
-            advancedQuery() {
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
 
-                this.advancedQuerySearchKey = '';
+            this.advancedQuerySearchKey = '';
 
-                if (this.advancedQueryFields.length > 0) {
+            if (this.advancedQueryFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.advancedQueryFields.forEach(item => {
-                        if (item.link && item.name && item.searchMethod && item.value) {
-                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.advancedQuerySearchKey = templist.join('_;');
-                    }
+                    this.advancedQuerySearchKey = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showAdvancedQueryDialog = false;
-            },
-            addSortField() {
-                this.tableSortFields.push({
-                    name: '',
-                    order: 'asc',
-                });
-            },
-            removeSortField(i) {
-                if (this.tableSortFields.length > 0) {
-                    this.tableSortFields.splice(i, 1);
-                }
-            },
-            tableSortQuery() {
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
 
-                this.orderByStr = '';
+            this.orderByStr = '';
 
-                if (this.tableSortFields.length > 0) {
+            if (this.tableSortFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.orderByStr = templist.join('_;');
-                    }
+                    this.orderByStr = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/memberCoin/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/memberCoin/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/memberCoin/exportExcel?searchKey="
+                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/memberCoin/del',
+                    data: { id: row.id }
                 })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
                 }
+            })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
 
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
-                }
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
 
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
 
-        }
     }
+}
 </script>
 <style lang="less" scoped>
-
 </style>

src/main/vue/src/pages/PlayerInfo.vue

@@ -149,7 +149,7 @@ export default {
                 { label: '未比赛', value: 6 },
                 { label: '比赛超时', value: 7 },
                 { label: '解析完成', value: 8 },
-                { label: '解析失败', value: 9 },
+                { label: '解析无排名', value: 9 },
             ],
             subColumn: '',
             subValue: '',

src/main/vue/src/pages/PlayerInfos.vue

@@ -660,7 +660,7 @@ export default {
                     break;
                 case 9:
                     type = 'info';
-                    label = '解析失败';
+                    label = '解析无排名';
                     break;
                 default:
                     type = 'info';

src/main/vue/src/pages/ProductInfo.vue

@@ -0,0 +1,136 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="productName" label="名称">
+                <el-input v-model="formData.productName" :disabled="'productName'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="money" label="现金">
+                <el-input type="number" v-model="formData.money" :disabled="'money'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="coin" label="余额">
+                <el-input type="number" v-model="formData.coin" :disabled="'coin'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="typeFlag" label="类型">
+                <template>
+                    <el-select v-model="formData.typeFlag" clearable placeholder="请选择" :disabled="'typeFlag'==subColumn">
+                        <el-option v-for="item in typeFlagOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="rank" label="排序">
+                <el-input type="number" v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+import formValidator from '../formValidator'
+
+export default {
+    created() {
+        if (this.$route.query.column) {
+            this.subColumn = this.$route.query.column.split(',')[1];
+            this.subValue = this.$route.query.column.split(',')[0];
+        }
+
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/productInfo/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
+
+
+                    this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+                }
+            })
+        } else {
+            if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
+            }
+        }
+
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                typeFlag: 0
+            },
+            rules: {
+                productName:
+                    [
+                        { required: true, message: '请输入 名称', trigger: 'blur' },
+                    ],
+            },
+            typeFlagOptions: [{                value: 0,
+                label: '充值'
+            }, {
+                value: 1,
+                label: '消费'
+            }],
+            subColumn: '',
+            subValue: '',
+        }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            var data = JSON.parse(JSON.stringify(this.formData));
+            this.$http.post({
+                url: this.formData.id ? '/productInfo/update' : '/productInfo/save',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/productInfo/del',
+                    data: { id: this.formData.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.$router.go(-1);
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/ProductInfos.vue

@@ -0,0 +1,467 @@
+<template>
+    <div>
+        <div class="filters-container">
+
+            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
+            </el-button>
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
+            </el-button>
+            <el-button @click="$router.push({path:'/productInfo',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
+            </el-button>
+            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
+            </el-button>
+            <el-select placeholder="类型" size="small" v-model="filter2" clearable @change="searchData" class="filter-item">
+                <el-option label="充值" value="0">
+                </el-option>
+                <el-option label="消费" value="1">
+                </el-option>
+            </el-select>
+
+            <el-dropdown trigger="click" size="medium" class="table-column-filter">
+                <span>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
+                    </el-checkbox>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+            </el-table-column>
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('id')" prop="id" label="ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('productName')" prop="productName" label="名称" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('money')" prop="money" label="现金" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('coin')" prop="coin" label="余额" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('typeFlag')" :formatter="TypeFlagFormatter" prop="typeFlag" label="类型" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('rank')" prop="rank" label="排序" min-width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="scope">
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '0',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true
+                },
+                {
+                    label: '名称',
+                    value: 'productName',
+                    show: true
+                },
+                {
+                    label: '现金',
+                    value: 'money',
+                    show: true
+                },
+                {
+                    label: '余额',
+                    value: 'coin',
+                    show: true
+                },
+                {
+                    label: '类型',
+                    value: 'typeFlag',
+                    show: true
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true
+                },
+                {
+                    label: '排序',
+                    value: 'rank',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: '',
+                    value: 'id'
+                },
+                {
+                    label: '名称',
+                    value: 'product_name'
+                },
+                {
+                    label: '现金',
+                    value: 'money'
+                },
+                {
+                    label: '余额',
+                    value: 'coin'
+                },
+                {
+                    label: '类型',
+                    value: 'type_flag'
+                },
+                {
+                    label: '备注',
+                    value: 'remark'
+                },
+                {
+                    label: '排序',
+                    value: 'rank'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
+            this.getData();
+        },
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
+        },
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
+                typeFlag: this.filter2,
+            }
+
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
+
+            this.$http.get({
+                url: '/productInfo/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
+                }
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/productInfo',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
+                }
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
+
+            this.advancedQuerySearchKey = '';
+
+            if (this.advancedQueryFields.length > 0) {
+
+                var templist = [];
+
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
+
+                if (templist.length > 0) {
+
+                    this.advancedQuerySearchKey = templist.join('_;');
+                }
+            }
+
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
+
+            this.orderByStr = '';
+
+            if (this.tableSortFields.length > 0) {
+
+                var templist = [];
+
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
+
+                if (templist.length > 0) {
+
+                    this.orderByStr = templist.join('_;');
+                }
+            }
+
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/productInfo/exportExcel?searchKey="
+                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/productInfo/del',
+                    data: { id: row.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
+
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
+
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
+        TypeFlagFormatter(row) {
+            var label = '';
+            switch (row.typeFlag) {
+                case 0:
+                    label = '充值';
+                    break;
+                case 1:
+                    label = '消费';
+                    break;
+                default:
+                    type = 'info';
+                    label = '未知';
+            }
+            return label;
+        },
+
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/Users.vue

@@ -2,24 +2,23 @@
     <div>
         <div class="filters-container">
             <el-input placeholder="用户名" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-            <el-select placeholder="性别" size="small" v-model="filter2" clearable class="filter-item">
-                <el-option
-                    label="女"
-                    value="item1">
+
+            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="$router.push('/user')" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
+            </el-button>
+            <el-button @click="$router.push({path:'/memberCoinSong',query:{}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">赠送积分
+            </el-button>
+            <el-select placeholder="类型" size="small" v-model="filter2" clearable @change="searchData" class="filter-item">
+                <el-option label="用户" value="N">
                 </el-option>
-                <el-option
-                    label="男"
-                    value="item2">
+                <el-option label="管理员" value="Y">
                 </el-option>
             </el-select>
-            <el-button @click="getData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-            </el-button>
-            <el-button @click="$router.push('/user')" type="primary" size="small" icon="el-icon-edit"
-                       class="filter-item">添加
-            </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
                     <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
@@ -27,59 +26,27 @@
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
-        <el-table
-            :data="tableData"
-            :height="tableHeight"
-            row-key="id"
-            ref="table">
-            <el-table-column
-                v-if="multipleMode"
-                align="center"
-                type="selection"
-                width="50">
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
             </el-table-column>
-            <el-table-column
-                type="index"
-                min-width="50"
-                align="center">
+            <el-table-column type="index" min-width="50" align="center">
             </el-table-column>
-            <el-table-column
-                v-if="isColumnShow('username')"
-                prop="username"
-                label="用户名"
-                min-width="300">
+            <el-table-column v-if="isColumnShow('username')" prop="username" label="用户名" min-width="200">
             </el-table-column>
-            <el-table-column
-                v-if="isColumnShow('nickname')"
-                prop="nickname"
-                label="昵称"
-                min-width="300">
+            <el-table-column v-if="isColumnShow('nickname')" prop="nickname" label="昵称" min-width="200">
             </el-table-column>
-            <el-table-column
-                v-if="isColumnShow('icon')"
-                label="头像"
-                min-width="300">
-                <template slot-scope="scope">
-                    <img :src="scope.row.icon"
-                         style="width: 32px;height: 32px;border-radius: 50%;vertical-align: middle;"/>
+            <el-table-column v-if="isColumnShow('icon')" label="头像" min-width="100">
+                <template slot-scope="scope" v-if="scope.row.icon">
+                    <img :src="scope.row.icon" style="width: 32px;height: 32px;border-radius: 50%;vertical-align: middle;" />
                 </template>
             </el-table-column>
-            <el-table-column
-                v-if="isColumnShow('sex')"
-                prop="sex"
-                label="性别"
-                min-width="300">
+            <el-table-column v-if="isColumnShow('sex')" prop="sex" label="性别" min-width="100">
+            </el-table-column>
+            <el-table-column v-if="isColumnShow('phone')" prop="phone" label="手机" min-width="200">
             </el-table-column>
-            <el-table-column
-                v-if="isColumnShow('openId')"
-                prop="openId"
-                label="openId"
-                min-width="300">
+            <el-table-column prop="moneyCoin" label="积分" min-width="100">
             </el-table-column>
-            <el-table-column
-                label="操作"
-                align="center"
-                fixed="right">
+            <el-table-column label="操作" align="center" fixed="right">
                 <template slot-scope="scope">
                     <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                 </template>
@@ -94,118 +61,115 @@
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
-            <el-pagination
-                background
-                @size-change="pageSizeChange"
-                @current-change="currentPageChange"
-                :current-page="currentPage"
-                :page-sizes="[10, 20, 30, 40, 50]"
-                :page-size="pageSize"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="totalNumber">
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
             </el-pagination>
         </div>
     </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
+import { mapState } from 'vuex'
 
-    export default {
-        created() {
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 0,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: 'N',
+            tableColumns: [{
+                label: '用户名',
+                value: 'username',
+                show: true
+            }, {
+                label: '昵称',
+                value: 'nickname',
+                show: true
+            }, {
+                label: '头像',
+                value: 'icon',
+                show: true
+            }, {
+                label: '性别',
+                value: 'sex',
+                show: true
+            }, {
+                label: 'phone',
+                value: 'phone',
+                show: true
+            }],
+            multipleMode: false
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.pageSize = size;
             this.getData();
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 0,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [{
-                    label: '用户名',
-                    value: 'username',
-                    show: true
-                }, {
-                    label: '昵称',
-                    value: 'nickname',
-                    show: true
-                }, {
-                    label: '头像',
-                    value: 'icon',
-                    show: true
-                }, {
-                    label: '性别',
-                    value: 'sex',
-                    show: true
-                }, {
-                    label: 'openId',
-                    value: 'openId',
-                    show: true
-                }],
-                multipleMode: false
-            }
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        getData() {
+            this.$http.get({
+                url: '/userInfo/page',
+                data: {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize,
+                    adminFlag: this.filter2,
+                    searchKey: this.filter1,
+                }
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
+                }
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
             }
         },
-        methods: {
-            pageSizeChange(size) {
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-                this.$http.get({
-                    url: '/userInfo/page',
-                    data: {
-                        currentPage: this.currentPage,
-                        pageNumber: this.pageSize
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
-                })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
+        editRow(row) {
+            this.$router.push({
+                path: '/user',
+                query: {
+                    id: row.id
                 }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/user',
-                    query: {
-                        id: row.id
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            }
-        }
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
     }
+}
 </script>
 <style lang="less" scoped>
-
 </style>

src/main/vue/src/router/index.js

@@ -7,355 +7,370 @@ Vue.use(Router);
 
 const router = new Router({
     routes: [{
+        path: '/',
+        component: () =>
+            import('../pages/App'),
+        children: [{
             path: '/',
+            redirect: 'dashboard'
+        },
+        {
+            path: '/404',
+            name: '404',
             component: () =>
-                import ('../pages/App'),
-            children: [{
-                    path: '/',
-                    redirect: 'dashboard'
-                },
-                {
-                    path: '/404',
-                    name: '404',
-                    component: () =>
-                        import ('../pages/404')
-                },
-                {
-                    path: '/dashboard',
-                    name: 'dashboard',
-                    component: () =>
-                        import ('../pages/Dashboard')
-                },
-                {
-                    path: '/users',
-                    name: 'users',
-                    component: () =>
-                        import ('../pages/Users')
-                },
-                {
-                    path: '/user',
-                    name: 'user',
-                    component: () =>
-                        import ('../pages/User')
-                },
-                {
-                    path: '/menus',
-                    name: 'menus',
-                    component: () =>
-                        import ('../pages/Menus')
-                },
-                {
-                    path: '/roles',
-                    name: 'roles',
-                    component: () =>
-                        import ('../pages/Roles')
-                },
-                {
-                    path: '/role',
-                    name: 'role',
-                    component: () =>
-                        import ('../pages/Role')
-                },
-                {
-                    path: '/api',
-                    name: 'api',
-                    component: () =>
-                        import ('../pages/Api')
-                },
-                {
-                    path: '/genCodes',
-                    name: 'genCodes',
-                    component: () =>
-                        import ('../pages/GenCodes')
-                },
-                {
-                    path: '/genCode',
-                    name: 'genCode',
-                    component: () =>
-                        import ('../pages/GenCode')
-                },
-                {
-                    path: '/permissions',
-                    name: 'permissions',
-                    component: () =>
-                        import ('../pages/Permissions')
-                },
-                {
-                    path: '/permission',
-                    name: 'permission',
-                    component: () =>
-                        import ('../pages/Permission')
-                },
-                {
-                    path: '/departs',
-                    name: 'departs',
-                    component: () =>
-                        import ('../pages/Departs')
-                },
-                {
-                    path: '/lineChart',
-                    name: 'lineChart',
-                    component: () =>
-                        import ('../pages/LineChart')
-                },
-                {
-                    path: '/barChart',
-                    name: 'barChart',
-                    component: () =>
-                        import ('../pages/BarChart')
-                },
-                {
-                    path: '/polarAreaChart',
-                    name: 'polarAreaChart',
-                    component: () =>
-                        import ('../pages/PolarAreaChart')
-                },
-                {
-                    path: '/pieChart',
-                    name: 'pieChart',
-                    component: () =>
-                        import ('../pages/PieChart')
-                },
-                {
-                    path: '/radarChart',
-                    name: 'radarChart',
-                    component: () =>
-                        import ('../pages/RadarChart')
-                },
-                {
-                    path: '/bubbleChart',
-                    name: 'bubbleChart',
-                    component: () =>
-                        import ('../pages/BubbleChart')
-                },
-                {
-                    path: '/processModels',
-                    name: 'processModels',
-                    component: () =>
-                        import ('../pages/ProcessModels')
-                },
-                {
-                    path: '/processDefinitions',
-                    name: 'processDefinitions',
-                    component: () =>
-                        import ('../pages/ProcessDefinitions')
-                },
-                {
-                    path: '/myProcesses',
-                    name: 'myProcesses',
-                    component: () =>
-                        import ('../pages/MyProcesses')
-                },
-                {
-                    path: '/myTasks',
-                    name: 'myTasks',
-                    component: () =>
-                        import ('../pages/MyTasks')
-                },
-                {
-                    path: '/completeTaskDynamic',
-                    name: 'CompleteTaskDynamic',
-                    component: () =>
-                        import ('../pages/CompleteTaskDynamic')
-                },
-                {
-                    path: '/commonQuerys',
-                    name: 'commonQuerys',
-                    component: () =>
-                        import ('../pages/CommonQuerys')
-                },
-                {
-                    path: '/commonQuery',
-                    name: 'commonQuery',
-                    component: () =>
-                        import ('../pages/CommonQuery')
-                },
-                {
-                    path: '/commonIframe',
-                    name: 'commonIframe',
-                    component: () =>
-                        import ('../pages/CommonIframe')
-                },
-                {
-                    path: '/queryConfigs',
-                    name: 'queryConfigs',
-                    component: () =>
-                        import ('../pages/QueryConfigs')
-                },
-                {
-                    path: '/queryConfig',
-                    name: 'queryConfig',
-                    component: () =>
-                        import ('../pages/QueryConfig')
-                },
-                {
-                    path: '/dataSourceInfos',
-                    name: 'dataSourceInfos',
-                    component: () =>
-                        import ('../pages/DataSourceInfos')
-                },
-                {
-                    path: '/dataSourceInfo',
-                    name: 'dataSourceInfo',
-                    component: () =>
-                        import ('../pages/DataSourceInfo')
-                },
-                {
-                    path: '/deploySystem',
-                    name: 'DeploySystem',
-                    component: () =>
-                        import ('../pages/DeploySystem')
-                },
-                {
-                    path: '/myCanvas',
-                    name: 'MyCanvas',
-                    component: () =>
-                        import ('../pages/MyCanvas')
-                },
-                {
-                    path: '/houseInfo',
-                    name: 'HouseInfo',
-                    component: () => import('../pages/HouseInfo')
-                },
-                {
-                    path: '/houseInfos',
-                    name: 'HouseInfos',
-                    component: () => import('../pages/HouseInfos')
-                },
-                {
-                    path: '/houseLevel',
-                    name: 'HouseLevel',
-                    component: () => import('../pages/HouseLevel')
-                },
-                {
-                    path: '/houseLevels',
-                    name: 'HouseLevels',
-                    component: () => import('../pages/HouseLevels')
-                },
-                {
-                    path: '/bannerInfo',
-                    name: 'BannerInfo',
-                    component: () => import('../pages/BannerInfo')
-                },
-                {
-                    path: '/bannerInfos',
-                    name: 'BannerInfos',
-                    component: () => import('../pages/BannerInfos')
-                },
-                {
-                    path: '/gameInfo',
-                    name: 'GameInfo',
-                    component: () => import('../pages/GameInfo')
-                },
-                {
-                    path: '/gameInfos',
-                    name: 'GameInfos',
-                    component: () => import('../pages/GameInfos')
-                },
-                {
-                    path: '/playerInfo',
-                    name: 'PlayerInfo',
-                    component: () => import('../pages/PlayerInfo')
-                },
-                {
-                    path: '/playerInfos',
-                    name: 'PlayerInfos',
-                    component: () => import('../pages/PlayerInfos')
-                },
-                {
-                    path: '/memberCoin',
-                    name: 'MemberCoin',
-                    component: () => import('../pages/MemberCoin')
-                },
-                {
-                    path: '/memberCoins',
-                    name: 'MemberCoins',
-                    component: () => import('../pages/MemberCoins')
-                },
-                {
-                    path: '/platformIncomeRecord',
-                    name: 'PlatformIncomeRecord',
-                    component: () => import('../pages/PlatformIncomeRecord')
-                },
-                {
-                    path: '/platformIncomeRecords',
-                    name: 'PlatformIncomeRecords',
-                    component: () => import('../pages/PlatformIncomeRecords')
-                },
-                {
-                    path: '/systemNotice',
-                    name: 'SystemNotice',
-                    component: () => import('../pages/SystemNotice')
-                },
-                {
-                    path: '/systemNotices',
-                    name: 'SystemNotices',
-                    component: () => import('../pages/SystemNotices')
-                },
-                {
-                    path: '/rechargeRecord',
-                    name: 'RechargeRecord',
-                    component: () => import('../pages/RechargeRecord')
-                },
-                {
-                    path: '/rechargeRecords',
-                    name: 'RechargeRecords',
-                    component: () => import('../pages/RechargeRecords')
-                },
-                {
-                    path: '/memberCoinTixian',
-                    name: 'MemberCoinTixian',
-                    component: () => import('../pages/MemberCoinTixian')
-                },
-                {
-                    path: '/memberCoinTixians',
-                    name: 'MemberCoinTixians',
-                    component: () => import('../pages/MemberCoinTixians')
-                },
-                {
-                    path: '/competitionSeason',
-                    name: 'CompetitionSeason',
-                    component: () => import('../pages/CompetitionSeason')
-                },
-                {
-                    path: '/competitionSeasons',
-                    name: 'CompetitionSeasons',
-                    component: () => import('../pages/CompetitionSeasons')
-                },
-                {
-                    path: '/bonusRecord',
-                    name: 'BonusRecord',
-                    component: () => import('../pages/BonusRecord')
-                },
-                {
-                    path: '/bonusRecords',
-                    name: 'BonusRecords',
-                    component: () => import('../pages/BonusRecords')
-                },
-                {
-                    path: '/videoTest',
-                    name: 'VideoTest',
-                    component: () => import('../pages/VideoTest')
-                },
-                {
-                    path: '/bindGame',
-                    name: 'BindGame',
-                    component: () => import('../pages/BindGame')
+                import('../pages/404')
+        },
+        {
+            path: '/dashboard',
+            name: 'dashboard',
+            component: () =>
+                import('../pages/Dashboard')
+        },
+        {
+            path: '/users',
+            name: 'users',
+            component: () =>
+                import('../pages/Users')
+        },
+        {
+            path: '/user',
+            name: 'user',
+            component: () =>
+                import('../pages/User')
+        },
+        {
+            path: '/menus',
+            name: 'menus',
+            component: () =>
+                import('../pages/Menus')
+        },
+        {
+            path: '/roles',
+            name: 'roles',
+            component: () =>
+                import('../pages/Roles')
+        },
+        {
+            path: '/role',
+            name: 'role',
+            component: () =>
+                import('../pages/Role')
+        },
+        {
+            path: '/api',
+            name: 'api',
+            component: () =>
+                import('../pages/Api')
+        },
+        {
+            path: '/genCodes',
+            name: 'genCodes',
+            component: () =>
+                import('../pages/GenCodes')
+        },
+        {
+            path: '/genCode',
+            name: 'genCode',
+            component: () =>
+                import('../pages/GenCode')
+        },
+        {
+            path: '/permissions',
+            name: 'permissions',
+            component: () =>
+                import('../pages/Permissions')
+        },
+        {
+            path: '/permission',
+            name: 'permission',
+            component: () =>
+                import('../pages/Permission')
+        },
+        {
+            path: '/departs',
+            name: 'departs',
+            component: () =>
+                import('../pages/Departs')
+        },
+        {
+            path: '/lineChart',
+            name: 'lineChart',
+            component: () =>
+                import('../pages/LineChart')
+        },
+        {
+            path: '/barChart',
+            name: 'barChart',
+            component: () =>
+                import('../pages/BarChart')
+        },
+        {
+            path: '/polarAreaChart',
+            name: 'polarAreaChart',
+            component: () =>
+                import('../pages/PolarAreaChart')
+        },
+        {
+            path: '/pieChart',
+            name: 'pieChart',
+            component: () =>
+                import('../pages/PieChart')
+        },
+        {
+            path: '/radarChart',
+            name: 'radarChart',
+            component: () =>
+                import('../pages/RadarChart')
+        },
+        {
+            path: '/bubbleChart',
+            name: 'bubbleChart',
+            component: () =>
+                import('../pages/BubbleChart')
+        },
+        {
+            path: '/processModels',
+            name: 'processModels',
+            component: () =>
+                import('../pages/ProcessModels')
+        },
+        {
+            path: '/processDefinitions',
+            name: 'processDefinitions',
+            component: () =>
+                import('../pages/ProcessDefinitions')
+        },
+        {
+            path: '/myProcesses',
+            name: 'myProcesses',
+            component: () =>
+                import('../pages/MyProcesses')
+        },
+        {
+            path: '/myTasks',
+            name: 'myTasks',
+            component: () =>
+                import('../pages/MyTasks')
+        },
+        {
+            path: '/completeTaskDynamic',
+            name: 'CompleteTaskDynamic',
+            component: () =>
+                import('../pages/CompleteTaskDynamic')
+        },
+        {
+            path: '/commonQuerys',
+            name: 'commonQuerys',
+            component: () =>
+                import('../pages/CommonQuerys')
+        },
+        {
+            path: '/commonQuery',
+            name: 'commonQuery',
+            component: () =>
+                import('../pages/CommonQuery')
+        },
+        {
+            path: '/commonIframe',
+            name: 'commonIframe',
+            component: () =>
+                import('../pages/CommonIframe')
+        },
+        {
+            path: '/queryConfigs',
+            name: 'queryConfigs',
+            component: () =>
+                import('../pages/QueryConfigs')
+        },
+        {
+            path: '/queryConfig',
+            name: 'queryConfig',
+            component: () =>
+                import('../pages/QueryConfig')
+        },
+        {
+            path: '/dataSourceInfos',
+            name: 'dataSourceInfos',
+            component: () =>
+                import('../pages/DataSourceInfos')
+        },
+        {
+            path: '/dataSourceInfo',
+            name: 'dataSourceInfo',
+            component: () =>
+                import('../pages/DataSourceInfo')
+        },
+        {
+            path: '/deploySystem',
+            name: 'DeploySystem',
+            component: () =>
+                import('../pages/DeploySystem')
+        },
+        {
+            path: '/myCanvas',
+            name: 'MyCanvas',
+            component: () =>
+                import('../pages/MyCanvas')
+        },
+        {
+            path: '/houseInfo',
+            name: 'HouseInfo',
+            component: () => import('../pages/HouseInfo')
+        },
+        {
+            path: '/houseInfos',
+            name: 'HouseInfos',
+            component: () => import('../pages/HouseInfos')
+        },
+        {
+            path: '/houseLevel',
+            name: 'HouseLevel',
+            component: () => import('../pages/HouseLevel')
+        },
+        {
+            path: '/houseLevels',
+            name: 'HouseLevels',
+            component: () => import('../pages/HouseLevels')
+        },
+        {
+            path: '/bannerInfo',
+            name: 'BannerInfo',
+            component: () => import('../pages/BannerInfo')
+        },
+        {
+            path: '/bannerInfos',
+            name: 'BannerInfos',
+            component: () => import('../pages/BannerInfos')
+        },
+        {
+            path: '/gameInfo',
+            name: 'GameInfo',
+            component: () => import('../pages/GameInfo')
+        },
+        {
+            path: '/gameInfos',
+            name: 'GameInfos',
+            component: () => import('../pages/GameInfos')
+        },
+        {
+            path: '/playerInfo',
+            name: 'PlayerInfo',
+            component: () => import('../pages/PlayerInfo')
+        },
+        {
+            path: '/playerInfos',
+            name: 'PlayerInfos',
+            component: () => import('../pages/PlayerInfos')
+        },
+        {
+            path: '/memberCoin',
+            name: 'MemberCoin',
+            component: () => import('../pages/MemberCoin')
+        },
+        {
+            path: '/memberCoinSong',
+            name: 'MemberCoinSong',
+            component: () => import('../pages/MemberCoinSong')
+        },
+        {
+            path: '/memberCoins',
+            name: 'MemberCoins',
+            component: () => import('../pages/MemberCoins')
+        },
+        {
+            path: '/platformIncomeRecord',
+            name: 'PlatformIncomeRecord',
+            component: () => import('../pages/PlatformIncomeRecord')
+        },
+        {
+            path: '/platformIncomeRecords',
+            name: 'PlatformIncomeRecords',
+            component: () => import('../pages/PlatformIncomeRecords')
+        },
+        {
+            path: '/systemNotice',
+            name: 'SystemNotice',
+            component: () => import('../pages/SystemNotice')
+        },
+        {
+            path: '/systemNotices',
+            name: 'SystemNotices',
+            component: () => import('../pages/SystemNotices')
+        },
+        {
+            path: '/rechargeRecord',
+            name: 'RechargeRecord',
+            component: () => import('../pages/RechargeRecord')
+        },
+        {
+            path: '/rechargeRecords',
+            name: 'RechargeRecords',
+            component: () => import('../pages/RechargeRecords')
+        },
+        {
+            path: '/memberCoinTixian',
+            name: 'MemberCoinTixian',
+            component: () => import('../pages/MemberCoinTixian')
+        },
+        {
+            path: '/memberCoinTixians',
+            name: 'MemberCoinTixians',
+            component: () => import('../pages/MemberCoinTixians')
+        },
+        {
+            path: '/competitionSeason',
+            name: 'CompetitionSeason',
+            component: () => import('../pages/CompetitionSeason')
+        },
+        {
+            path: '/competitionSeasons',
+            name: 'CompetitionSeasons',
+            component: () => import('../pages/CompetitionSeasons')
+        },
+        {
+            path: '/bonusRecord',
+            name: 'BonusRecord',
+            component: () => import('../pages/BonusRecord')
+        },
+        {
+            path: '/bonusRecords',
+            name: 'BonusRecords',
+            component: () => import('../pages/BonusRecords')
+        },
+        {
+            path: '/videoTest',
+            name: 'VideoTest',
+            component: () => import('../pages/VideoTest')
+        },
+        {
+            path: '/bindGame',
+            name: 'BindGame',
+            component: () => import('../pages/BindGame')
+        },
+        {
+            path: '/bindGames',
+            name: 'BindGames',
+            component: () => import('../pages/BindGames')
+        },
+            {
+                    path: '/productInfo',
+                    name: 'ProductInfo',
+                    component: () => import('../pages/ProductInfo')
                 },
                 {
-                    path: '/bindGames',
-                    name: 'BindGames',
-                    component: () => import('../pages/BindGames')
+                    path: '/productInfos',
+                    name: 'ProductInfos',
+                    component: () => import('../pages/ProductInfos')
                 }
                 /**INSERT_LOCATION**/
-            ]
-        },
-        {
-            path: '/login',
-            name: 'login',
-            component: () =>
-                import ('../pages/Login')
-        }
+        ]
+    },
+    {
+        path: '/login',
+        name: 'login',
+        component: () =>
+            import('../pages/Login')
+    }
     ]
 });
 router.beforeEach((to, from, next) => {