20190307

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

@@ -853,7 +853,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">
@@ -895,7 +895,7 @@
         AND status_flag = 2
         AND DATE_SUB(
         CURRENT_TIMESTAMP (),
-        INTERVAL 60 MINUTE
+        INTERVAL 55 MINUTE
         ) <![CDATA[ >= ]]> begin_time
     </select>
 

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

@@ -1357,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/service/impl/HouseInfoServiceImpl.java

@@ -244,49 +244,61 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                                         + "开始的游戏竞赛 " + houseInfo.getHouseName() + "获得了第" + playerInfo.getHouseRank()
                                         + "名，获得" + bonus + "积分，赶快领取你的奖励吧。";
                             } else {
-                                content = "恭喜你，在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
-                                        + "开始的游戏竞赛 " + houseInfo.getHouseName() + "获得了第" + playerInfo.getHouseRank()
-                                        + "名，但未能吃鸡,因此无法获得奖励。";
+                                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("定时任务");
 
-                                systemNotice.setContent(content);
-                                systemNotice.setTypeFlag(typeFlag);
+                            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);
 
 

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>