20190301

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

@@ -220,7 +220,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,6 +235,15 @@ 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 {
+                                content = "恭喜你，在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
+                                        + "开始的游戏竞赛 " + houseInfo.getHouseName() + "获得了第" + playerInfo.getHouseRank()
+                                        + "名，但未能吃鸡。";
+                                typeFlag = AppConstant.NoticeType.RESULT;
                             }
                             playerInfo.setBonus(bonus);
 
@@ -247,11 +257,9 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                                 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.setTypeFlag(typeFlag);
 
                                 systemNoticeService.createSystemNotice(systemNotice);