From 8a7aee11d533a1664d88c3fe03bf0404164b4de9 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 22 Jul 2025 17:14:09 +0800
Subject: [PATCH] style(clothesType): 优化列表页面样式和功能

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 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 76a0163..f96587c 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
@@ -197,17 +197,17 @@
                     apiSocialMuseVo.setTypeImg(clothesType.getImage());
                 }
                 ClothesSize clothesSize = clothesSizeMapper.selectById(clothesSocialMuse.getSizeId());
-                if(ObjectUtil.isNotNull(clothesSize)){
+                if(ObjectUtil.isNotNull(clothesSize) && clothesType.getSizeState() == 1){
                     apiSocialMuseVo.setSizeName(clothesSize.getName());
                     totalAmount = totalAmount.add(clothesSize.getPrice());
                 }
                 ClothesCloth clothesCloth = clothesClothMapper.selectById(clothesSocialMuse.getClothId());
-                if(ObjectUtil.isNotNull(clothesCloth)){
+                if(ObjectUtil.isNotNull(clothesCloth) && clothesType.getClothState() == 1){
                     apiSocialMuseVo.setClothName(clothesCloth.getName());
                     totalAmount = totalAmount.add(clothesCloth.getPrice());
                 }
                 ClothesArt clothesArt = clothesArtMapper.selectById(clothesSocialMuse.getArtId());
-                if(ObjectUtil.isNotNull(clothesArt)){
+                if(ObjectUtil.isNotNull(clothesArt) && clothesType.getArtState() == 1){
                     apiSocialMuseVo.setArtName(clothesArt.getName());
                     totalAmount = totalAmount.add(clothesArt.getPrice());
                 }
@@ -220,7 +220,7 @@
                                 .eq(ClothesPatternRemark::getSourceId, clothesSocialMuse.getId())
                                 .eq(ClothesPatternRemark::getType, SocialPatternLocationTypeEnum.MUSE.getValue())
                 );
-                if(CollUtil.isNotEmpty(patternRemarks)){
+                if(CollUtil.isNotEmpty(patternRemarks) && clothesType.getPatternState() == 1){
                     for (ClothesPatternRemark entity : patternRemarks){
                         ApiClothesPatternRemarkVo vo = new ApiClothesPatternRemarkVo();
                         ClothesPattern pattern = clothesPatternMapper.selectById(entity.getPatternId());
@@ -239,7 +239,7 @@
                                 .eq(ClothesLocationRemark::getSourceId, clothesSocialMuse.getId())
                                 .eq(ClothesLocationRemark::getType, SocialPatternLocationTypeEnum.MUSE.getValue())
                 );
-                if(CollUtil.isNotEmpty(locationRemarks)){
+                if(CollUtil.isNotEmpty(locationRemarks)  && clothesType.getLocationState() == 1){
                     for (ClothesLocationRemark entity : locationRemarks){
                         ApiClothesLocationRemarkVo vo = new ApiClothesLocationRemarkVo();
                         ClothesLocation clothesLocation = clothesLocationMapper.selectById(entity.getLocationId());
@@ -252,13 +252,14 @@
                     apiSocialMuseVo.setLocationRemarkList(locationRemarkList);
                 }
                 apiSocialMuseVo.setTotalAmount(totalAmount.setScale(2, RoundingMode.DOWN));
-                if(
-                        ObjectUtil.isNotNull(clothesArt)
-                        && ObjectUtil.isNotNull(clothesSize)
-                        && ObjectUtil.isNotNull(clothesCloth)
-                ){
-                    apiSocialInfoVo.setMuse(apiSocialMuseVo);
-                }
+//                if(
+//                        ObjectUtil.isNotNull(clothesArt)
+//                        && ObjectUtil.isNotNull(clothesSize)
+//                        && ObjectUtil.isNotNull(clothesCloth)
+//                ){
+//                    apiSocialInfoVo.setMuse(apiSocialMuseVo);
+//                }
+                apiSocialInfoVo.setMuse(apiSocialMuseVo);
 
 
 //                Integer likeCnt = clothesSocial.getLikeCnt();

--
Gitblit v1.9.1