From 642acf033d0f9b81c5a1926d1e7a8107af751f72 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Wed, 22 Oct 2025 15:53:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E9=81=93=E5=85=B7?= =?UTF-8?q?=E8=B5=A0=E9=80=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/user/ManagerAuthServiceImpl.java | 17 ++++++++++++++++- .../impl/PropsBackpackClientServiceImpl.java | 1 - 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/ManagerAuthServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/ManagerAuthServiceImpl.java index 01995fe7..6759bfac 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/ManagerAuthServiceImpl.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/ManagerAuthServiceImpl.java @@ -44,6 +44,7 @@ import com.red.circle.other.infra.database.rds.service.team.BusinessDevelopmentT import com.red.circle.other.inner.asserts.user.UserErrorCode; import com.red.circle.other.inner.endpoint.material.props.PropsBackpackClient; import com.red.circle.other.inner.endpoint.material.props.PropsNobleVipClient; +import com.red.circle.other.inner.endpoint.user.user.UserProfileClient; import com.red.circle.other.inner.enums.material.ConsolePropsTypeEnum; import com.red.circle.other.inner.enums.material.PropsCommodityType; import com.red.circle.other.inner.enums.team.TeamMemberRole; @@ -92,7 +93,7 @@ public class ManagerAuthServiceImpl implements ManagerAuthService { private final TeamProfileService teamProfileService; private final UserSpecialIdService userSpecialIdService; private final PropsNobleVipGateway propsNobleVipGateway; - private final BusinessDevelopmentTeamService businessDevelopmentTeamService; + private final UserProfileClient userProfileClient; private final OfficialNoticeClient officialNoticeClient; private final AdministratorAuthService administratorAuthService; private final PropsNobleVipClient propsNobleVipClient; @@ -331,6 +332,9 @@ public class ManagerAuthServiceImpl implements ManagerAuthService { cmd.setPropsId(vipAbility.getDataCardId()); sendPropsRecord(cmd, ConsolePropsTypeEnum.DATA_CARD.getName(), 3); } + + // 使用最大等级的VIP + useMaxNobleVip(cmd.getAcceptUserId()); } } @@ -364,6 +368,17 @@ public class ManagerAuthServiceImpl implements ManagerAuthService { return userManagerAuths; } + private void useMaxNobleVip(Long receiverId) { + PropsNobleVipAbilityDTO abilityDTO = propsNobleVipClient.getUserMaxAbilityDTO(receiverId).getBody(); + if (Objects.isNull(abilityDTO)) { + return; + } + propsBackpackClient.switchUseProps(receiverId, abilityDTO.getId()); + propsBackpackClient.switchUseProps(receiverId, abilityDTO.getAvatarFrameId()); + propsBackpackClient.switchUseProps(receiverId, abilityDTO.getDataCardId()); + propsBackpackClient.switchUseProps(receiverId, abilityDTO.getCarId()); + userProfileClient.removeCacheAll(receiverId); + } private void sendPropsRecord(PropsGiveAwayCmd cmd, String sourceType, Integer days) { //开始赠送道具 diff --git a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsBackpackClientServiceImpl.java b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsBackpackClientServiceImpl.java index 2dc9d5b1..5df76550 100644 --- a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsBackpackClientServiceImpl.java +++ b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsBackpackClientServiceImpl.java @@ -78,7 +78,6 @@ public class PropsBackpackClientServiceImpl implements PropsBackpackClientServic public void giveProps(GivePropsBackpackCmd cmd) { List list = propsBackpackService.query() - .select(PropsBackpack::getId) .eq(PropsBackpack::getUserId, cmd.getAcceptUserId()) .eq(PropsBackpack::getType, cmd.getType()) .gt(PropsBackpack::getExpireTime, TimestampUtils.now())