From f43645ea76972ee929e1208d16223497d49335c7 Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Mon, 18 Aug 2025 16:28:59 +0800 Subject: [PATCH] =?UTF-8?q?eparty-=E5=90=88=E5=B9=B6=E8=8B=B1=E8=AF=AD2?= =?UTF-8?q?=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildStatService.java --- .../core/enumeration/PartitionEnum.java | 7 ++--- .../ramadan/RamadanGiftSendTask.java | 3 -- .../business/constant/CountryEnum.java | 31 +++++++++---------- .../guild/GuildWithdrawAccountTypeEnum.java | 20 ++++++------ .../business/model/DailyActiveUserStat.java | 5 --- .../accompany/business/model/DiamondStat.java | 6 ---- .../business/model/WeekGuildStat.java | 8 ----- .../business/service/DauStatService.java | 3 -- .../business/service/DiamondStatService.java | 7 ----- .../business/service/DnuStatService.java | 3 -- .../service/WeekGuildStatService.java | 9 +----- .../activity/h5/ActivityOfChargeService.java | 5 +-- .../service/guild/GuildUsdOperateService.java | 13 +++----- .../purse/DiamondGiveHistoryService.java | 3 +- .../impl/RoomDayDiamondNumServiceImpl.java | 2 +- ...RoomDayDiamondRewardRecordServiceImpl.java | 6 ++-- .../scheduler/task/DiamondStatTask.java | 5 +-- .../task/GuildOperatorWeekStatTask.java | 2 +- .../task/GuildPartitionWeekStatTask.java | 2 +- .../task/activity/ActivityOfCpTask.java | 1 - .../task/activity/ActivityOfTemplateTask.java | 2 +- .../task/activity/LuckyNumberActTask.java | 4 +-- .../task/activity/MonthRankTask.java | 2 +- .../task/guild/GuildSettle4EnTask.java | 6 ++-- .../task/room/RoomDayDiamondTask.java | 5 ++- .../task/weekstar/WeekStarAwardTask.java | 2 +- 26 files changed, 53 insertions(+), 109 deletions(-) diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/PartitionEnum.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/PartitionEnum.java index 3d23345eb..c1f2e35b2 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/PartitionEnum.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/PartitionEnum.java @@ -8,11 +8,10 @@ import lombok.Getter; @AllArgsConstructor public enum PartitionEnum { - ENGLISH(1, "Asia/Manila", "英语区", "en", Constant.ClanMode.FAMILY), + ENGLISH(1, "Asia/Manila", "英语区", "en", Constant.ClanMode.GUILD), ARAB(2, "Asia/Riyadh", "阿语区", "ar", Constant.ClanMode.GUILD), CHINESE(4, "Asia/Hong_Kong", "中文区", "zh", Constant.ClanMode.CLAN_HALL), - TURKEY(8, "Europe/Istanbul", "土耳其区", "tr", Constant.ClanMode.GUILD_POLICY2), - ENGLISH2(16, "Asia/Manila", "英语2区", "en", Constant.ClanMode.GUILD), + TURKEY(8, "Europe/Istanbul", "土耳其区", "tr", Constant.ClanMode.GUILD), ; private final int id; @@ -31,7 +30,7 @@ public enum PartitionEnum { } public static Boolean isEnAll(int partitionId) { - return ENGLISH.getId() == partitionId || ENGLISH2.getId() == partitionId; + return ENGLISH.getId() == partitionId; } } diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/ramadan/RamadanGiftSendTask.java b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/ramadan/RamadanGiftSendTask.java index a1ccc9552..5424000c9 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/ramadan/RamadanGiftSendTask.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/ramadan/RamadanGiftSendTask.java @@ -13,7 +13,6 @@ import java.util.Date; @Slf4j public class RamadanGiftSendTask { - @Autowired private RamadanGiftSendService ramadanGiftSendService; @@ -32,7 +31,6 @@ public class RamadanGiftSendTask { Date nowDate = new Date(); log.info("com.accompany.scheduler.ramadan.RamadanGiftSendTask.totalTaskEN-begin,nowDate:{}", DateUtil.formatDateTime(nowDate)); ramadanGiftSendService.totalTask(PartitionEnum.ENGLISH.getId()); - ramadanGiftSendService.totalTask(PartitionEnum.ENGLISH2.getId()); log.info("com.accompany.scheduler.ramadan.RamadanGiftSendTask.totalTaskEN-end,nowDate:{}", DateUtil.formatDateTime(nowDate)); } @@ -50,7 +48,6 @@ public class RamadanGiftSendTask { Date nowDate = new Date(); log.info("com.accompany.scheduler.ramadan.RamadanGiftSendTask.dayTaskEN-begin,nowDate:{}", DateUtil.formatDateTime(nowDate)); ramadanGiftSendService.dayTask(PartitionEnum.ENGLISH.getId(), nowDate); - ramadanGiftSendService.dayTask(PartitionEnum.ENGLISH2.getId(), nowDate); log.info("com.accompany.scheduler.ramadan.RamadanGiftSendTask.dayTaskEN-end,nowDate:{}", DateUtil.formatDateTime(nowDate)); } } diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/CountryEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/CountryEnum.java index 9311bd3bf..18839fedc 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/CountryEnum.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/CountryEnum.java @@ -5,7 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import java.util.Arrays; import java.util.List; @Getter @@ -21,23 +20,23 @@ public enum CountryEnum { YE("Yemen", List.of(PartitionEnum.ARAB.getId(), PartitionEnum.TURKEY.getId())), AZ("Azərbaycan", List.of(PartitionEnum.ARAB.getId(), PartitionEnum.TURKEY.getId())), CY("Kıbrıs", List.of(PartitionEnum.ARAB.getId(), PartitionEnum.TURKEY.getId())), - Other("Other", List.of(PartitionEnum.ARAB.getId(), PartitionEnum.TURKEY.getId(),PartitionEnum.ENGLISH2.getId())), + Other("Other", List.of(PartitionEnum.ARAB.getId(), PartitionEnum.TURKEY.getId(),PartitionEnum.ENGLISH.getId())), //新增国家列表【英语2区】用 - BD("Bangladesh", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())), // 孟加拉国 - ID("Indonesia", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())), // 印度尼西亚 - MY("Malaysia", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())), // 马来西亚 - PH("Philippines", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())), // 菲律宾 - PK("Pakistan", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())), // 巴基斯坦 - VN("Vietnam", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())), // 越南 - IN("India", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())), // 印度 - NG("Nigeria", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())), // 尼日利亚 - US("United States", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())), - GH("Ghana", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())), - BR("Brazil", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())), - CA("Canada", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())), - SP("Spain", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())), - GR("Greece", List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId())), + BD("Bangladesh", List.of(PartitionEnum.ENGLISH.getId())), // 孟加拉国 + ID("Indonesia", List.of(PartitionEnum.ENGLISH.getId())), // 印度尼西亚 + MY("Malaysia", List.of(PartitionEnum.ENGLISH.getId())), // 马来西亚 + PH("Philippines", List.of(PartitionEnum.ENGLISH.getId())), // 菲律宾 + PK("Pakistan", List.of(PartitionEnum.ENGLISH.getId())), // 巴基斯坦 + VN("Vietnam", List.of(PartitionEnum.ENGLISH.getId())), // 越南 + IN("India", List.of(PartitionEnum.ENGLISH.getId())), // 印度 + NG("Nigeria", List.of(PartitionEnum.ENGLISH.getId())), // 尼日利亚 + US("United States", List.of(PartitionEnum.ENGLISH.getId())), + GH("Ghana", List.of(PartitionEnum.ENGLISH.getId())), + BR("Brazil", List.of(PartitionEnum.ENGLISH.getId())), + CA("Canada", List.of(PartitionEnum.ENGLISH.getId())), + SP("Spain", List.of(PartitionEnum.ENGLISH.getId())), + GR("Greece", List.of(PartitionEnum.ENGLISH.getId())), ; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildWithdrawAccountTypeEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildWithdrawAccountTypeEnum.java index 0031ff7f3..49cc78e5e 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildWithdrawAccountTypeEnum.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildWithdrawAccountTypeEnum.java @@ -1,13 +1,11 @@ package com.accompany.business.constant.guild; import com.accompany.business.constant.CountryEnum; -import com.accompany.common.constant.Constant; import com.accompany.core.enumeration.PartitionEnum; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import java.math.BigDecimal; import java.util.List; @Getter @@ -31,33 +29,33 @@ public enum GuildWithdrawAccountTypeEnum { CARD_USD("Card Usd", PartitionEnum.TURKEY.getId(), List.of(CountryEnum.TR,CountryEnum.Other), List.of(GuildWithdrawAccountFieldEnum.COUNTRY, GuildWithdrawAccountFieldEnum.BANK_ACCOUNT, GuildWithdrawAccountFieldEnum.FULL_NAME)), - BANK_EN2("bank", PartitionEnum.ENGLISH2.getId(), List.of(CountryEnum.BD,CountryEnum.ID,CountryEnum.MY,CountryEnum.PH,CountryEnum.PK, CountryEnum.VN, CountryEnum.IN, CountryEnum.NG), + BANK_EN2("bank", PartitionEnum.ENGLISH.getId(), List.of(CountryEnum.BD,CountryEnum.ID,CountryEnum.MY,CountryEnum.PH,CountryEnum.PK, CountryEnum.VN, CountryEnum.IN, CountryEnum.NG), List.of(GuildWithdrawAccountFieldEnum.COUNTRY, GuildWithdrawAccountFieldEnum.BANK_ACCOUNT, GuildWithdrawAccountFieldEnum.BANK_NAME, GuildWithdrawAccountFieldEnum.SWIFT_CODE, GuildWithdrawAccountFieldEnum.FULL_NAME, GuildWithdrawAccountFieldEnum.ADDRESS)), - USDT_EN2("usdt", PartitionEnum.ENGLISH2.getId(), List.of(CountryEnum.US, CountryEnum.CA, CountryEnum.GR, CountryEnum.NG), + USDT_EN2("usdt", PartitionEnum.ENGLISH.getId(), List.of(CountryEnum.US, CountryEnum.CA, CountryEnum.GR, CountryEnum.NG), List.of(GuildWithdrawAccountFieldEnum.COUNTRY, GuildWithdrawAccountFieldEnum.ACCOUNT, GuildWithdrawAccountFieldEnum.ACCOUNT_NAME)), - PAYONNER_EN2("payonner", PartitionEnum.ENGLISH2.getId(), List.of(CountryEnum.BD,CountryEnum.ID,CountryEnum.MY,CountryEnum.PH,CountryEnum.PK, CountryEnum.VN, CountryEnum.IN, CountryEnum.NG,CountryEnum.Other), + PAYONNER_EN2("payonner", PartitionEnum.ENGLISH.getId(), List.of(CountryEnum.BD,CountryEnum.ID,CountryEnum.MY,CountryEnum.PH,CountryEnum.PK, CountryEnum.VN, CountryEnum.IN, CountryEnum.NG,CountryEnum.Other), List.of(GuildWithdrawAccountFieldEnum.COUNTRY, GuildWithdrawAccountFieldEnum.ACCOUNT, GuildWithdrawAccountFieldEnum.FULL_NAME)), - EPAY_EN2("epay", PartitionEnum.ENGLISH2.getId(), List.of(CountryEnum.BD,CountryEnum.ID,CountryEnum.MY,CountryEnum.PH,CountryEnum.PK, CountryEnum.VN, CountryEnum.IN, CountryEnum.NG), + EPAY_EN2("epay", PartitionEnum.ENGLISH.getId(), List.of(CountryEnum.BD,CountryEnum.ID,CountryEnum.MY,CountryEnum.PH,CountryEnum.PK, CountryEnum.VN, CountryEnum.IN, CountryEnum.NG), List.of(GuildWithdrawAccountFieldEnum.COUNTRY, GuildWithdrawAccountFieldEnum.BANK_ACCOUNT)), - GCASH_EN2("gcash", PartitionEnum.ENGLISH2.getId(), List.of(CountryEnum.PH), + GCASH_EN2("gcash", PartitionEnum.ENGLISH.getId(), List.of(CountryEnum.PH), List.of(GuildWithdrawAccountFieldEnum.COUNTRY, GuildWithdrawAccountFieldEnum.BANK_ACCOUNT, GuildWithdrawAccountFieldEnum.FULL_NAME)), - DANA_EN2("DANA", PartitionEnum.ENGLISH2.getId(), List.of(CountryEnum.ID), + DANA_EN2("DANA", PartitionEnum.ENGLISH.getId(), List.of(CountryEnum.ID), List.of(GuildWithdrawAccountFieldEnum.COUNTRY, GuildWithdrawAccountFieldEnum.BANK_ACCOUNT, GuildWithdrawAccountFieldEnum.FULL_NAME)), - EASYPAISA_EN2("easypaisa", PartitionEnum.ENGLISH2.getId(), List.of(CountryEnum.PK), + EASYPAISA_EN2("easypaisa", PartitionEnum.ENGLISH.getId(), List.of(CountryEnum.PK), List.of(GuildWithdrawAccountFieldEnum.COUNTRY, GuildWithdrawAccountFieldEnum.BANK_ACCOUNT, GuildWithdrawAccountFieldEnum.FULL_NAME)), - PIX("pix", PartitionEnum.ENGLISH2.getId(), List.of(CountryEnum.BR), + PIX("pix", PartitionEnum.ENGLISH.getId(), List.of(CountryEnum.BR), List.of(GuildWithdrawAccountFieldEnum.COUNTRY, GuildWithdrawAccountFieldEnum.DOCUMENT_ID, GuildWithdrawAccountFieldEnum.ACCOUNT_TYPE, GuildWithdrawAccountFieldEnum.ACCOUNT_NO, GuildWithdrawAccountFieldEnum.ACCOUNT_NAME)), - ZALO("zalo", PartitionEnum.ENGLISH.getId() + PartitionEnum.ENGLISH2.getId(), List.of(CountryEnum.VN), + ZALO("zalo", PartitionEnum.ENGLISH.getId() + PartitionEnum.ENGLISH.getId(), List.of(CountryEnum.VN), List.of(GuildWithdrawAccountFieldEnum.COUNTRY, GuildWithdrawAccountFieldEnum.ACCOUNT_NO, GuildWithdrawAccountFieldEnum.ACCOUNT_NAME)), ; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/DailyActiveUserStat.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/DailyActiveUserStat.java index a1ff160ff..fd4bb6547 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/DailyActiveUserStat.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/DailyActiveUserStat.java @@ -38,9 +38,4 @@ public class DailyActiveUserStat { @ApiModelProperty("土耳其区详细") private String trCountDetail; - @ApiModelProperty("英语2区") - private Integer en2Count; - @ApiModelProperty("英语2区详细") - private String en2CountDetail; - } diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/DiamondStat.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/DiamondStat.java index 88be6bb47..0aee80492 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/DiamondStat.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/DiamondStat.java @@ -35,10 +35,6 @@ public class DiamondStat { private BigDecimal trDiamond; @ApiModelProperty("土耳其区变动详细分类") private String trDomainDetail; - @ApiModelProperty("英语2区变动") - private BigDecimal en2Diamond; - @ApiModelProperty("英语区变动详细分类") - private String en2DomainDetail; @ApiModelProperty("平台总存量") private BigDecimal totalRemainDiamond; @@ -50,7 +46,5 @@ public class DiamondStat { private BigDecimal zhRemainDiamond; @ApiModelProperty("土耳其区变动") private BigDecimal trRemainDiamond; - @ApiModelProperty("英语2区存量") - private BigDecimal en2RemainDiamond; } diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WeekGuildStat.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WeekGuildStat.java index 7886ea636..818bd5107 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WeekGuildStat.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WeekGuildStat.java @@ -33,10 +33,6 @@ public class WeekGuildStat { private Integer trNewCount; @ApiModelProperty("土耳其区变动详细分类") private String trNewCountDetail; - @ApiModelProperty("英语2区变动") - private Integer en2NewCount; - @ApiModelProperty("英语区变动详细分类") - private String en2NewCountDetail; @ApiModelProperty("平台总活跃") private Integer totalActiveCount; @@ -56,9 +52,5 @@ public class WeekGuildStat { private Integer trActiveCount; @ApiModelProperty("土耳其区活跃详细") private String trActiveCountDetail; - @ApiModelProperty("英语2区活跃") - private Integer en2ActiveCount; - @ApiModelProperty("英语2区活跃详细") - private String en2ActiveCountDetail; } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/DauStatService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/DauStatService.java index 5dd45ff66..8f5286f35 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/DauStatService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/DauStatService.java @@ -103,9 +103,6 @@ public class DauStatService { stat.setTrCount(partitionCountStat(recordList, PartitionEnum.TURKEY.getId())); stat.setTrCountDetail(JSON.toJSONString(partitionRegionStat(recordList, PartitionEnum.TURKEY.getId(), regionInfoMap))); - stat.setEn2Count(partitionCountStat(recordList, PartitionEnum.ENGLISH2.getId())); - stat.setEn2CountDetail(JSON.toJSONString(partitionRegionStat(recordList, PartitionEnum.ENGLISH2.getId(), regionInfoMap))); - statMapper.insertOrUpdate(stat); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/DiamondStatService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/DiamondStatService.java index a5b143e19..b67204036 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/DiamondStatService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/DiamondStatService.java @@ -68,14 +68,12 @@ public class DiamondStatService { diamondStat.setArDiamond(BigDecimal.ZERO); diamondStat.setZhDiamond(BigDecimal.ZERO); diamondStat.setTrDiamond(BigDecimal.ZERO); - diamondStat.setEn2Diamond(BigDecimal.ZERO); diamondStat.setTotalRemainDiamond(BigDecimal.ZERO); diamondStat.setEnRemainDiamond(BigDecimal.ZERO); diamondStat.setArRemainDiamond(BigDecimal.ZERO); diamondStat.setZhRemainDiamond(BigDecimal.ZERO); diamondStat.setTrRemainDiamond(BigDecimal.ZERO); - diamondStat.setEn2RemainDiamond(BigDecimal.ZERO); } Map totalDomainMap = new HashMap<>(); @@ -96,8 +94,6 @@ public class DiamondStatService { diamondStat.setZhRemainDiamond(statDto.getTotalDiamond()); } else if (PartitionEnum.TURKEY.getId() == partitionId) { diamondStat.setTrRemainDiamond(statDto.getTotalDiamond()); - } else if (PartitionEnum.ENGLISH2.getId() == partitionId) { - diamondStat.setEn2RemainDiamond(statDto.getTotalDiamond()); } } @@ -166,9 +162,6 @@ public class DiamondStatService { } else if (PartitionEnum.TURKEY.getId() == partitionId) { diamondStat.setTrDiamond(totalDiamond); diamondStat.setTrDomainDetail(JSON.toJSONString(domainMap.values())); - } else if (PartitionEnum.ENGLISH2.getId() == partitionId) { - diamondStat.setEn2Diamond(totalDiamond); - diamondStat.setEn2DomainDetail(JSON.toJSONString(domainMap.values())); } } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/DnuStatService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/DnuStatService.java index 0992f625c..4768f85da 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/DnuStatService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/DnuStatService.java @@ -66,9 +66,6 @@ public class DnuStatService { stat.setTrCount(partitionCountStat(newUserStatDtoList, PartitionEnum.TURKEY.getId())); stat.setTrCountDetail(JSON.toJSONString(partitionRegionStat(newUserStatDtoList, PartitionEnum.TURKEY.getId(), regionInfoMap))); - stat.setEn2Count(partitionCountStat(newUserStatDtoList, PartitionEnum.ENGLISH2.getId())); - stat.setEn2CountDetail(JSON.toJSONString(partitionRegionStat(newUserStatDtoList, PartitionEnum.ENGLISH2.getId(), regionInfoMap))); - statMapper.insertOrUpdate(stat); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildStatService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildStatService.java index b37477ff4..fe3f0abc8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildStatService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildStatService.java @@ -5,8 +5,8 @@ import com.accompany.business.model.Hall; import com.accompany.business.model.WeekGuildStat; import com.accompany.business.model.family.Family; import com.accompany.business.model.guild.Guild; -import com.accompany.business.mybatismapper.WeekGuildStatMapper; import com.accompany.business.mybatismapper.WeekActiveGuildStatMapper; +import com.accompany.business.mybatismapper.WeekGuildStatMapper; import com.accompany.business.service.family.FamilyService; import com.accompany.business.service.guild.GuildService; import com.accompany.business.service.hall.HallService; @@ -163,10 +163,6 @@ public class WeekGuildStatService { stat.setTrNewCount(trNewCountDetailList.size()); stat.setTrNewCountDetail(JSON.toJSONString(trNewCountDetailList)); - List en2NewCountDetailList = buildNewCountDetail(newGuildCountMap, activeGuildStatMap, PartitionEnum.ENGLISH2.getId(), monday, sunday); - stat.setEn2NewCount(en2NewCountDetailList.size()); - stat.setEn2NewCountDetail(JSON.toJSONString(en2NewCountDetailList)); - stat.setTotalActiveCount(activeGuildStatList.size()); Map> activeGuildPartitionMap = activeGuildStatList.stream().collect(Collectors.groupingBy(WeekActiveGuildStat::getPartitionId)); @@ -187,9 +183,6 @@ public class WeekGuildStatService { stat.setTrActiveCount(trActiveGuildList.size()); stat.setTrActiveCountDetail(JSON.toJSONString(trActiveGuildList)); - List en2ActiveGuildList = buildActiveCountDetail(activeGuildPartitionMap, PartitionEnum.ENGLISH2.getId()); - stat.setEn2ActiveCount(en2ActiveGuildList.size()); - stat.setEn2ActiveCountDetail(JSON.toJSONString(en2ActiveGuildList)); guildWeekPlatformStatMapper.insertOrUpdate(stat); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityOfChargeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityOfChargeService.java index e98e7ccbf..d6fb93de8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityOfChargeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityOfChargeService.java @@ -97,10 +97,7 @@ public class ActivityOfChargeService { //月充值活动只针对阿语/英语区生效 Integer partitionId = users.getPartitionId(); partitionId = partitionId == null ? PartitionEnum.ARAB.getId() : partitionId; - if (partitionId != null - && PartitionEnum.ARAB.getId() != partitionId - && PartitionEnum.ENGLISH.getId() != partitionId - && PartitionEnum.ENGLISH2.getId() != partitionId) { + if (PartitionEnum.ARAB.getId() != partitionId && PartitionEnum.ENGLISH.getId() != partitionId) { return; } PartitionInfo partitionInfo = partitionInfoService.getById(partitionId); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdOperateService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdOperateService.java index f183fcaa4..23ee32904 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdOperateService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdOperateService.java @@ -22,7 +22,6 @@ import com.accompany.common.utils.UUIDUtil; import com.accompany.core.enumeration.BillObjTypeEnum; import com.accompany.core.enumeration.CurrencyEnum; import com.accompany.core.enumeration.I18nAlertEnum; -import com.accompany.core.enumeration.PartitionEnum; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.Users; @@ -122,14 +121,10 @@ public class GuildUsdOperateService { if ((GuildUsdOperateTypeEnum.OWNER_USD_WITHDRAW.equals(typeEnum) || GuildUsdOperateTypeEnum.MEMBER_USD_WITHDRAW.equals(typeEnum)) && !envComponent.getDevOrNativeEnv()){ ZonedDateTime now = ZonedDateTime.now(ZoneId.of(partitionInfo.getZoneId())); - if (PartitionEnum.ENGLISH2.getId() == partitionInfo.getId() && GuildUsdOperateTypeEnum.OWNER_USD_WITHDRAW.equals(typeEnum)) { - //skip - } else { - Integer dayOfMonth = now.getDayOfMonth(); - if (null!= typeEnum.getDayOfMonthSet() - && !typeEnum.getDayOfMonthSet().contains(dayOfMonth)){ - throw new ServiceException(BusiStatus.GUILD_USD_WITHDRAW_NOT_IN_TIME); - } + Integer dayOfMonth = now.getDayOfMonth(); + if (null!= typeEnum.getDayOfMonthSet() + && !typeEnum.getDayOfMonthSet().contains(dayOfMonth)){ + throw new ServiceException(BusiStatus.GUILD_USD_WITHDRAW_NOT_IN_TIME); } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/DiamondGiveHistoryService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/DiamondGiveHistoryService.java index 62e086bc8..fad81c6e3 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/DiamondGiveHistoryService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/DiamondGiveHistoryService.java @@ -431,8 +431,7 @@ public class DiamondGiveHistoryService extends ServiceImpl dayDiamondRewardTreeMap = partitionTreeMap.get(row.getPartitionId()); @@ -141,8 +141,8 @@ public class RoomDayDiamondRewardRecordServiceImpl extends ServiceImpl partitionIds = List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.CHINESE.getId(), PartitionEnum.ENGLISH2.getId()); + List partitionIds = List.of(PartitionEnum.ENGLISH.getId()); Date now = new Date(); service.stat(partitionIds, now); } diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GuildOperatorWeekStatTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GuildOperatorWeekStatTask.java index da0fc5afe..13e8817a4 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GuildOperatorWeekStatTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GuildOperatorWeekStatTask.java @@ -19,7 +19,7 @@ public class GuildOperatorWeekStatTask extends BaseTask { @Scheduled(cron = "5 0 0 ? * MON") public void statWeekEn() { - List partitionIdList = List.of(PartitionEnum.ENGLISH2.getId()); + List partitionIdList = List.of(PartitionEnum.ENGLISH.getId()); weekGuildOperatorStatService.stat(partitionIdList); } diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GuildPartitionWeekStatTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GuildPartitionWeekStatTask.java index 95e06cdbc..52a4e3752 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GuildPartitionWeekStatTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GuildPartitionWeekStatTask.java @@ -19,7 +19,7 @@ public class GuildPartitionWeekStatTask extends BaseTask { @Scheduled(cron = "5 0 0 ? * MON") public void statWeekEn() { - List partitionEnumList = List.of(PartitionEnum.ENGLISH2); + List partitionEnumList = List.of(PartitionEnum.ENGLISH); service.stat(partitionEnumList); } diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActivityOfCpTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActivityOfCpTask.java index c6d20d902..98e9e6944 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActivityOfCpTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActivityOfCpTask.java @@ -26,6 +26,5 @@ public class ActivityOfCpTask { public void taskEC() { activityOfCpService.task(new Date(), PartitionEnum.ENGLISH); activityOfCpService.task(new Date(), PartitionEnum.CHINESE); - activityOfCpService.task(new Date(), PartitionEnum.ENGLISH2); } } diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActivityOfTemplateTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActivityOfTemplateTask.java index ffe808a59..0c5afa25f 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActivityOfTemplateTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActivityOfTemplateTask.java @@ -32,7 +32,7 @@ public class ActivityOfTemplateTask { @Scheduled(cron = "0 10 0 * * ?") public void statEn() { Date date = new Date(); - List partitionEnumList = List.of(PartitionEnum.ENGLISH, PartitionEnum.ENGLISH2, PartitionEnum.CHINESE); + List partitionEnumList = List.of(PartitionEnum.ENGLISH); for (PartitionEnum partitionEnum : partitionEnumList) { activityOfTemplateService.statData(date, partitionEnum); } diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/LuckyNumberActTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/LuckyNumberActTask.java index f43f65328..5563358cb 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/LuckyNumberActTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/LuckyNumberActTask.java @@ -19,7 +19,7 @@ public class LuckyNumberActTask { @Scheduled(cron = "30 25 23 * * *", zone = "Asia/Manila") public void settlementEn() { - List partitionEnumList = List.of(PartitionEnum.ENGLISH, PartitionEnum.ENGLISH2); + List partitionEnumList = List.of(PartitionEnum.ENGLISH); for (PartitionEnum partitionEnum : partitionEnumList) { String date = DateTimeUtil.getZonedTodayStr(partitionEnum.getZoneId()); service.settlement(date, partitionEnum.getId()); @@ -28,7 +28,7 @@ public class LuckyNumberActTask { @Scheduled(cron = "00 30 23 * * *", zone = "Asia/Manila") public void sendTipEn() { - List partitionEnumList = List.of(PartitionEnum.ENGLISH, PartitionEnum.ENGLISH2); + List partitionEnumList = List.of(PartitionEnum.ENGLISH); for (PartitionEnum partitionEnum : partitionEnumList) { String date = DateTimeUtil.getZonedTodayStr(partitionEnum.getZoneId()); service.sendJackpotTip(date, partitionEnum.getId()); diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/MonthRankTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/MonthRankTask.java index b03b0ae75..dabe50958 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/MonthRankTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/MonthRankTask.java @@ -61,7 +61,7 @@ public class MonthRankTask extends BaseTask { public void monthRankTaskGMT8() { Date date = new Date(); Date lastMonthDate = DateUtil.offsetMonth(date, -1); - List partitionEnumList = List.of(PartitionEnum.ENGLISH, PartitionEnum.ENGLISH2); + List partitionEnumList = List.of(PartitionEnum.ENGLISH); for (PartitionEnum partitionEnum : partitionEnumList) { try { log.info("=-=monthRankTaskGMT8.krypton_rank=-=:date:{},lastMonthDate:{}", DateUtil.formatDateTime(date), lastMonthDate); diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/GuildSettle4EnTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/GuildSettle4EnTask.java index 9dc86a775..ca64ed156 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/GuildSettle4EnTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/GuildSettle4EnTask.java @@ -32,7 +32,7 @@ public class GuildSettle4EnTask { @Scheduled(cron = "0 10 0 1 * ?") public void monthRank4EnTaskAll2() { Date date = new Date(); - List partitionEnumList = List.of(PartitionEnum.ENGLISH2); + List partitionEnumList = List.of(PartitionEnum.ENGLISH); for (PartitionEnum partitionEnum : partitionEnumList) { try { DateTime lastMonth = DateUtil.offsetMonth(date, -1); @@ -57,7 +57,7 @@ public class GuildSettle4EnTask { @Scheduled(cron = "0 10 0 16 * ?") public void monthRankTask() { Date date = new Date(); - List partitionEnumList = List.of(PartitionEnum.ENGLISH2); + List partitionEnumList = List.of(PartitionEnum.ENGLISH); for (PartitionEnum partitionEnum : partitionEnumList) { try { DateTime beginTime = DateUtil.beginOfMonth(date); @@ -79,7 +79,7 @@ public class GuildSettle4EnTask { */ @Scheduled(cron = "0 10 0 * * ?") public void settleAnchorBill() { - List partitionEnumList = List.of(PartitionEnum.ENGLISH2); + List partitionEnumList = List.of(PartitionEnum.ENGLISH); for (PartitionEnum partitionEnum : partitionEnumList) { try { //发放奖励逻辑：每月1号/16号为结算日沙特时间00:10（次月1号结算上月16号-月结束的奖励，每月16号结算本月1-15号的奖励） diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/room/RoomDayDiamondTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/room/RoomDayDiamondTask.java index 0f8b71ced..f5a933800 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/room/RoomDayDiamondTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/room/RoomDayDiamondTask.java @@ -1,6 +1,5 @@ package com.accompany.scheduler.task.room; -import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import com.accompany.business.service.room.RoomDayDiamondRewardRecordService; import com.accompany.common.utils.DateTimeUtil; @@ -21,12 +20,12 @@ public class RoomDayDiamondTask { private RoomDayDiamondRewardRecordService roomDayDiamondRewardRecordService; /** - * 英语2区的数据 + * 英语区的数据 */ @Scheduled(cron = "0 13 0 * * ?") public void roomLevelDayExpTask() { Date date = new Date(); - PartitionEnum partitionEnum = PartitionEnum.ENGLISH2; + PartitionEnum partitionEnum = PartitionEnum.ENGLISH; ZonedDateTime zonedDateTime = DateTimeUtil.convertWithZoneId(date, partitionEnum.getZoneId()); String startDate = zonedDateTime.minusDays(1).withHour(0).withMinute(0).withSecond(0).format(DateTimeUtil.datetimeFormatter); String endDate = zonedDateTime.minusDays(1).withHour(23).withMinute(59).withSecond(59).format(DateTimeUtil.datetimeFormatter); diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/weekstar/WeekStarAwardTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/weekstar/WeekStarAwardTask.java index bdafa2743..6a34b9be9 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/weekstar/WeekStarAwardTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/weekstar/WeekStarAwardTask.java @@ -28,7 +28,7 @@ public class WeekStarAwardTask extends BaseTask { @Scheduled(cron = "0 1 0 ? * MON") public void sendWeekStarAward(){ log.info("send WeekStar Award begin"); - List partitionIdList = List.of(PartitionEnum.CHINESE.getId(), PartitionEnum.ENGLISH.getId(), PartitionEnum.ENGLISH2.getId()); + List partitionIdList = List.of(PartitionEnum.ENGLISH.getId()); weekStarService.sendWeekStarAward(partitionIdList); log.info("send WeekStar Award end"); }