From a0d2776cfea592019382ea10497a6b6513241a2c Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 21 Jul 2025 17:49:15 +0800
Subject: [PATCH] refactor(orderList): 修改订单状态校验逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java
index de57410..fbd31df 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java
@@ -66,6 +66,11 @@
@Override
public FebsResponse allCategory() {
List<ApiClothesCategoryInfoVo> vos = new ArrayList<>();
+ ApiClothesCategoryInfoVo apiClothesCategoryInfoVo = new ApiClothesCategoryInfoVo();
+ apiClothesCategoryInfoVo.setId(0L);
+ apiClothesCategoryInfoVo.setName("全部");
+ apiClothesCategoryInfoVo.setType(2);
+ vos.add(apiClothesCategoryInfoVo);
List<ClothesSocialCategory> list = clothesSocialCategoryMapper.selectList(
Wrappers.lambdaQuery(ClothesSocialCategory.class)
.select(ClothesSocialCategory::getId, ClothesSocialCategory::getName)
@@ -74,21 +79,18 @@
.orderByAsc(ClothesSocialCategory::getOrderCnt)
);
if(CollUtil.isNotEmpty(list)){
- vos = buildApiClothesCategoryInfoVo(list, vos);
+ vos = buildApiClothesCategoryInfoVo(list, vos,2);
}
- ApiClothesCategoryInfoVo apiClothesCategoryInfoVo = new ApiClothesCategoryInfoVo();
- apiClothesCategoryInfoVo.setId(0L);
- apiClothesCategoryInfoVo.setName("全部");
- vos.add(apiClothesCategoryInfoVo);
return new FebsResponse().success().data(vos);
}
- private List<ApiClothesCategoryInfoVo> buildApiClothesCategoryInfoVo(List<ClothesSocialCategory> list, List<ApiClothesCategoryInfoVo> vos) {
+ private List<ApiClothesCategoryInfoVo> buildApiClothesCategoryInfoVo(List<ClothesSocialCategory> list, List<ApiClothesCategoryInfoVo> vos,Integer type) {
for (ClothesSocialCategory entity : list) {
ApiClothesCategoryInfoVo vo = new ApiClothesCategoryInfoVo();
vo.setId(entity.getId());
vo.setName(entity.getName());
+ vo.setType(type);
vos.add(vo);
}
return vos;
@@ -106,7 +108,7 @@
.orderByAsc(ClothesSocialCategory::getOrderCnt)
);
if(CollUtil.isNotEmpty(list)){
- vos = buildApiClothesCategoryInfoVo(list, vos);
+ vos = buildApiClothesCategoryInfoVo(list, vos,1);
}
return new FebsResponse().success().data(vos);
}
@@ -439,6 +441,19 @@
}
@Override
+ public FebsResponse myCollect(ApiSocialMyCollectAddDto dto) {
+
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ dto.setMemberId(memberId);
+
+ // 创建分页对象，传入当前页和每页大小
+ Page<ApiSocialMyCollectVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
+ // 调用Mapper方法获取活动分页数据
+ Page<ApiSocialMyCollectVo> voPage = clothesSocialFollowMapper.selectPageInMyComment(page, dto);
+ return new FebsResponse().success().data(voPage);
+ }
+
+ @Override
public FebsResponse museToDesign(ApiClothesSocialMuseDto dto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
--
Gitblit v1.9.1