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

独联体-单独政策

Browse Source
This commit is contained in:
hokli
2025-09-18 18:17:21 +08:00
parent 1b9e5a6e97
commit 4610632a4d
22 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java
View File

@@ -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);
}

3
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCancelAdminService.java
View File

@@ -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());

1
accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java
View File

@@ -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";
}
/**

2
accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/PartitionEnum.java
View File

@@ -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;

6
accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/BravoGiftGoldIncomeListener.java
View File

@@ -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<BravoGif
Long roomUid = message.getRoomUid();
Date messTime = message.getCreateTime();
Integer partitionId = receiver.getPartitionId();
PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(partitionId);
try {
rankService.updateAllRank(sendUid, recvUid, roomUid, totalDiamondNum, messTime.getTime(), partitionId);
roomRankService.updateRoomRank(roomUid, sendUid, recvUid, totalDiamondNum, messTime, Boolean.FALSE, partitionId);
if (!Constant.ClanMode.SOVIET.equals(partitionEnum.getClanMode())) { //独联体房间排行榜不算金币流水
roomRankService.updateRoomRank(roomUid, sendUid, recvUid, totalDiamondNum, messTime, Boolean.FALSE, partitionId);
}
if (roomUid == null) {
return;
}

17
accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/SuperLuckyGiftDiamondIncomeListener.java
View File

@@ -13,7 +13,6 @@ import com.accompany.business.service.user.UsersService;
import com.accompany.business.util.CycleTimeUtil;
import com.accompany.business.util.FullMonthCycleTimeUtil;
import com.accompany.common.constant.Constant;
import com.accompany.core.enumeration.PartitionEnum;
import com.accompany.core.model.PartitionInfo;
import com.accompany.core.model.Users;
import com.accompany.core.service.partition.PartitionInfoService;
@@ -49,19 +48,21 @@ public class SuperLuckyGiftDiamondIncomeListener implements ApplicationListener<
public void onApplicationEvent(SuperLuckyGiftDiamondIncomeMessageEvent event) {
SuperLuckyGiftDiamondIncomeMessage message = (SuperLuckyGiftDiamondIncomeMessage) event.getSource();
Long receiverUid = message.getReceiverUid();
Long roomUid = message.getRoomUid();
Users receiver = usersService.getNotNullUsersByUid(receiverUid);
PartitionInfo partitionInfo = partitionInfoService.getById(receiver.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()))) {
return;
}
String cycleDate = null, statDate = null;
Date time = message.getCreateTime();
GuildMember guildMember = guildMemberService.getVaildGuildMemberByUid(receiverUid);
if (null != guildMember) {
if (null != guildMember) { //不可提前退出，独联体有特殊处理
Double totalDiamondNum = message.getTotalDiamondNum();
if (Constant.ClanMode.GUILD.equals(partitionInfo.getClanMode())) {
cycleDate = CycleTimeUtil.getCycleDateByZoneId(time, partitionInfo.getZoneId());
@@ -72,14 +73,18 @@ public class SuperLuckyGiftDiamondIncomeListener implements ApplicationListener<
cycleDate = FullMonthCycleTimeUtil.getCycleDateByZoneId(time, partitionInfo.getZoneId());
statDate = FullMonthCycleTimeUtil.getCycleDay(time, partitionInfo.getZoneId());
guildDiamondStatisticsPolicy2Service.updateDayDiamondStatistics(cycleDate, statDate, guildMember, totalDiamondNum);
} else if (Constant.ClanMode.SOVIET.equals(partitionInfo.getClanMode())) {
cycleDate = CycleTimeUtil.getCycleDateByZoneId(time, partitionInfo.getZoneId());
statDate = CycleTimeUtil.getCycleDay(time, partitionInfo.getZoneId());
extraDiamondDayService.updateGuildExtraDiamond(guildMember, cycleDate, statDate, 0D,totalDiamondNum, time);
}
//todo 时区 zoneId
guildRankService.updateRank(guildMember.getGuildId(), guildMember.getUid(), totalDiamondNum, receiver.getPartitionId());
}
if (partitionInfo.getId() == PartitionEnum.SOVIET.getId()) {
extraDiamondDayService.updateExtraDiamond(guildMember, receiverUid, partitionInfo.getId(), cycleDate, statDate,
message.getRoomUid(),0D, message.getTotalDiamondNum(), time);
if (roomUid != null && roomUid > 0L) {
extraDiamondDayService.updateRoomExtraDiamond(guildMember, roomUid, receiver.getPartitionId(), statDate,
roomUid, 0D, message.getTotalDiamondNum(), time);
}
}
}

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekActiveGuildMemberStatService.java
View File

@@ -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;
}

8
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildStatService.java
View File

@@ -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<Guild> 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<Guild> guildList = guildService.listByIds(guildIdList);
guildList.forEach(guild->{
ownerUidMap.put(guild.getId(), guild.getOwnerUid());

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/GoldExchangeDiamondService.java
View File

@@ -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;

18
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/extradiamond/ExtraDiamondDayService.java
View File

@@ -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);

6
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyClanService.java
View File

@@ -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();

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftEarnAllotService.java
View File

@@ -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);

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftRateService.java
View File

@@ -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);
}

10
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildGiftRecordService.java
View File

@@ -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<GuildGiftRecordMapper, G
cycleDate = FullMonthCycleTimeUtil.getCycleDateByZoneId(createTime, partitionInfo.getZoneId());
statDate = FullMonthCycleTimeUtil.getCycleDay(createTime, partitionInfo.getZoneId());
guildDiamondStatisticsPolicy2Service.updateDayDiamondStatistics(cycleDate, statDate, guildMember, totalDiamondNum);
} else if (Constant.ClanMode.SOVIET.equals(partitionInfo.getClanMode())) {
extraDiamondDayService.updateGuildExtraDiamond(guildMember, cycleDate, statDate, totalDiamondNum, 0D, createTime);
}
guildRankService.updateRank(guildGiftRecord);
@@ -109,10 +110,11 @@ public class GuildGiftRecordService extends ServiceImpl<GuildGiftRecordMapper, G
)));
}
if (partitionInfo.getId() == PartitionEnum.SOVIET.getId()) {
Long roomUid = giftSendRecord.getRoomUid();
if (roomUid != null && roomUid > 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);
}
}

9
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildIncomeService.java
View File

@@ -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;
}

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdBillRecordService.java
View File

@@ -200,7 +200,8 @@ public class GuildUsdBillRecordService extends ServiceImpl<GuildUsdBillRecordMap
Users me = usersService.getNotNullUsersByUid(uid);
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()))
|| !rechargeUserService.isRechargeUser(uid)) {
throw new ServiceException(BusiStatus.FAMILY_PERMISSION_DENIED);
}

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/DiamondGiveHistoryService.java
View File

@@ -622,7 +622,8 @@ public class DiamondGiveHistoryService extends ServiceImpl<DiamondGiveHistoryMap
Long aLong = this.totalGiveGoldNOSub(uid, Date.from(cycleDateBegin.toInstant()), Date.from(cycleDateEnd.toInstant()));
diamondGiveHistoryPageVo.setTotalGiveGold(aLong == 0 ? 0 : (-1 * aLong));
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())) {
Double aDouble = guildUsdBillRecordService.sumRechargeUsd(uid, cycleDateBegin.format(DateTimeUtil.dateFormatter), GuildUsdOperateTypeEnum.USD_TO_RECHARGE_USER.getType());
diamondGiveHistoryPageVo.setTotalGiveGoldUsd(aDouble == 0 ? 0 : (-1 * aDouble));
}

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/MonthRankTaskService.java
View File

@@ -117,7 +117,8 @@ public class MonthRankTaskService {
}
}
} 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(), RankConstant.PeriodType.previousOne);
if (CollectionUtils.isEmpty(clanRankListVOS)) {
return;

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/GuildMemberRoomMicRecordService.java
View File

@@ -389,7 +389,9 @@ public class GuildMemberRoomMicRecordService extends ServiceImpl<GuildMemberRoom
}
String cycleDate;
String statDate = nowzonedDateTime.format(DateTimeUtil.dateFormatter);
if (PartitionEnum.getByPartitionId(partitionId).getClanMode().equals(Constant.ClanMode.GUILD)) {
PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(partitionId);
if (partitionEnum.getClanMode().equals(Constant.ClanMode.GUILD)
|| partitionEnum.getClanMode().equals(Constant.ClanMode.SOVIET)) {
cycleDate = CycleTimeUtil.getAgencyCycleBeginDateStr(date);
} else {
cycleDate = FullMonthCycleTimeUtil.getAgencyCycleBeginDateStr(date);

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserCancelService.java
View File

@@ -123,7 +123,8 @@ public class UserCancelService {
familyManagerService.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(uid);
if (vaildGuildMemberByUid != null && GuildConstant.RoleType.OWNER.equals(vaildGuildMemberByUid.getRoleType())) {
GuildVo validOwnUid = guildManagerService.getGuildVo(users.getUid());

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserDetailsService.java
View File

@@ -162,7 +162,8 @@ public class UserDetailsService extends BaseService {
AgencyOwnerVo guildInfo = familyManagerService.getByMemberUid(uid);
userDetailsVo.setGuildInfo(guildInfo);
} 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())) {
AgencyOwnerVo guildInfo = guildManagerService.getByMemberUid(uid);
userDetailsVo.setGuildInfo(guildInfo);
}

3
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/recharge/RechargeUserController.java
View File

@@ -60,7 +60,8 @@ public class RechargeUserController {
Long aLong = diamondGiveHistoryService.totalGiveGoldNOSub(uid, Date.from(cycleDateZdt.toInstant()), new Date());
info.setTotalGiveGold(aLong == 0 ? 0 : (-1 * aLong));
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())) {
Double aDouble = guildUsdBillRecordService.sumRechargeUsd(uid, cycleDateZdt.format(DateTimeUtil.dateFormatter), GuildUsdOperateTypeEnum.USD_TO_RECHARGE_USER.getType());
info.setTotalGiveGoldUsd(aDouble == 0 ? 0 : (-1 * aDouble));
}