hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

勋章查询接口更改

Browse Source
This commit is contained in:
tianfeng 2026-05-12 10:36:22 +08:00
parent 6fdf9c5f09
commit b60178b596
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/enums/material/BadgeConfigTypeEnum.java
View File

@ -42,7 +42,12 @@ public enum BadgeConfigTypeEnum {
/** /**
* 家族徽章. * 家族徽章.
*/ */
FAMILY; FAMILY,
/**
* 活动 成就 管理员
*/
ALL;
public boolean eq(String name) { public boolean eq(String name) {
return Objects.equals(this.name(), name); return Objects.equals(this.name(), name);

3
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/query/UserBadgeTableQryExe.java
View File

@ -45,8 +45,7 @@ public class UserBadgeTableQryExe {
public List<BadgeGroupTableCO> execute(UserBadgeQueryCmd cmd) { public List<BadgeGroupTableCO> execute(UserBadgeQueryCmd cmd) {
List<BadgeConfig> badgeConfigs = badgeConfigService List<BadgeConfig> badgeConfigs = badgeConfigService
.listBadgeConfig(Objects.isNull(cmd.getType()) .listBadgeConfig(cmd.getType());
? BadgeConfigTypeEnum.ACHIEVEMENT : cmd.getType());
if (CollectionUtils.isEmpty(badgeConfigs)) { if (CollectionUtils.isEmpty(badgeConfigs)) {
return Lists.newArrayList(); return Lists.newArrayList();

16
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/badge/impl/BadgeConfigServiceImpl.java
View File

@ -14,11 +14,8 @@ import com.red.circle.other.inner.model.cmd.sys.GiveBadgeConfigQryCmd;
import com.red.circle.other.inner.model.cmd.sys.SysBadgeConfigQryCmd; import com.red.circle.other.inner.model.cmd.sys.SysBadgeConfigQryCmd;
import com.red.circle.tool.core.collection.CollectionUtils; import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.text.StringUtils; import com.red.circle.tool.core.text.StringUtils;
import java.util.List;
import java.util.Map; import java.util.*;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -97,6 +94,15 @@ public class BadgeConfigServiceImpl extends BaseServiceImpl<BadgeConfigDAO, Badg
@Override @Override
public List<BadgeConfig> listBadgeConfig(BadgeConfigTypeEnum type) { public List<BadgeConfig> listBadgeConfig(BadgeConfigTypeEnum type) {
if (type == BadgeConfigTypeEnum.ALL) {
return query()
.in(BadgeConfig::getType, Arrays.asList(BadgeConfigTypeEnum.ACTIVITY, BadgeConfigTypeEnum.ACHIEVEMENT, BadgeConfigTypeEnum.ADMINISTRATOR))
.eq(BadgeConfig::getDel, Boolean.FALSE)
.orderByAsc(BadgeConfig::getBadgeLevel)
.last(PageConstant.formatLimit(300))
.list();
}
return query().eq(BadgeConfig::getType, type) return query().eq(BadgeConfig::getType, type)
.eq(BadgeConfig::getDel, Boolean.FALSE) .eq(BadgeConfig::getDel, Boolean.FALSE)
.orderByAsc(BadgeConfig::getBadgeLevel) .orderByAsc(BadgeConfig::getBadgeLevel)