suochencheng 7 лет назад
Родитель
Сommit
7a5887b2ef

+ 11 - 0
src/main/java/com/izouma/awesomeadmin/constant/AppConstant.java

@@ -469,6 +469,17 @@ public interface AppConstant {
          */
         Integer SEASON_BONUS = 3;
 
+        /**
+         * 比赛解析失败
+         */
+        Integer FAIL = 4;
+
+        /**
+         * 比赛超时
+         */
+        Integer OVERTIME = 5;
+
+
     }
 
     /**

+ 22 - 16
src/main/java/com/izouma/awesomeadmin/service/impl/HouseInfoServiceImpl.java

@@ -267,14 +267,14 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                             if (AppConstant.PlayerStatus.PROCESSED_FAIL == playerInfo.getStatusFlag()) {
 
                                 content = "很遗憾,你在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
-                                        + "开始的游戏竞赛 " + houseInfo.getHouseName()
-                                        + ",无有效结果,无法获得奖励。";
-                                typeFlag = AppConstant.NoticeType.RESULT;
+                                        + "开始的游戏竞赛 [" + houseInfo.getHouseName()
+                                        + "][无有效结果],无法获得奖励,该局参赛人数["+ houseInfo.getPlayerNumber() + "]人。";
+                                typeFlag = AppConstant.NoticeType.FAIL;
                             } else if (AppConstant.PlayerStatus.OVERTIME == playerInfo.getStatusFlag()) {
                                 content = "很遗憾,你在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
-                                        + "开始的游戏竞赛 " + houseInfo.getHouseName()
-                                        + ",比赛超时,无法获得奖励。";
-                                typeFlag = AppConstant.NoticeType.RESULT;
+                                        + "开始的游戏竞赛 [" + houseInfo.getHouseName()
+                                        + "][比赛超时],无法获得奖励,该局参赛人数["+ houseInfo.getPlayerNumber() + "]人。";
+                                typeFlag = AppConstant.NoticeType.OVERTIME;
                             } else {
                                 if (houseInfo.getScoreType() == 0) {//评分模式
                                     if (playerInfo.getRanking() != null && i < 3) {//只有成绩才能获得奖励
@@ -283,25 +283,33 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                                             playerInfo.setMedal(AppConstant.Medals.GOLD);
                                             bonus = BigDecimal.valueOf(AppConstant.Medals.GOLD_SCORE);
 
-
+                                            content = "恭喜你,在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
+                                                    + "开始的游戏竞赛 [" + houseInfo.getHouseName() + "](评分模式)评分[第" + playerInfo.getHouseRank()
+                                                    + "名],获得一枚金牌,该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
                                         }
                                         if (i == 1) {//第二名 银牌
                                             playerInfo.setMedal(AppConstant.Medals.SILVER);
                                             bonus = BigDecimal.valueOf(AppConstant.Medals.SILVER_SCORE);
+
+                                            content = "恭喜你,在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
+                                                    + "开始的游戏竞赛 [" + houseInfo.getHouseName() + "](评分模式)评分[第" + playerInfo.getHouseRank()
+                                                    + "名],获得一枚银牌,该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
                                         }
                                         if (i == 2) {//第三名 铜牌
                                             playerInfo.setMedal(AppConstant.Medals.BRONZE);
                                             bonus = BigDecimal.valueOf(AppConstant.Medals.BRONZE_SCORE);
+
+                                            content = "恭喜你,在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
+                                                    + "开始的游戏竞赛 [" + houseInfo.getHouseName() + "](评分模式)评分[第" + playerInfo.getHouseRank()
+                                                    + "名],获得一枚铜牌,该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
                                         }
 
-                                        content = "恭喜你,在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
-                                                + "开始的游戏竞赛 " + houseInfo.getHouseName() + "(评分模式)获得了第" + playerInfo.getHouseRank()
-                                                + "名,该局参赛人数" + houseInfo.getPlayerNumber() + "人。";
+
                                     } else {
 
                                         content = "很遗憾,在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
-                                                + "开始的游戏竞赛 " + houseInfo.getHouseName() + "(评分模式)获得了第" + playerInfo.getHouseRank()
-                                                + "名,该局参赛人数" + houseInfo.getPlayerNumber() + "人。";
+                                                + "开始的游戏竞赛[ " + houseInfo.getHouseName() + "](评分模式)评分[第" + playerInfo.getHouseRank()
+                                                + "名],无法获得奖励,该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
                                         typeFlag = AppConstant.NoticeType.RESULT;
                                     }
                                 } else {
@@ -311,12 +319,10 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                                         bonus = BigDecimal.valueOf(AppConstant.Medals.PLATINUM_SCORE);
 
                                         content = "恭喜你,在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
-                                                + "开始的游戏竞赛 " + houseInfo.getHouseName() + "(吃鸡模式)获得了第" + playerInfo.getHouseRank()
-                                                + "名,该局参赛人数" + houseInfo.getPlayerNumber() + "人。";
+                                                + "开始的游戏竞赛 [" + houseInfo.getHouseName() + "](吃鸡模式)[成功吃鸡],获得一枚铂金奖牌,该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
                                     } else {
                                         content = "很遗憾,在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
-                                                + "开始的游戏竞赛 " + houseInfo.getHouseName() + "(吃鸡模式)获得了第" + playerInfo.getHouseRank()
-                                                + "名,该局参赛人数" + houseInfo.getPlayerNumber() + "人。";
+                                                + "开始的游戏竞赛 [" + houseInfo.getHouseName() + "](吃鸡模式)[没有吃鸡],无法获得奖励,该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
                                         typeFlag = AppConstant.NoticeType.RESULT;
                                     }
                                 }