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 | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 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 c9166ad..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,16 +79,18 @@
.orderByAsc(ClothesSocialCategory::getOrderCnt)
);
if(CollUtil.isNotEmpty(list)){
- vos = buildApiClothesCategoryInfoVo(list, vos);
+ vos = buildApiClothesCategoryInfoVo(list, vos,2);
}
+
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;
@@ -101,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);
}
@@ -125,7 +132,7 @@
Wrappers.lambdaQuery(ClothesSocialFollow.class)
.select(ClothesSocialFollow::getId, ClothesSocialFollow::getSourceId)
.in(ClothesSocialFollow::getSourceId, socialIds)
- .eq(ClothesSocialFollow::getType, SocialTypeEnum.LIKE.getValue())
+ .eq(ClothesSocialFollow::getSourceType, SocialSourceTypeEnum.SOCIAL.getValue())
);
Map<Long, Long> likeCountBySocialIdMap = new HashMap<>();
@@ -240,10 +247,13 @@
}
apiSocialMuseVo.setTotalAmount(totalAmount.setScale(2, RoundingMode.DOWN));
+ apiSocialInfoVo.setMuse(apiSocialMuseVo);
+
List<ClothesSocialFollow> clothesSocialFollows = clothesSocialFollowMapper.selectList(
Wrappers.lambdaQuery(ClothesSocialFollow.class)
.select(ClothesSocialFollow::getType)
.eq(ClothesSocialFollow::getSourceId, socialId)
+ .eq(ClothesSocialFollow::getSourceType, SocialSourceTypeEnum.SOCIAL.getValue())
);
if (CollUtil.isNotEmpty(clothesSocialFollows)){
@@ -322,7 +332,7 @@
List<ClothesLocationRemark> clothesLocationRemarks = new ArrayList<>();
List<ClothesPatternRemark> clothesPatternRemarks = new ArrayList<>();
- if(CollUtil.isEmpty(clothesOrderItems)){
+ if(CollUtil.isNotEmpty(clothesOrderItems)){
for (ClothesOrderItem item : clothesOrderItems){
if (ClothesOrderItemEnum.CLOTH.getCode() == item.getType()) {
ClothesCloth cloth = clothesClothMapper.selectById(item.getItemId());
@@ -431,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();
@@ -456,6 +479,7 @@
if(ObjectUtil.isNotNull(clothesSize)){
record.setSizeId(sizeId);
record.setSizeName(clothesSize.getName());
+ record.setSizeImage(clothesSize.getImage());
record.setSizePrice(clothesSize.getPrice());
}
}
@@ -473,6 +497,7 @@
ApiClothesPatternRemarkVo vo = new ApiClothesPatternRemarkVo();
ClothesPattern pattern = clothesPatternMapper.selectById(patternRemark.getPatternId());
vo.setPatternName(pattern.getName());
+ vo.setPatternImage(pattern.getImage());
vo.setPatternPrice(pattern.getPrice());
vo.setPatternId(pattern.getId());
vo.setPatternRemark(patternRemark.getRemark());
@@ -497,6 +522,7 @@
ClothesLocation clothesLocation = clothesLocationMapper.selectById(locationRemark.getLocationId());
vo.setLocationName(clothesLocation.getName());
vo.setLocationRemark(locationRemark.getRemark());
+ vo.setLocationImage(clothesLocation.getImage());
vo.setLocationPrice(clothesLocation.getPrice());
vo.setLocationId(clothesLocation.getId());
locationRemarkList.add(vo);
@@ -514,6 +540,7 @@
ClothesArt clothesArt = clothesArtMapper.selectById(artId);
if (ObjectUtil.isNotNull(clothesArt)){
record.setArtId(artId);
+ record.setArtImage(clothesArt.getImage());
record.setArtName(clothesArt.getName());
record.setArtPrice(clothesArt.getPrice());
}
@@ -528,6 +555,7 @@
ClothesCloth clothesCloth = clothesClothMapper.selectById(clothId);
if (ObjectUtil.isNotNull(clothesCloth)){
record.setClothId(clothId);
+ record.setClothImage(clothesCloth.getImage());
record.setClothName(clothesCloth.getName());
record.setClothPrice(clothesCloth.getPrice());
}
@@ -566,7 +594,7 @@
entity.setComment(dto.getComment());
ClothesSocialComment clothesSocialComment = clothesSocialCommentMapper.selectById(commentId);
if(ObjectUtil.isNotNull(clothesSocialComment)){
- entity.setParentId(clothesSocialComment.getParentId());
+ entity.setParentId(clothesSocialComment.getId());
entity.setCommentId(clothesSocialComment.getId());
}
clothesSocialCommentMapper.insert(entity);
--
Gitblit v1.9.1