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 ccb7112d..25896cb5 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 @@ -286,7 +286,7 @@ public class ManagerAuthServiceImpl implements ManagerAuthService { // UserProfile admin = userProfileGateway.getByUserId(cmd.requiredReqUserId()); - sendPropsRecord(cmd, propsSourceRecord.getType()); + sendPropsRecord(cmd, propsSourceRecord.getType(), 7); //vip单独处理 if (propsSourceRecord.getType().equals(PropsCommodityType.NOBLE_VIP.name())) { PropsNobleVipAbilityDTO vipAbility = propsNobleVipGateway.getAbilityDTO(propsSourceRecord.getId()); @@ -294,25 +294,25 @@ public class ManagerAuthServiceImpl implements ManagerAuthService { .equals(vipAbility.getCarId(), 0L)) { cmd.setPropsId(vipAbility.getCarId()); - sendPropsRecord(cmd, ConsolePropsTypeEnum.RIDE.getName()); + sendPropsRecord(cmd, ConsolePropsTypeEnum.RIDE.getName(), 3); } if (Objects.nonNull(vipAbility.getAvatarFrameId()) && !Objects.equals(vipAbility.getAvatarFrameId(), 0L)) { cmd.setPropsId(vipAbility.getAvatarFrameId()); - sendPropsRecord(cmd, ConsolePropsTypeEnum.AVATAR_FRAME.getName()); + sendPropsRecord(cmd, ConsolePropsTypeEnum.AVATAR_FRAME.getName(), 3); } if (Objects.nonNull(vipAbility.getChatBubbleId()) && !Objects.equals(vipAbility.getChatBubbleId(), 0L)) { cmd.setPropsId(vipAbility.getChatBubbleId()); - sendPropsRecord(cmd, ConsolePropsTypeEnum.CHAT_BUBBLE.getName()); + sendPropsRecord(cmd, ConsolePropsTypeEnum.CHAT_BUBBLE.getName(), 3); } if (Objects.nonNull(vipAbility.getDataCardId()) && !Objects.equals(vipAbility.getDataCardId(), 0L)) { cmd.setPropsId(vipAbility.getDataCardId()); - sendPropsRecord(cmd, ConsolePropsTypeEnum.DATA_CARD.getName()); + sendPropsRecord(cmd, ConsolePropsTypeEnum.DATA_CARD.getName(), 3); } } @@ -348,7 +348,7 @@ public class ManagerAuthServiceImpl implements ManagerAuthService { } - private void sendPropsRecord(PropsGiveAwayCmd cmd, String sourceType) { + private void sendPropsRecord(PropsGiveAwayCmd cmd, String sourceType, Integer days) { //开始赠送道具 log.info("admin free props start.{}", cmd); // 赠送的都是7天 @@ -358,7 +358,7 @@ public class ManagerAuthServiceImpl implements ManagerAuthService { .setType(sourceType) .setOrigin(SendPropsOrigin.ADMIN_FREE.name()) .setOriginDesc(SendPropsOrigin.ADMIN_FREE.getDesc()) - .setDays(7) + .setDays(days) .setUseProps(Boolean.TRUE) .setAllowGive(Boolean.FALSE) .setOpUser(cmd.requiredReqUserId())); @@ -379,7 +379,7 @@ public class ManagerAuthServiceImpl implements ManagerAuthService { officialNoticeClient.send( NoticeExtTemplateCustomizeCmd.builder().toAccount(cmd.getAcceptUserId()) .noticeType(OfficialNoticeTypeEnum.GIVE_AWAY_PROPS) - .content(I18nUtils.getPropsRewardContent(sourceType, 7, I18nUtils.getLanguageByRegion(region.getRegionName()))) + .content(I18nUtils.getPropsRewardContent(sourceType, days, I18nUtils.getLanguageByRegion(region.getRegionName()))) .expand(null) .build()); }