diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java index 2f3d68292..dac20396c 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java @@ -94,7 +94,8 @@ public class GuildManageAdminService { } PartitionInfo partitionInfo = partitionInfoService.getById(u.getPartitionId()); if (null == partitionInfo || (!Constant.ClanMode.GUILD.equals(partitionInfo.getClanMode()) - && !Constant.ClanMode.GUILD_POLICY2.equals(partitionInfo.getClanMode()))){ + && !Constant.ClanMode.GUILD_POLICY2.equals(partitionInfo.getClanMode()) + && !Constant.ClanMode.SOVIET.equals(partitionInfo.getClanMode()))){ throw new AdminServiceException(BusiStatus.PARTITION_ERROR); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCancelAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCancelAdminService.java index 47ddd29d4..7564f992b 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCancelAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCancelAdminService.java @@ -131,7 +131,8 @@ public class UserCancelAdminService extends BaseService { familyManageAdminService.removeMember(vaildFamilyMemberByUid.getId(), 0); } } else if (Constant.ClanMode.GUILD.equals(partitionEnum.getClanMode()) - || Constant.ClanMode.GUILD_POLICY2.equals(partitionEnum.getClanMode())) { + || Constant.ClanMode.GUILD_POLICY2.equals(partitionEnum.getClanMode()) + || Constant.ClanMode.SOVIET.equals(partitionEnum.getClanMode())) { GuildMember vaildGuildMemberByUid = guildMemberService.getVaildGuildMemberByUid(users.getUid()); if (vaildGuildMemberByUid != null && GuildConstant.RoleType.OWNER.equals(vaildGuildMemberByUid.getRoleType())) { Guild validOwnUid = guildManageAdminService.getValidByOwnUid(users.getUid()); diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java index d0d5a7ba5..26075450b 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java @@ -4083,6 +4083,7 @@ public class Constant { public static final String FAMILY = "family"; public static final String GUILD = "guild"; public static final String GUILD_POLICY2 = "guild_policy2"; + public static final String SOVIET = "soviet"; } /** 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 0ed3288c1..acb159cfc 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 @@ -13,7 +13,7 @@ public enum PartitionEnum { 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), - SOVIET(32, "Asia/Manila", "独联体", "ru", Constant.ClanMode.GUILD), + SOVIET(32, "Asia/Manila", "独联体", "ru", Constant.ClanMode.SOVIET), ; private final int id; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/BravoGiftGoldIncomeListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/BravoGiftGoldIncomeListener.java index cf1c2c2cd..58c31f93a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/BravoGiftGoldIncomeListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/BravoGiftGoldIncomeListener.java @@ -7,6 +7,7 @@ import com.accompany.business.service.rank.RankService; import com.accompany.business.service.room.*; import com.accompany.business.service.user.UsersService; import com.accompany.common.constant.Constant; +import com.accompany.core.enumeration.PartitionEnum; import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.alibaba.fastjson.JSONObject; @@ -50,9 +51,12 @@ public class BravoGiftGoldIncomeListener implements ApplicationListener 0L) { + extraDiamondDayService.updateRoomExtraDiamond(guildMember, roomUid, receiver.getPartitionId(), statDate, + roomUid, 0D, message.getTotalDiamondNum(), time); } } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekActiveGuildMemberStatService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekActiveGuildMemberStatService.java index 625076f7b..86f20131d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekActiveGuildMemberStatService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekActiveGuildMemberStatService.java @@ -46,7 +46,8 @@ public class WeekActiveGuildMemberStatService { public void zoneMark(Integer partitionId, Integer guildId, Long uid, BigDecimal diamondNum, BigDecimal goldNum, Date now){ PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(partitionId); if (!Constant.ClanMode.GUILD.equals(partitionEnum.getClanMode()) - && !Constant.ClanMode.GUILD_POLICY2.equals(partitionEnum.getClanMode())){ + && !Constant.ClanMode.GUILD_POLICY2.equals(partitionEnum.getClanMode()) + && !Constant.ClanMode.SOVIET.equals(partitionEnum.getClanMode())){ return; } 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 cc62ab3be..97ea19b0f 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 @@ -220,7 +220,9 @@ public class WeekGuildStatService { familyList.forEach(family->{ ownerUidMap.put(family.getId(), family.getOwnerUid()); }); - } else if (Constant.ClanMode.GUILD.equals(partitionEnum.getClanMode()) || Constant.ClanMode.GUILD_POLICY2.equals(partitionEnum.getClanMode())) { + } else if (Constant.ClanMode.GUILD.equals(partitionEnum.getClanMode()) + || Constant.ClanMode.GUILD_POLICY2.equals(partitionEnum.getClanMode()) + || Constant.ClanMode.SOVIET.equals(partitionEnum.getClanMode())) { List guildList = guildService.listByIds(guildIdList); guildList.forEach(guild->{ ownerUidMap.put(guild.getId(), guild.getOwnerUid()); @@ -270,7 +272,9 @@ public class WeekGuildStatService { familyList.forEach(family->{ ownerUidMap.put(family.getId(), family.getOwnerUid()); }); - } else if (Constant.ClanMode.GUILD.equals(partitionEnum.getClanMode()) || Constant.ClanMode.GUILD_POLICY2.equals(partitionEnum.getClanMode())) { + } else if (Constant.ClanMode.GUILD.equals(partitionEnum.getClanMode()) + || Constant.ClanMode.GUILD_POLICY2.equals(partitionEnum.getClanMode()) + || Constant.ClanMode.SOVIET.equals(partitionEnum.getClanMode())) { List guildList = guildService.listByIds(guildIdList); guildList.forEach(guild->{ ownerUidMap.put(guild.getId(), guild.getOwnerUid()); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/GoldExchangeDiamondService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/GoldExchangeDiamondService.java index 64e2fc011..28c68efb5 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/GoldExchangeDiamondService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/GoldExchangeDiamondService.java @@ -139,7 +139,8 @@ public class GoldExchangeDiamondService { } } else if (Constant.ClanMode.GUILD.equals(partitionInfo.getClanMode()) - || GUILD_POLICY2.equals(partitionInfo.getClanMode())) { + || GUILD_POLICY2.equals(partitionInfo.getClanMode()) + || Constant.ClanMode.SOVIET.equals(partitionInfo.getClanMode())) { GuildMember vaildGuildMemberByUid = guildMemberService.getVaildGuildMemberByUid(uid); if (CollectionUtils.isEmpty(blockClanIds) || vaildGuildMemberByUid == null) { return exchangeDiamondConfigDto; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/extradiamond/ExtraDiamondDayService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/extradiamond/ExtraDiamondDayService.java index 7dc76199e..01c241665 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/extradiamond/ExtraDiamondDayService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/extradiamond/ExtraDiamondDayService.java @@ -52,20 +52,12 @@ public class ExtraDiamondDayService { @Autowired private GuildMemberService guildMemberService; - public void updateExtraDiamond(GuildMember guildMember, Long uid, Integer partitionId, String cycleDate, String statDate, Long roomUid, - Double normalDiamondNum, Double luckyDiamondNum, Date time) { - ExtraDiamondRateConfigDto diamondRateConfig = this.getExtraDiamondRateConfig(guildMember.getPartitionId()); - - updateGuildExtraDiamond(guildMember, cycleDate, statDate, normalDiamondNum, luckyDiamondNum, time, diamondRateConfig); - - updateRoomExtraDiamond(guildMember, uid, partitionId, statDate, roomUid, 0D, luckyDiamondNum, time, diamondRateConfig); - } - public void updateGuildExtraDiamond(GuildMember guildMember, String cycleDate, String statDate, - Double normalDiamondNum, Double luckyDiamondNum, Date time, ExtraDiamondRateConfigDto diamondRateConfig) { + Double normalDiamondNum, Double luckyDiamondNum, Date time) { if (guildMember == null) { return; } + ExtraDiamondRateConfigDto diamondRateConfig = this.getExtraDiamondRateConfig(guildMember.getPartitionId()); Long guildMemberId = guildMember.getId(); Integer guildId = guildMember.getGuildId(); Integer partitionId = guildMember.getPartitionId(); @@ -88,16 +80,14 @@ public class ExtraDiamondDayService { } public void updateRoomExtraDiamond(GuildMember guildMember, Long uid, Integer partitionId, String statDate, Long roomUid, - Double normalDiamondNum, Double luckyDiamondNum, Date time, ExtraDiamondRateConfigDto diamondRateConfig) { - if (roomUid == null) { - return; - } + Double normalDiamondNum, Double luckyDiamondNum, Date time) { Long guildMemberId = 0L; Integer guildId = 0; if (guildMember != null) { guildMemberId = guildMember.getId(); guildId = guildMember.getGuildId(); } + ExtraDiamondRateConfigDto diamondRateConfig = this.getExtraDiamondRateConfig(guildMember.getPartitionId()); BigDecimal decimalNormal = BigDecimal.valueOf(normalDiamondNum); BigDecimal decimalLucky = BigDecimal.valueOf(luckyDiamondNum); BigDecimal roomDiamondNum = diamondRateConfig.getRoomExtraRate().multiply(decimalNormal); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyClanService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyClanService.java index 43ad01fa6..7a95d7f80 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyClanService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyClanService.java @@ -61,7 +61,8 @@ public class FamilyClanService { FamilySkipVo familySkipVo = familyRelationService.getFamilySkipVo(uid); vo.setFamily(familySkipVo); } else if (Constant.ClanMode.GUILD.equals(partitionInfo.getClanMode()) - || Constant.ClanMode.GUILD_POLICY2.equals(partitionInfo.getClanMode())) { + || Constant.ClanMode.GUILD_POLICY2.equals(partitionInfo.getClanMode()) + || Constant.ClanMode.SOVIET.equals(partitionInfo.getClanMode())) { GuildSkipVo guildSkipVo = guildRelationService.getGuildSkipVo(uid); vo.setFamily(guildSkipVo); } @@ -82,7 +83,8 @@ public class FamilyClanService { if (Constant.ClanMode.FAMILY.equals(partitionInfo.getClanMode())) { clanRankListVOS = familyRankService.listRank(partitionInfo.getId(), periodType); } else if (Constant.ClanMode.GUILD.equals(partitionInfo.getClanMode()) - || Constant.ClanMode.GUILD_POLICY2.equals(partitionInfo.getClanMode())) { + || Constant.ClanMode.GUILD_POLICY2.equals(partitionInfo.getClanMode()) + || Constant.ClanMode.SOVIET.equals(partitionInfo.getClanMode())) { clanRankListVOS = guildRankService.listRank(partitionInfo.getId(), periodType); } else { clanRankListVOS = clanService.listClanRankV2(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftEarnAllotService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftEarnAllotService.java index 49ae695bd..e4aec758e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftEarnAllotService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftEarnAllotService.java @@ -96,7 +96,8 @@ public class GiftEarnAllotService { uid, partitionInfo.getLanguages(), partitionInfo.getClanMode()); allotGiftEarnByFamily(record, partitionInfo.getId(), objId, inEnum); } else if (Constant.ClanMode.GUILD.equals(partitionInfo.getClanMode()) - || Constant.ClanMode.GUILD_POLICY2.equals(partitionInfo.getClanMode())) { + || Constant.ClanMode.GUILD_POLICY2.equals(partitionInfo.getClanMode()) + || Constant.ClanMode.SOVIET.equals(partitionInfo.getClanMode())) { log.info("[处理礼物mq] giftEarnByGuild recvUid {} partitionInfo {} clanMode {}", uid, partitionInfo.getLanguages(), partitionInfo.getClanMode()); diamondNum = allotGiftEarnByGuild(record, partitionInfo.getId(), objId, inEnum); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftRateService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftRateService.java index dde803135..511fda4c7 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftRateService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftRateService.java @@ -105,7 +105,8 @@ public class GiftRateService { GiftEarnAllotFamilyConfigDto configDto = giftEarnAllotService.getEarnAllotFamilyConfig(partitionId); rate = BigDecimal.valueOf(null != roomUid? configDto.getInRoomRate(): configDto.getOutRoomRate()); } else if (Constant.ClanMode.GUILD.equals(partitionEnum.getClanMode()) - || Constant.ClanMode.GUILD_POLICY2.equals(partitionEnum.getClanMode())) { + || Constant.ClanMode.GUILD_POLICY2.equals(partitionEnum.getClanMode()) + || Constant.ClanMode.SOVIET.equals(partitionEnum.getClanMode())) { GiftEarnAllotGuildConfigDto configDto = giftEarnAllotService.getEarnAllotGuildConfig(partitionId); rate = BigDecimal.valueOf(null != configDto.getRate()? configDto.getRate(): 0d); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildGiftRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildGiftRecordService.java index b50bce203..ff33f48b9 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildGiftRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildGiftRecordService.java @@ -13,7 +13,6 @@ import com.accompany.business.util.FullMonthCycleTimeUtil; import com.accompany.common.constant.Constant; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.enumeration.PartitionEnum; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.Users; @@ -93,6 +92,8 @@ public class GuildGiftRecordService extends ServiceImpl 0L) { statDate = DateTimeUtil.convertWithZoneId(createTime, partitionInfo.getZoneId()).format(dateFormatter); - extraDiamondDayService.updateExtraDiamond(guildMember, giftSendRecord.getReciveUid(), partitionInfo.getId(), - cycleDate, statDate, giftSendRecord.getRoomUid(), totalDiamondNum, 0D, createTime); + extraDiamondDayService.updateRoomExtraDiamond(guildMember, giftSendRecord.getUid(), giftSendRecord.getPartitionId(), + statDate, roomUid, totalDiamondNum, 0D, createTime); } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildIncomeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildIncomeService.java index c4f0ddb53..751f4dea9 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildIncomeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildIncomeService.java @@ -59,7 +59,8 @@ public class GuildIncomeService { PartitionInfo partitionInfo = partitionInfoService.getById(me.getPartitionId()); if (null == partitionInfo || (!Constant.ClanMode.GUILD.equals(partitionInfo.getClanMode()) - && !Constant.ClanMode.GUILD_POLICY2.equals(partitionInfo.getClanMode()))) { + && !Constant.ClanMode.GUILD_POLICY2.equals(partitionInfo.getClanMode()) + && !Constant.ClanMode.SOVIET.equals(partitionInfo.getClanMode()))) { throw new ServiceException(BusiStatus.FAMILY_PERMISSION_DENIED); } @@ -75,8 +76,10 @@ public class GuildIncomeService { GuildIncomePersonVo personVo = getPersonIncome(me, guildMember.getId(), partitionInfo.getZoneId()); vo.setPerson(personVo); - GuildIncomeAgencyVo agencyVo = getAgencyIncome(guildMember, partitionInfo.getZoneId()); - vo.setAgency(agencyVo); + if (!Constant.ClanMode.SOVIET.equals(partitionInfo.getClanMode())) { + GuildIncomeAgencyVo agencyVo = getAgencyIncome(guildMember, partitionInfo.getZoneId()); + vo.setAgency(agencyVo); + } return vo; } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdBillRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdBillRecordService.java index 2d2c7317d..309a2a728 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdBillRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdBillRecordService.java @@ -200,7 +200,8 @@ public class GuildUsdBillRecordService extends ServiceImpl