a版本同步

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

@@ -258,20 +258,23 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                 String content = "";
                 int typeFlag = AppConstant.NoticeType.RESULT;
 
-                if (AppConstant.PlayerStatus.PROCESSED_FAIL == playerInfo.getStatusFlag()) {
+//                if (AppConstant.PlayerStatus.PROCESSED_FAIL == playerInfo.getStatusFlag()) {
+//
+//                    content = "很遗憾，你在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
+//                            + "开始的游戏竞赛 [" + houseInfo.getHouseName()
+//                            + "]，[无有效结果]，无法获得奖励，该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
+//                    typeFlag = AppConstant.NoticeType.FAIL;
+//                } else
 
-                    content = "很遗憾，你在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
-                            + "开始的游戏竞赛 [" + houseInfo.getHouseName()
-                            + "]，[无有效结果]，无法获得奖励，该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
-                    typeFlag = AppConstant.NoticeType.FAIL;
-                } else if (AppConstant.PlayerStatus.OVERTIME == playerInfo.getStatusFlag()) {
+                if (AppConstant.PlayerStatus.OVERTIME == playerInfo.getStatusFlag()) {
                     content = "很遗憾，你在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
                             + "开始的游戏竞赛 [" + houseInfo.getHouseName()
                             + "]，[比赛超时]，无法获得奖励，该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
                     typeFlag = AppConstant.NoticeType.OVERTIME;
                 } else {
                     if (houseInfo.getScoreType() == 0) {//评分模式
-                        if (playerInfo.getRanking() != null && playerInfo.getRanking() > 0 && i < 3) {//只有成绩才能获得奖励
+//                        if (playerInfo.getRanking() != null && playerInfo.getRanking() > 0 && i < 3) {//只有成绩才能获得奖励
+                        if (i < 3) {//只有成绩才能获得奖励
 
                             if (i == 0) {//第一名 金牌
                                 playerInfo.setMedal(AppConstant.Medals.GOLD);

src/main/vue/src/pages/HouseInfos.vue

@@ -16,9 +16,9 @@
             <el-button @click="updateToAnalysis" type="primary" size="small" icon="el-icon-share" class="filter-item">检测解析完成
             </el-button>
             <el-select placeholder="评分方式" size="small" v-model="filter2" clearable @change="searchData" class="filter-item">
-                <el-option label="吃鸡奖励" value="0">
+                <el-option label="吃鸡奖励" value="1">
                 </el-option>
-                <el-option label="评分排名" value="1">
+                <el-option label="评分排名" value="0">
                 </el-option>
             </el-select>