日常任务-新主播任务支持配置国家
This commit is contained in:
@@ -1391,6 +1391,8 @@ public class Constant {
|
||||
public static final String GUILD_USD_PROD_TAB_SHOW_CONFIG = "guild_usd_prod_tab_show_config";
|
||||
|
||||
public static final String GUILD_WEEK_LEVEL_R_FILTER = "guild_week_level_R_filter";
|
||||
|
||||
public static final String GUILD_MEMBER_NEW_UP_ACCEPT_REGION = "guild_member_new_up_accept_region";
|
||||
}
|
||||
|
||||
public static class WithDrawStatus {
|
||||
|
@@ -2,7 +2,6 @@ package com.accompany.business.service.dailytask.handler;
|
||||
|
||||
import cn.hutool.core.date.DateUnit;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.accompany.business.constant.CountryEnum;
|
||||
import com.accompany.business.constant.dailytask.DailyTaskConstant;
|
||||
import com.accompany.business.constant.dailytask.DailyTaskTypeEnum;
|
||||
import com.accompany.business.model.dailytask.DailyTaskRewardRecord;
|
||||
@@ -22,13 +21,18 @@ import com.accompany.common.status.BusiStatus;
|
||||
import com.accompany.core.exception.ServiceException;
|
||||
import com.accompany.core.model.RegionInfo;
|
||||
import com.accompany.core.model.Users;
|
||||
import com.accompany.core.service.SysConfService;
|
||||
import com.accompany.core.service.region.RegionInfoService;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import org.redisson.api.RBucket;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import static com.accompany.common.constant.Constant.SysConfId.GUILD_MEMBER_NEW_UP_ACCEPT_REGION;
|
||||
|
||||
/**
|
||||
* 新账号注册后30天内,
|
||||
@@ -49,6 +53,8 @@ public class GuildMemberUpMicHandler extends AbstractDailyTaskHandler {
|
||||
private RegionInfoService regionInfoService;
|
||||
@Autowired
|
||||
private DailyTaskRewardRecordService dailyTaskRewardRecordService;
|
||||
@Autowired
|
||||
private SysConfService sysConfService;
|
||||
|
||||
|
||||
@Override
|
||||
@@ -77,8 +83,9 @@ public class GuildMemberUpMicHandler extends AbstractDailyTaskHandler {
|
||||
if (guild == null || guild.getRegionId() == null) {
|
||||
return null;
|
||||
}
|
||||
List<String> guildMemberUpAccectRegion = guildMemberUpAccectRegion();
|
||||
RegionInfo regionInfo = regionInfoService.getById(guild.getRegionId());
|
||||
if (regionInfo == null || !regionInfo.getCode().equals(CountryEnum.PH.name())) {
|
||||
if (regionInfo == null || !guildMemberUpAccectRegion.contains(regionInfo.getCode())) {
|
||||
return null;
|
||||
}
|
||||
Date joinGuildTime = guildMember.getCreateTime();
|
||||
@@ -147,5 +154,11 @@ public class GuildMemberUpMicHandler extends AbstractDailyTaskHandler {
|
||||
protected Integer getReceiveExpireDay() {
|
||||
return 7;
|
||||
}
|
||||
|
||||
|
||||
public List<String> guildMemberUpAccectRegion() {
|
||||
String confValueById = sysConfService.getDefaultSysConfValueById(GUILD_MEMBER_NEW_UP_ACCEPT_REGION, "[\"PH\"]");
|
||||
return JSONObject.parseArray(confValueById, String.class);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user