Merge branch 'master_test_gn_zf' into master_test_gn

back_recharge
jiahuiwen 2021-12-13 16:10:24 +08:00
commit bdc1aa723a
1 changed files with 5 additions and 1 deletions

View File

@ -369,6 +369,10 @@ public class ActivityLogic implements IEventHandler{
//初始化活动 绝对时间和相对开服时间 //初始化活动 绝对时间和相对开服时间
for (Integer openActivityId : openActivityIds) { for (Integer openActivityId : openActivityIds) {
SGlobalActivity sGlobalActivity = sGlobalActivityMap.get(openActivityId); SGlobalActivity sGlobalActivity = sGlobalActivityMap.get(openActivityId);
if (sGlobalActivity == null) {
LOGGER.info("checkActivityOfUser uid={} remove activity={}", user.getId(), openActivityId);
continue;
}
int[] ifOpen = sGlobalActivity.getIfOpen(); int[] ifOpen = sGlobalActivity.getIfOpen();
//创角 //创角
if(ifOpen!=null && ifOpen.length>0 && ifOpen[0]==1){ if(ifOpen!=null && ifOpen.length>0 && ifOpen[0]==1){
@ -404,7 +408,7 @@ public class ActivityLogic implements IEventHandler{
} }
// 登录检测已开启的活动,商店是否开启 // 登录检测已开启的活动,商店是否开启
int[] shopId = sGlobalActivity.getShopId(); int[] shopId = sGlobalActivity.getShopId();
if (shopId != null && shopId.length > 0) { if (shopId != null && shopId.length > 0 && shopId[0] != 0) {
boolean b = user.getStoreManager().getStoreInfoMap().containsKey(shopId[0]); boolean b = user.getStoreManager().getStoreInfoMap().containsKey(shopId[0]);
if (!b) { if (!b) {
LOGGER.info("checkActivityOfUser uid={} activityId={} reopen shopId={}", user.getId(), openActivityId, shopId[0]); LOGGER.info("checkActivityOfUser uid={} activityId={} reopen shopId={}", user.getId(), openActivityId, shopId[0]);