diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java index 12628c50a..c7263eb78 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java @@ -7,13 +7,20 @@ import com.accompany.admin.model.MonthBillRecord; import com.accompany.admin.model.UserLevelExperienceExport; import com.accompany.admin.service.MainlandAccountService; import com.accompany.admin.service.UserLevelExperienceExportService; +import com.accompany.business.constant.family.FamilyConstant; +import com.accompany.business.constant.guild.GuildConstant; import com.accompany.business.model.LevelCharm; import com.accompany.business.model.LevelExperience; import com.accompany.business.model.UserLevelCharm; import com.accompany.business.model.UserLevelExperience; +import com.accompany.business.model.family.FamilyMember; +import com.accompany.business.model.guild.GuildMember; import com.accompany.business.service.activity.WeekStarService; import com.accompany.business.service.apple.IOSRefundV2Service; +import com.accompany.business.service.family.FamilyMemberService; import com.accompany.business.service.guild.AgencyMonthSettleDetailService; +import com.accompany.business.service.guild.GuildDressUpService; +import com.accompany.business.service.guild.GuildMemberService; import com.accompany.business.service.guild.GuildUsdOperateService; import com.accompany.business.service.level.LevelService; import com.accompany.business.service.lucky.Lucky24RecordService; @@ -28,6 +35,7 @@ import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.CommonUtil; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.StringUtils; +import com.accompany.core.base.SpringContextHolder; import com.accompany.core.enumeration.PartitionEnum; import com.accompany.core.exception.AdminServiceException; import com.accompany.core.model.*; @@ -524,4 +532,16 @@ public class MyApiService { weekStarService.sendWeekStarAward(partitionIdList); log.info("send WeekStar Award end"); } + + public void repairGuildHeadwear() { + List familyMemberList = SpringContextHolder.getBean(FamilyMemberService.class).listVaildFamilyMemberByRole(null, null); + for (FamilyMember familyMember : familyMemberList) { + SpringContextHolder.getBean(GuildDressUpService.class).sendGuildHeadwear(familyMember.getUid(), 1, FamilyConstant.RoleType.OWNER.equals(familyMember.getRoleType())); + } + + List guildMemberList = SpringContextHolder.getBean(GuildMemberService.class).listVaildGuildMemberByRole(null, null); + for (GuildMember guildMember : guildMemberList) { + SpringContextHolder.getBean(GuildDressUpService.class).sendGuildHeadwear(guildMember.getUid(), guildMember.getPartitionId(), GuildConstant.RoleType.OWNER.equals(guildMember.getRoleType())); + } + } } diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java index 66e1ef49d..6258a8108 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java @@ -185,4 +185,13 @@ public class MyApiController { return BusiResult.success(); } + @GetMapping("/repairGuildHeadwear") + public BusiResult repairGuildHeadwear(Long roomId) { + if (null == roomId || !roomId.equals(603L)) { + throw new AdminServiceException(BusiStatus.PARAMERROR); + } + myApiService.repairGuildHeadwear(); + return BusiResult.success(); + } + } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberService.java index dfa1becbb..f11a1730b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberService.java @@ -31,7 +31,7 @@ public class FamilyMemberService extends ServiceImpl listVaildFamilyMemberByRole(Integer familyId, Byte roleType) { return this.lambdaQuery() - .eq(FamilyMember::getFamilyId, familyId) + .eq(null != familyId, FamilyMember::getFamilyId, familyId) .eq(null != roleType, FamilyMember::getRoleType, roleType) .eq(FamilyMember::getEnable, Boolean.TRUE) .list(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDressUpService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDressUpService.java index bc196b9f2..fabf49860 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDressUpService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDressUpService.java @@ -11,9 +11,11 @@ import com.accompany.business.vo.family.FamilyClanDecorateVo; import com.accompany.business.vo.family.FamilySkipVo; import com.accompany.common.constant.Constant; import com.accompany.common.constant.HeadwearConstant; +import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.SysConfService; +import com.accompany.core.service.common.JedisService; import com.alibaba.fastjson2.JSON; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,6 +36,8 @@ public class GuildDressUpService { private SysConfService sysConfService; @Autowired private FamilyClanService familyClanService; + @Autowired + private JedisService jedisService; public Long getNameplateId(Long uid, Integer partitionId) { GuildDressUpConfigDto config = getConfigDto(); @@ -72,7 +76,7 @@ public class GuildDressUpService { return; } GuildDressUpConfigDto partitionConfig = config.getPartitionMap().get(partitionId); - if (null == partitionConfig.getOwnerNameplateId() || null == partitionConfig.getMemberNameplateId()) { + if (null == partitionConfig.getOwnerHeadwearId() || null == partitionConfig.getMemberHeadwearId()) { return; } Integer headwearId = isOwner? partitionConfig.getOwnerHeadwearId(): partitionConfig.getMemberHeadwearId(); @@ -96,5 +100,6 @@ public class GuildDressUpService { userHeadwear.setUpdateTime(now); userHeadwearMapper.updateByPrimaryKey(userHeadwear); } + jedisService.hdel(RedisKey.user_using_headwear.getKey(), uid.toString()); } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberService.java index f646b59b0..7417208be 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberService.java @@ -32,7 +32,7 @@ public class GuildMemberService extends ServiceImpl listVaildGuildMemberByRole(Integer familyId, Byte roleType) { return this.lambdaQuery() - .eq(GuildMember::getGuildId, familyId) + .eq(null != familyId, GuildMember::getGuildId, familyId) .eq(null != roleType, GuildMember::getRoleType, roleType) .eq(GuildMember::getEnable, Boolean.TRUE) .list(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildService.java index 30757374e..bdbdbee67 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildService.java @@ -46,11 +46,6 @@ public class GuildService extends ServiceImpl { return this.baseMapper.listVaildGuildByPartitionId(partitionId); } - public List listAllEnable() { - return this.lambdaQuery() - .eq(Guild::getEnable, Boolean.TRUE).list(); - } - public Map getAgencyOwnerMapByHallIds(Set hallIds) { List agencyOwnerVos = baseMapper.getAgencyOwnerByGuildIds(hallIds);