独联体-官方提现账户
This commit is contained in:
@@ -39,6 +39,18 @@ public enum CountryEnum {
|
||||
GR("Greece", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())),
|
||||
NP("Nepal", List.of(PartitionEnum.ENGLISH2.getId())),
|
||||
|
||||
//新增国家列表【 soviet区】用
|
||||
RU("Russia", List.of(PartitionEnum.SOVIET.getId())),
|
||||
UZ("Uzbekistan", List.of(PartitionEnum.SOVIET.getId())),
|
||||
BY("Belarus", List.of(PartitionEnum.SOVIET.getId())),
|
||||
UA("Ukraine", List.of(PartitionEnum.SOVIET.getId())),
|
||||
KG("Kyrgyzstan", List.of(PartitionEnum.SOVIET.getId())),
|
||||
TJ("Tajikistan", List.of(PartitionEnum.SOVIET.getId())),
|
||||
TM("Turkmenistan", List.of(PartitionEnum.SOVIET.getId())),
|
||||
MD("Moldova", List.of(PartitionEnum.SOVIET.getId())),
|
||||
GE("Georgia", List.of(PartitionEnum.SOVIET.getId())),
|
||||
AM("Armenia", List.of(PartitionEnum.SOVIET.getId())),
|
||||
KZ("Kazakhstan", List.of(PartitionEnum.SOVIET.getId())),
|
||||
;
|
||||
|
||||
private String name;
|
||||
|
@@ -64,10 +64,12 @@ public enum GuildWithdrawAccountTypeEnum {
|
||||
SWIFT_CODE("swiftcode", PartitionEnum.ENGLISH2.getId(), List.of(CountryEnum.NG),
|
||||
List.of(GuildWithdrawAccountFieldEnum.COUNTRY, GuildWithdrawAccountFieldEnum.ACCOUNT_NO, GuildWithdrawAccountFieldEnum.ACCOUNT_NAME, GuildWithdrawAccountFieldEnum.SWIFT_CODE)),
|
||||
|
||||
USDT_SOVIET("usdt", PartitionEnum.SOVIET.getId(), List.of(CountryEnum.Other),
|
||||
USDT_SOVIET("usdt", PartitionEnum.SOVIET.getId(), List.of(CountryEnum.RU,CountryEnum.UZ,CountryEnum.BY,CountryEnum.UA,CountryEnum.KG,CountryEnum.TJ,CountryEnum.TM,
|
||||
CountryEnum.MD,CountryEnum.GE,CountryEnum.AM,CountryEnum.KZ,CountryEnum.Other),
|
||||
List.of(GuildWithdrawAccountFieldEnum.COUNTRY, GuildWithdrawAccountFieldEnum.ACCOUNT)),
|
||||
|
||||
PAYONNER_SOVIET("payonner", PartitionEnum.SOVIET.getId(), List.of(CountryEnum.Other),
|
||||
PAYONNER_SOVIET("payonner", PartitionEnum.SOVIET.getId(), List.of(CountryEnum.RU,CountryEnum.UZ,CountryEnum.BY,CountryEnum.UA,CountryEnum.KG,CountryEnum.TJ,CountryEnum.TM,
|
||||
CountryEnum.MD,CountryEnum.GE,CountryEnum.AM,CountryEnum.KZ,CountryEnum.Other),
|
||||
List.of(GuildWithdrawAccountFieldEnum.COUNTRY, GuildWithdrawAccountFieldEnum.ACCOUNT, GuildWithdrawAccountFieldEnum.FULL_NAME)),
|
||||
|
||||
;
|
||||
|
@@ -122,7 +122,7 @@ public class ExtraDiamondDayService {
|
||||
log.info("empty guildMember partitionId:" + partitionId + " partitionId:" + statDate + " no guildMember");
|
||||
return;
|
||||
}
|
||||
List<GuildExtraDiamondDay> guildExtraDiamondDays = guildExtraDiamondDayService.listByPartitionStatDate(partitionId, statDate);
|
||||
List<GuildExtraDiamondDay> guildExtraDiamondDays = guildExtraDiamondDayService.listByPartitionStatDate4Task(partitionId, statDate);
|
||||
if (CollectionUtils.isNotEmpty(guildExtraDiamondDays)) {
|
||||
Iterator<GuildExtraDiamondDay> iterator = guildExtraDiamondDays.iterator();
|
||||
while (iterator.hasNext()) {
|
||||
@@ -168,7 +168,7 @@ public class ExtraDiamondDayService {
|
||||
if (!locked) {
|
||||
throw new ServiceException(BusiStatus.SERVERBUSY);
|
||||
}
|
||||
List<RoomExtraDiamondDay> roomExtraDiamondDays = roomExtraDiamondDayService.listByPartitionCycleDate(partitionId, monthDay);
|
||||
List<RoomExtraDiamondDay> roomExtraDiamondDays = roomExtraDiamondDayService.listByPartitionCycleDate4Task(partitionId, monthDay);
|
||||
if (CollectionUtils.isEmpty(roomExtraDiamondDays)) {
|
||||
return;
|
||||
}
|
||||
|
@@ -28,12 +28,11 @@ public class GuildExtraDiamondDayService extends ServiceImpl<GuildExtraDiamondDa
|
||||
diamondNum, luckyDiamond, ownerDiamondNum, ownerLuckyDiamond, anchorDiamondNum, anchorLuckyDiamond, time);
|
||||
}
|
||||
|
||||
public List<GuildExtraDiamondDay> listByPartitionStatDate(Integer partitionId, String statDate) {
|
||||
public List<GuildExtraDiamondDay> listByPartitionStatDate4Task(Integer partitionId, String statDate) {
|
||||
LambdaQueryWrapper<GuildExtraDiamondDay> queryWrapper = Wrappers.lambdaQuery();
|
||||
queryWrapper.eq(GuildExtraDiamondDay::getPartitionId, partitionId)
|
||||
.eq(GuildExtraDiamondDay::getStatDate, statDate)
|
||||
.le(GuildExtraDiamondDay::getAnchorExtraNum, BigDecimal.ZERO)
|
||||
.le(GuildExtraDiamondDay::getAnchorExtraLuckyNum, BigDecimal.ZERO);
|
||||
.eq(GuildExtraDiamondDay::getAnchorSendStatus, 0);
|
||||
return list(queryWrapper);
|
||||
}
|
||||
}
|
||||
|
@@ -27,30 +27,11 @@ public class RoomExtraDiamondDayService extends ServiceImpl<RoomExtraDiamondDayM
|
||||
normalDiamondNum, luckyDiamondNum, roomDiamondNum, roomLuckyDiamond, time);
|
||||
}
|
||||
|
||||
public List<RoomExtraDiamondDay> listByPartitionStatDate(Integer partitionId, String statDate) {
|
||||
LambdaQueryWrapper<RoomExtraDiamondDay> queryWrapper = Wrappers.lambdaQuery();
|
||||
queryWrapper.eq(RoomExtraDiamondDay::getPartitionId, partitionId)
|
||||
.eq(RoomExtraDiamondDay::getStatDate, statDate)
|
||||
.le(RoomExtraDiamondDay::getRoomExtraNum, BigDecimal.ZERO)
|
||||
.le(RoomExtraDiamondDay::getRoomExtraLuckyNum, BigDecimal.ZERO);
|
||||
return list(queryWrapper);
|
||||
}
|
||||
|
||||
public List<RoomExtraDiamondDay> listByPartitionStatDateList(Integer partitionId, List<String> statDates) {
|
||||
LambdaQueryWrapper<RoomExtraDiamondDay> queryWrapper = Wrappers.lambdaQuery();
|
||||
queryWrapper.eq(RoomExtraDiamondDay::getPartitionId, partitionId)
|
||||
.in(RoomExtraDiamondDay::getStatDate, statDates)
|
||||
.le(RoomExtraDiamondDay::getRoomExtraNum, BigDecimal.ZERO)
|
||||
.le(RoomExtraDiamondDay::getRoomExtraLuckyNum, BigDecimal.ZERO);
|
||||
return list(queryWrapper);
|
||||
}
|
||||
|
||||
public List<RoomExtraDiamondDay> listByPartitionCycleDate(Integer partitionId, String cycleDate) {
|
||||
public List<RoomExtraDiamondDay> listByPartitionCycleDate4Task(Integer partitionId, String cycleDate) {
|
||||
LambdaQueryWrapper<RoomExtraDiamondDay> queryWrapper = Wrappers.lambdaQuery();
|
||||
queryWrapper.eq(RoomExtraDiamondDay::getPartitionId, partitionId)
|
||||
.eq(RoomExtraDiamondDay::getCycleDate, cycleDate)
|
||||
.le(RoomExtraDiamondDay::getRoomExtraNum, BigDecimal.ZERO)
|
||||
.le(RoomExtraDiamondDay::getRoomExtraLuckyNum, BigDecimal.ZERO);
|
||||
.eq(RoomExtraDiamondDay::getSendStatus, 0);
|
||||
return list(queryWrapper);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user