.

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

@@ -1441,7 +1441,10 @@
                player_info.ranking,
                player_info.score,
                player_info.house_id,
-               player_info.status_flag
+               player_info.status_flag,
+               player_info.competition_id,
+               player_info.season_id,
+               player_info.house_rank
         FROM player_info,
              (SELECT @curRank := 0) p
         WHERE player_info.house_id = #{houseId}

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

@@ -23,7 +23,8 @@
     </resultMap>
     <sql id="Base_Column_List">
         <!--generatedStart-->
-        id, del_flag, update_time, update_user, create_time, create_user, game_id, house_id, user_id, remark, type_flag, status_flag, content, season_id, player_id, competition_id        <!--generatedEnd-->
+        id, del_flag, update_time, update_user, create_time, create_user, game_id, house_id, user_id, remark, type_flag,
+        status_flag, content, season_id, player_id, competition_id        <!--generatedEnd-->
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
@@ -32,8 +33,9 @@
         where id = #{id,jdbcType=INTEGER}
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from system_notice
-        where id = #{id,jdbcType=INTEGER}
+        DELETE
+        FROM system_notice
+        WHERE id = #{id,jdbcType=INTEGER}
     </delete>
     <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.SystemNotice" useGeneratedKeys="true"
             keyProperty="id">
@@ -659,6 +661,10 @@
                      javaType="com.izouma.awesomeadmin.model.HouseInfo"
                      select="com.izouma.awesomeadmin.dao.HouseInfoMapper.getHouseInfoPlayerNum"
                      column="{ id = user_id }"/>
+        <association property="competitionInfo"
+                     javaType="Competition"
+                     select="com.izouma.awesomeadmin.dao.CompetitionMapper.selectByPrimaryKey"
+                     column="competition_id"/>
 
     </resultMap>
 

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

