From f236a24c5766fb524a4dadc44a0f7b6ae288141c Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 21 Apr 2026 13:44:43 +0800
Subject: [PATCH] fix(ai): 修正产品分类和产品的排序逻辑,排序从升序改为降序
---
src/main/java/cc/mrbird/febs/ai/service/impl/AiProductCategoryServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiProductCategoryServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiProductCategoryServiceImpl.java
index 7baeb7a..8da7f81 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiProductCategoryServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiProductCategoryServiceImpl.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.ai.entity.AiMemberRole;
import cc.mrbird.febs.ai.entity.AiProductCategory;
+import cc.mrbird.febs.ai.enumerates.AiCommonEnum;
import cc.mrbird.febs.ai.enumerates.ProductCategoryLevelEnum;
import cc.mrbird.febs.ai.mapper.AiProductCategoryMapper;
import cc.mrbird.febs.ai.req.productCategory.ApiProductCategoryAllDto;
@@ -58,7 +59,8 @@
query.eq(AiProductCategory::getLevel, ProductCategoryLevelEnum.LEVEL_TWO.getLevel());
query.eq(AiProductCategory::getState, 1);
query.eq(AiProductCategory::getHotState, 1);
- query.orderByAsc(AiProductCategory::getSort);
+// query.orderByAsc(AiProductCategory::getSort);
+ query.orderByDesc(AiProductCategory::getSort);
List<AiProductCategory> listByQuery = this.getListByQuery(query);
if (CollUtil.isNotEmpty(listByQuery)){
for (AiProductCategory aiProductCategory : listByQuery){
@@ -79,15 +81,15 @@
List<ApiProductCategoryVo> list = new ArrayList<>();
LambdaQueryWrapper<AiProductCategory> query = Wrappers.lambdaQuery(AiProductCategory.class);
- if (StrUtil.isNotEmpty(dto.getCompanyId())){
- query.eq(AiProductCategory::getCompanyId, dto.getCompanyId());
- }else{
- query.isNull(AiProductCategory::getCompanyId);
+ if (StrUtil.isEmpty(dto.getCompanyId())){
+ dto.setCompanyId(AiCommonEnum.COMPANY_ID.getPrompt());
}
+ query.eq(AiProductCategory::getCompanyId, dto.getCompanyId());
query.eq(AiProductCategory::getLevel, ProductCategoryLevelEnum.LEVEL_TWO.getLevel());
query.eq(AiProductCategory::getState, 1);
query.eq(AiProductCategory::getHotState, 1);
- query.orderByAsc(AiProductCategory::getSort);
+// query.orderByAsc(AiProductCategory::getSort);
+ query.orderByDesc(AiProductCategory::getSort);
List<AiProductCategory> listByQuery = this.getListByQuery(query);
if (CollUtil.isNotEmpty(listByQuery)){
for (AiProductCategory aiProductCategory : listByQuery){
@@ -108,15 +110,15 @@
List<ApiProductCategoryVo> list = new ArrayList<>();
LambdaQueryWrapper<AiProductCategory> query = Wrappers.lambdaQuery(AiProductCategory.class);
- if (StrUtil.isNotEmpty(dto.getCompanyId())){
- query.eq(AiProductCategory::getCompanyId, dto.getCompanyId());
- }else{
- query.isNull(AiProductCategory::getCompanyId);
+ if (StrUtil.isEmpty(dto.getCompanyId())){
+ dto.setCompanyId(AiCommonEnum.COMPANY_ID.getPrompt());
}
+ query.eq(AiProductCategory::getCompanyId, dto.getCompanyId());
query.eq(AiProductCategory::getLevel, ProductCategoryLevelEnum.LEVEL_ONE.getLevel());
query.eq(AiProductCategory::getState, 1);
query.eq(AiProductCategory::getHotState, 1);
- query.orderByAsc(AiProductCategory::getSort);
+// query.orderByAsc(AiProductCategory::getSort);
+ query.orderByDesc(AiProductCategory::getSort);
List<AiProductCategory> listByQuery = this.getListByQuery(query);
if (CollUtil.isNotEmpty(listByQuery)){
for (AiProductCategory aiProductCategory : listByQuery){
@@ -132,11 +134,25 @@
}
@Override
- public FebsResponse categoryList(ApiProductCategoryPageDto dto) {
- // 创建分页对象，传入当前页和每页大小
- Page<ApiProductCategoryVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
- Page<ApiProductCategoryVo> pageListByQuery = this.getPageListByQuery(page, dto);
- return new FebsResponse().success().data(pageListByQuery);
+ public FebsResponse categoryChildList(ApiProductCategoryPageDto dto) {
+ List<ApiProductCategoryVo> vos = new ArrayList<>();
+
+ List<AiProductCategory> aiProductCategories = aiProductCategoryMapper.selectList(
+ Wrappers.lambdaQuery(AiProductCategory.class)
+ .eq(AiProductCategory::getParentId, dto.getParentId())
+ .eq(AiProductCategory::getState, 1)
+// .orderByAsc(AiProductCategory::getSort)
+ .orderByDesc(AiProductCategory::getSort)
+ );
+ if (CollUtil.isNotEmpty(aiProductCategories)){
+ for (AiProductCategory aiProductCategory : aiProductCategories) {
+ ApiProductCategoryVo vo = new ApiProductCategoryVo();
+ vo.setId(aiProductCategory.getId());
+ vo.setName(aiProductCategory.getName());
+ vos.add(vo);
+ }
+ }
+ return new FebsResponse().success().data(vos);
}
@Override
@@ -158,14 +174,14 @@
public FebsResponse allList(ApiProductCategoryAllDto dto) {
List<ApiProductCategoryVo> list = new ArrayList<>();
LambdaQueryWrapper<AiProductCategory> query = Wrappers.lambdaQuery(AiProductCategory.class);
- if (StrUtil.isNotEmpty(dto.getCompanyId())){
- query.eq(AiProductCategory::getCompanyId, dto.getCompanyId());
- }else{
- query.isNull(AiProductCategory::getCompanyId);
+ if (StrUtil.isEmpty(dto.getCompanyId())){
+ dto.setCompanyId(AiCommonEnum.COMPANY_ID.getPrompt());
}
+ query.eq(AiProductCategory::getCompanyId, dto.getCompanyId());
query.eq(AiProductCategory::getState, 1);
query.eq(AiProductCategory::getLevel, ProductCategoryLevelEnum.LEVEL_ONE.getLevel());
- query.orderByAsc(AiProductCategory::getSort);
+// query.orderByAsc(AiProductCategory::getSort);
+ query.orderByDesc(AiProductCategory::getSort);
List<AiProductCategory> listByQuery = this.getListByQuery(query);
if (CollUtil.isNotEmpty(listByQuery)){
for (AiProductCategory aiProductCategory : listByQuery){
--
Gitblit v1.9.1