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

cpValue 相同时按照时间正排序

Browse Source
This commit is contained in:
tianfeng 2025-12-11 21:10:02 +08:00
parent 53b8aa2506
commit 76f5cbdae6
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/CpSimpleUserProfileCO.java
View File

@ -8,6 +8,7 @@ import lombok.experimental.Accessors;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Timestamp;
/** /**
* CP简化用户资料 * CP简化用户资料
@ -77,4 +78,6 @@ public class CpSimpleUserProfileCO implements Serializable {
*/ */
private String firstDay; private String firstDay;
private Timestamp createTime;
} }

2
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/user/user/impl/CpRelationshipServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.red.circle.other.infra.database.rds.service.user.user.impl;
import com.red.circle.framework.mybatis.constant.PageConstant; import com.red.circle.framework.mybatis.constant.PageConstant;
import com.red.circle.framework.mybatis.entity.TimestampBaseEntity;
import com.red.circle.framework.mybatis.service.impl.BaseServiceImpl; import com.red.circle.framework.mybatis.service.impl.BaseServiceImpl;
import com.red.circle.tool.core.collection.CollectionUtils; import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.date.LocalDateUtils; import com.red.circle.tool.core.date.LocalDateUtils;
@ -85,6 +86,7 @@ public class CpRelationshipServiceImpl extends
return query() return query()
.eq(CpRelationship::getUserId, userId) .eq(CpRelationship::getUserId, userId)
.eq(CpRelationship::getStatus, CpRelationshipStatus.NORMAL.name()) .eq(CpRelationship::getStatus, CpRelationshipStatus.NORMAL.name())
.orderByAsc(TimestampBaseEntity::getCreateTime)
.list(); .list();
} }

4
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/gateway/user/UserRunProfileTransportGatewayImpl.java
View File

@ -368,11 +368,13 @@ public class UserRunProfileTransportGatewayImpl implements UserRunProfileTranspo
.setCpUserAvatar(cpUser.getUserAvatar()) .setCpUserAvatar(cpUser.getUserAvatar())
.setCpUserNickname(cpUser.getUserNickname()) .setCpUserNickname(cpUser.getUserNickname())
.setCpValue(cpValue) .setCpValue(cpValue)
.setCreateTime(cpRelationship.getCreateTime())
.setDays(days) .setDays(days)
.setFirstDay(firstDay); .setFirstDay(firstDay);
}) })
.filter(Objects::nonNull) .filter(Objects::nonNull)
.sorted(Comparator.comparing(CpSimpleUserProfileCO::getCpValue).reversed()) .sorted(Comparator.comparing(CpSimpleUserProfileCO::getCpValue).reversed()
.thenComparing(CpSimpleUserProfileCO::getCreateTime))
.toList(); .toList();
userRunProfile.setCpList(cpList); userRunProfile.setCpList(cpList);