@@ -43,11 +43,12 @@ public class SystemNotice {
     private String orderByStr;
     /*generatedEnd*/
 
-    private GameInfo   gameInfo;
-    private UserInfo   userInfo;
-    private HouseInfo  houseInfo;
-    private PlayerInfo playerInfo;
-    private BigDecimal bonus;
+    private GameInfo    gameInfo;
+    private UserInfo    userInfo;
+    private HouseInfo   houseInfo;
+    private PlayerInfo  playerInfo;
+    private BigDecimal  bonus;
+    private Competition competitionInfo;
 
     /*generatedStart*/
     public Integer getId() {
@@ -250,5 +251,13 @@ public class SystemNotice {
     public void setBonus(BigDecimal bonus) {
         this.bonus = bonus;
     }
+
+    public Competition getCompetitionInfo() {
+        return competitionInfo;
+    }
+
+    public void setCompetitionInfo(Competition competitionInfo) {
+        this.competitionInfo = competitionInfo;
+    }
 }
 

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

@@ -203,17 +203,17 @@ public class CompetitionServiceImpl implements CompetitionService {
 
                 if (bonus > 0) {
                     content = "恭喜你，在" + competition.getCompetitionName()
-                            + " 取得第" + participatingInfo.getRank()
+                            + " 取得第" + participatingInfoList.get(i).getRank()
                             + "名，获得" + bonus + "金币，赶快领取你的奖励吧。";
                 } else {
                     content = "很遗憾，你在" + competition.getCompetitionName()
-                            + " 取得第" + participatingInfo.getRank()
+                            + " 取得第" + participatingInfoList.get(i).getRank()
                             + "名，未能获得金币，请再接再厉。";
                 }
 
                 SystemNotice systemNotice = new SystemNotice();
                 systemNotice.setGameId(competition.getGameId());
-                systemNotice.setUserId(participatingInfo.getUserId());
+                systemNotice.setUserId(participatingInfoList.get(i).getUserId());
                 systemNotice.setCompetitionId(competition.getId());
                 systemNotice.setRemark("联赛奖金发放");
                 systemNotice.setContent(content);
@@ -223,7 +223,7 @@ public class CompetitionServiceImpl implements CompetitionService {
                 systemNoticeService.createSystemNotice(systemNotice);
                 try {
                     UserInfo userInfo = new UserInfo();
-                    userInfo.setId(participatingInfo.getUserId());
+                    userInfo.setId(participatingInfoList.get(i).getUserId());
                     userInfo = userInfoService.getSingleUserInfo(userInfo);
                     if (userInfo != null) {
                         if ("Y".equals(userInfo.getNoticeFlag())) {

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

@@ -271,6 +271,9 @@ public class HouseInfoServiceImpl implements HouseInfoService {
             //更新为结算完成状态。
             houseInfo.setStatusFlag(AppConstant.HouseStatus.SETTLEMENT);
             houseInfoMapper.updateByPrimaryKeySelective(houseInfo);
+
+            //更新联赛排名
+            participatingInfoService.updateRank(houseInfo.getCompetitionId());
         } catch (Exception e) {
             logger.error(e);
         }

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

@@ -55,7 +55,7 @@ public class CompetitionController {
     public Result page(Page page, Competition record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<Competition> pp =competitionService.getCompetitionByPage(page, record);
+        List<Competition> pp = competitionService.getCompetitionByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -67,7 +67,7 @@ public class CompetitionController {
     public Result save(Competition record) {
         boolean num = competitionService.createCompetition(record);
         if (num) {
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
@@ -77,7 +77,7 @@ public class CompetitionController {
     public Result updateCompetition(Competition record) {
         boolean num = competitionService.updateCompetition(record);
         if (num) {
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
@@ -88,7 +88,7 @@ public class CompetitionController {
 
         boolean num = competitionService.deleteCompetition(record);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
@@ -103,26 +103,26 @@ public class CompetitionController {
         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[competitions.size()][14];
 
         for (int i = 0; i < competitions.size(); i++) {
-                        dataList[i][0] = String.valueOf(competitions.get(i).getId());
-                        dataList[i][1] = String.valueOf(competitions.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(competitions.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(competitions.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(competitions.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(competitions.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(competitions.get(i).getCompetitionName());
-                        dataList[i][7] = String.valueOf(competitions.get(i).getStartTime());
-                        dataList[i][8] = String.valueOf(competitions.get(i).getEndTime());
-                        dataList[i][9] = String.valueOf(competitions.get(i).getType());
-                        dataList[i][10] = String.valueOf(competitions.get(i).getBonus());
-                        dataList[i][11] = String.valueOf(competitions.get(i).getStatus());
-                        dataList[i][12] = String.valueOf(competitions.get(i).getIntro());
-                        dataList[i][13] = String.valueOf(competitions.get(i).getGameId());
-                    }
+            dataList[i][0] = String.valueOf(competitions.get(i).getId());
+            dataList[i][1] = String.valueOf(competitions.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(competitions.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(competitions.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(competitions.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(competitions.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(competitions.get(i).getCompetitionName());
+            dataList[i][7] = String.valueOf(competitions.get(i).getStartTime());
+            dataList[i][8] = String.valueOf(competitions.get(i).getEndTime());
+            dataList[i][9] = String.valueOf(competitions.get(i).getType());
+            dataList[i][10] = String.valueOf(competitions.get(i).getBonus());
+            dataList[i][11] = String.valueOf(competitions.get(i).getStatus());
+            dataList[i][12] = String.valueOf(competitions.get(i).getIntro());
+            dataList[i][13] = String.valueOf(competitions.get(i).getGameId());
+        }
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
                 columnNumber, columnWidth, columnName, dataList, response);
@@ -143,5 +143,11 @@ public class CompetitionController {
         }
         return new Result(false, "失败");
     }
+
+    @RequestMapping("settlementCompetition")
+    @ResponseBody
+    public Result settlementCompetition(@RequestParam("competitionId") Integer competitionId) {
+        return competitionService.settlementCompetition(competitionId);
+    }
 }
 

src/main/vue/src/pages/Competitions.vue

@@ -1,7 +1,7 @@
 <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>
@@ -28,87 +28,90 @@
             </el-dropdown>
         </div>
         <el-table
-                :data="tableData"
-                :height="tableHeight"
-                row-key="id"
-                ref="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('competitionName')"
+                prop="competitionName"
+                label="赛事名称"
+                min-width="100">
+            </el-table-column>
+
             <el-table-column
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
+                v-if="isColumnShow('startTime')"
+                prop="startTime"
+                label="开始时间"
+                :formatter="DateTimeFormatter"
+                min-width="100">
             </el-table-column>
+
             <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
+                v-if="isColumnShow('endTime')"
+                prop="endTime"
+                label="结束时间"
+                :formatter="DateTimeFormatter"
+                min-width="100">
             </el-table-column>
-                                                                                                                                                                                                    
-                                            <el-table-column
-                                v-if="isColumnShow('competitionName')"
-                                prop="competitionName"
-                                label="赛事名称"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('startTime')"
-                                prop="startTime"
-                                label="开始时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('endTime')"
-                                prop="endTime"
-                                label="结束时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('type')"
-                                prop="type"
-                                label="赛事类型"
-                                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('status')"
-                                prop="status"
-                                label="状态"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('intro')"
-                                prop="intro"
-                                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
+                v-if="isColumnShow('type')"
+                prop="type"
+                label="赛事类型"
+                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('status')"
+                prop="status"
+                label="状态"
+                min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                v-if="isColumnShow('intro')"
+                prop="intro"
+                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"
             >
                 <template slot-scope="scope">
-                                        <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="settlement(scope.row)" type="primary" size="mini" plain
+                               :loading="scope.row.id === settlementId" v-if="scope.row.status===1">结算
+                    </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>
@@ -123,14 +126,14 @@
                 </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">
+                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">
@@ -244,47 +247,47 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
-                                label: '赛事名称',
-                                value: 'competitionName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '开始时间',
-                                value: 'startTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '结束时间',
-                                value: 'endTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '赛事类型',
-                                value: 'type',
-                                show: true
-                            },
-                                                                                                {
-                                label: '奖金',
-                                value: 'bonus',
-                                show: true
-                            },
-                                                                                                {
-                                label: '状态',
-                                value: 'status',
-                                show: true
-                            },
-                                                                                                {
-                                label: '介绍',
-                                value: 'intro',
-                                show: true
-                            },
-                                                                                                {
-                                label: '游戏',
-                                value: 'gameId',
-                                show: true
-                            },
-                                                            ],
+                    {
+                        label: '赛事名称',
+                        value: 'competitionName',
+                        show: true
+                    },
+                    {
+                        label: '开始时间',
+                        value: 'startTime',
+                        show: true
+                    },
+                    {
+                        label: '结束时间',
+                        value: 'endTime',
+                        show: true
+                    },
+                    {
+                        label: '赛事类型',
+                        value: 'type',
+                        show: true
+                    },
+                    {
+                        label: '奖金',
+                        value: 'bonus',
+                        show: true
+                    },
+                    {
+                        label: '状态',
+                        value: 'status',
+                        show: true
+                    },
+                    {
+                        label: '介绍',
+                        value: 'intro',
+                        show: true
+                    },
+                    {
+                        label: '游戏',
+                        value: 'gameId',
+                        show: true
+                    },
+                ],
                 multipleMode: false,
                 showAdvancedQueryDialog: false,
                 advancedQueryFields: [],
@@ -292,43 +295,44 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
-                                label: '赛事名称',
-                                value: 'competition_name'
-                            },
-                                                                                                {
-                                label: '开始时间',
-                                value: 'start_time'
-                            },
-                                                                                                {
-                                label: '结束时间',
-                                value: 'end_time'
-                            },
-                                                                                                {
-                                label: '赛事类型',
-                                value: 'type'
-                            },
-                                                                                                {
-                                label: '奖金',
-                                value: 'bonus'
-                            },
-                                                                                                {
-                                label: '状态',
-                                value: 'status'
-                            },
-                                                                                                {
-                                label: '介绍',
-                                value: 'intro'
-                            },
-                                                                                                {
-                                label: '游戏',
-                                value: 'game_id'
-                            },
-                                                            ],
+                    {
+                        label: '赛事名称',
+                        value: 'competition_name'
+                    },
+                    {
+                        label: '开始时间',
+                        value: 'start_time'
+                    },
+                    {
+                        label: '结束时间',
+                        value: 'end_time'
+                    },
+                    {
+                        label: '赛事类型',
+                        value: 'type'
+                    },
+                    {
+                        label: '奖金',
+                        value: 'bonus'
+                    },
+                    {
+                        label: '状态',
+                        value: 'status'
+                    },
+                    {
+                        label: '介绍',
+                        value: 'intro'
+                    },
+                    {
+                        label: '游戏',
+                        value: 'game_id'
+                    },
+                ],
                 advancedQuerySearchKey: '',
                 orderByStr: '',
                 imgSrc: '',
                 imageDialogVisible: false,
+                settlementId: ''
             }
         },
         computed: {
@@ -474,7 +478,7 @@
             },
             exportExcel() {
                 window.location.href = this.$baseUrl + "/competition/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
+                    + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
             },
             searchData() {
                 this.currentPage = 1;
@@ -513,7 +517,25 @@
                 this.imgSrc = img;
                 this.imageDialogVisible = true;
             },
-
+            settlement(row) {
+                this.settlementId = row.id;
+                this.$http.get({
+                    url: 'competition/settlementCompetition',
+                    data: {
+                        competitionId: row.id
+                    }
+                }).then(res => {
+                    this.settlementId = '';
+                    if (res.success) {
+                        this.$message.success("成功");
+                        this.getData()
+                    } else {
+                        this.$message.error(res.error);
+                    }
+                }).catch(() => {
+                    this.settlementId = '';
+                })
+            }
         }
     }
 </script>