moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公会-提现-英语2区放开日期限制

Browse Source
This commit is contained in:
khalil
2025-07-28 14:05:53 +08:00
parent d9e0b50a07
commit 00be0846bb
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
accompany-base/accompany-core/src/main/java/com/accompany/common/redis/RedisKey.java
View File

@@ -1425,7 +1425,6 @@ public enum RedisKey {
bravo_robot_push_msg,
bravo_status, // 礼物消息的状态
lock_bravo_message, // 消费送礼物消息锁
gusd_withdraw_limit,//公会长提现次数限制
bravo_banner_queue, // bravo轮播队列

19
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdOperateService.java
View File

@@ -17,7 +17,6 @@ import com.accompany.business.vo.guild.GuildUsdProdChannelVo;
import com.accompany.common.config.SystemConfig;
import com.accompany.common.constant.AppEnum;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.EnvComponent;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.enumeration.BillObjTypeEnum;
@@ -31,21 +30,16 @@ import com.accompany.core.service.partition.PartitionInfoService;
import com.accompany.core.util.I18NMessageSourceUtil;
import org.apache.commons.lang3.StringUtils;
import org.redisson.api.RBucket;
import org.redisson.api.RedissonClient;
import org.redisson.client.codec.IntegerCodec;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.time.Duration;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Arrays;
import java.util.Optional;
import static com.accompany.common.redis.RedisKey.gusd_withdraw_limit;
@Service
public class GuildUsdOperateService {
@@ -71,8 +65,6 @@ public class GuildUsdOperateService {
private PartitionInfoService partitionInfoService;
@Autowired
private EnvComponent envComponent;
@Autowired
private RedissonClient redissonClient;
public void withdrawDiamond(Long uid, BigDecimal guildUsdNum) {
GuildMemberDiamondWithdrawVo vo = guildUsdChannelService.getDiamondWithDrawVo(uid);
@@ -121,12 +113,7 @@ public class GuildUsdOperateService {
&& !envComponent.getDevOrNativeEnv()){
ZonedDateTime now = ZonedDateTime.now(ZoneId.of(partitionInfo.getZoneId()));
if (PartitionEnum.ENGLISH2.getId() == partitionInfo.getId() && GuildUsdOperateTypeEnum.OWNER_USD_WITHDRAW.equals(typeEnum)) {
ZonedDateTime weekBegin = DateTimeUtil.getWeekBegin(now);
String format = weekBegin.format(DateTimeUtil.yyyyMMdd);
guildUsdWithdrawLimit = redissonClient.getBucket(gusd_withdraw_limit.getKey(uid.toString(), format), IntegerCodec.INSTANCE);
if (guildUsdWithdrawLimit.isExists()) {
throw new ServiceException(BusiStatus.GUILD_USD_WITHDRAW_LIMIT_TIME);
}
//skip
} else {
Integer dayOfMonth = now.getDayOfMonth();
if (null!= typeEnum.getDayOfMonthSet()
@@ -205,9 +192,7 @@ public class GuildUsdOperateService {
GuildConstant.SkipUrl.BILL_RECORD_URL: GuildConstant.SkipUrl.RECHARGE_USER_RECORD_URL);
sendSysMsgService.sendPersonTextMsgWithSkipUrl(SystemConfig.secretaryUid, targetUid, content, skipUrl);
}
if (PartitionEnum.ENGLISH2.getId() == partitionInfo.getId() && guildUsdWithdrawLimit != null) {
guildUsdWithdrawLimit.set(1, Duration.ofDays(1));
}
return buildBillRecordVo(billRecord);
}