From 4888ef96061e19769427bf52b0a644da7910331e Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Fri, 18 Jul 2025 16:31:56 +0800 Subject: [PATCH] feat(clothes): 添加服装打印相关功能 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 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..de57410 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 @@ -76,6 +76,11 @@ if(CollUtil.isNotEmpty(list)){ vos = buildApiClothesCategoryInfoVo(list, vos); } + ApiClothesCategoryInfoVo apiClothesCategoryInfoVo = new ApiClothesCategoryInfoVo(); + apiClothesCategoryInfoVo.setId(0L); + apiClothesCategoryInfoVo.setName("全部"); + vos.add(apiClothesCategoryInfoVo); + return new FebsResponse().success().data(vos); } @@ -125,7 +130,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 +245,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 +330,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()); @@ -456,6 +464,7 @@ if(ObjectUtil.isNotNull(clothesSize)){ record.setSizeId(sizeId); record.setSizeName(clothesSize.getName()); + record.setSizeImage(clothesSize.getImage()); record.setSizePrice(clothesSize.getPrice()); } } @@ -473,6 +482,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 +507,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 +525,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 +540,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 +579,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