irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

feat: 🎁店员等级新增排序字段

Browse Source
This commit is contained in:
hucs-dev
2025-11-04 10:49:05 +08:00
parent 83112b406a
commit f39fc4f040
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkLevelInfoEntity.java
View File

@@ -69,4 +69,6 @@ public class PlayClerkLevelInfoEntity extends BaseEntity<PlayClerkLevelInfoEntit
private Integer styleType; private Integer styleType;
private String styleImageUrl; private String styleImageUrl;
private Long orderNumber;
} }

2
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelEditVo.java
View File

@@ -68,4 +68,6 @@ public class PlayClerkLevelEditVo {
@ApiModelProperty(value = "样式图片URL", example = "https://example.com/style.jpg", notes = "等级样式图片URL") @ApiModelProperty(value = "样式图片URL", example = "https://example.com/style.jpg", notes = "等级样式图片URL")
private String styleImageUrl; private String styleImageUrl;
private Long orderNumber;
} }

2
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkLevelInfoServiceImpl.java
View File

@@ -43,6 +43,7 @@ public class PlayClerkLevelInfoServiceImpl extends ServiceImpl<PlayClerkLevelInf
entity.setFirstRegularRatio(45); entity.setFirstRegularRatio(45);
entity.setNotFirstRegularRatio(50); entity.setNotFirstRegularRatio(50);
entity.setLevel(1); entity.setLevel(1);
entity.setOrderNumber(1L);
entity.setStyleType(entity.getLevel()); entity.setStyleType(entity.getLevel());
entity.setTenantId(sysTenantEntity.getTenantId()); entity.setTenantId(sysTenantEntity.getTenantId());
this.baseMapper.insert(entity); this.baseMapper.insert(entity);
@@ -64,6 +65,7 @@ public class PlayClerkLevelInfoServiceImpl extends ServiceImpl<PlayClerkLevelInf
entity.setFirstRegularRatio(45); entity.setFirstRegularRatio(45);
entity.setNotFirstRegularRatio(50); entity.setNotFirstRegularRatio(50);
entity.setLevel(1); entity.setLevel(1);
entity.setOrderNumber(1L);
entity.setStyleType(1); entity.setStyleType(1);
this.baseMapper.insert(entity); this.baseMapper.insert(entity);
return entity; return entity;

7
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
View File

@@ -344,10 +344,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getOnboardingState, vo.getOnboardingState()); lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getOnboardingState, vo.getOnboardingState());
} }
// 排序：置顶状态优先，在线用户其次，最后按创建时间倒序 // 排序：先按等级字段排序(越小的越在前面)，再按在线状态排序
lambdaQueryWrapper.orderByDesc(PlayClerkUserInfoEntity::getPinToTopState) lambdaQueryWrapper.orderByAsc(PlayClerkLevelInfoEntity::getOrderNumber)
.orderByDesc(PlayClerkUserInfoEntity::getOnlineState) .orderByDesc(PlayClerkUserInfoEntity::getOnlineState);
.orderByDesc(PlayClerkUserInfoEntity::getCreatedTime);
return this.baseMapper.selectJoinPage(page, PlayClerkUserInfoResultVo.class, lambdaQueryWrapper); return this.baseMapper.selectJoinPage(page, PlayClerkUserInfoResultVo.class, lambdaQueryWrapper);
} }