diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/room/RoomEnterCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/room/RoomEnterCmdExe.java index 926f386a..02b262e1 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/room/RoomEnterCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/room/RoomEnterCmdExe.java @@ -16,6 +16,7 @@ import com.red.circle.other.app.dto.clientobject.room.EntryRoomPropsCO; import com.red.circle.other.app.dto.clientobject.room.EntryRoomResponseCO; import com.red.circle.other.app.dto.clientobject.room.RoomThemeCO; import com.red.circle.other.app.dto.cmd.room.RoomEntryCmd; +import com.red.circle.other.app.dto.cmd.room.UpdateRoomSettingCmd; import com.red.circle.other.domain.gateway.user.UserProfileGateway; import com.red.circle.other.domain.gateway.user.ability.UserRegionGateway; import com.red.circle.other.domain.model.user.NobleAbilityCO; @@ -319,11 +320,19 @@ public class RoomEnterCmdExe { } NobleAbilityCO userNobleAbility = userProfileGateway.getUserNobleAbility(manager.getUserId()); + String mikeType = ""; + String oldMikeType = manager.getSetting().getRoomSpecialMikeType(); if (Objects.nonNull(userNobleAbility)) { RoomSetting setting = manager.getSetting(); - setting.setRoomSpecialMikeType("TYPE_VIP" + userNobleAbility.getVipLevel()); + mikeType = "TYPE_VIP" + userNobleAbility.getVipLevel(); + setting.setRoomSpecialMikeType(mikeType); manager.setSetting(setting); } + // 不一样则更新 + if (!mikeType.equals(oldMikeType)) { + roomProfileManagerService.updateSelectiveSetting(manager.getId(), + roomProfileAppConvertor.toRoomSetting(new UpdateRoomSettingCmd().setRoomId(manager.getId()).setRoomSpecialMikeType(mikeType))); + } } diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/TeamBdMemberBillCmd.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/TeamBdMemberBillCmd.java index cdf23c94..fd77323a 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/TeamBdMemberBillCmd.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/TeamBdMemberBillCmd.java @@ -2,6 +2,7 @@ package com.red.circle.other.app.dto.cmd; import com.red.circle.common.business.dto.PageQueryCmd; import com.red.circle.common.business.dto.cmd.AppExtCommand; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,24 +19,7 @@ import java.time.LocalDate; @Data public class TeamBdMemberBillCmd extends AppExtCommand { - /** - * 查询开始日期. - */ - private LocalDate startDate; - - /** - * 查询结束日期. - */ - private LocalDate endDate; - - /** - * 页码. - */ - private Integer pageNum; - - /** - * 每页大小. - */ - private Integer pageSize; + @NotBlank + private String type; }