From 317bb4aefb93d4e3797b8a3fd1ac9e82665beb48 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 22 Jul 2025 14:57:47 +0800
Subject: [PATCH] feat(mall): 优化衣服社交 muse 数据处理逻辑

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 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 a2ffc63..9140dcf 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
@@ -14,6 +14,7 @@
 import cc.mrbird.febs.rabbit.producter.AgentProducer;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSON;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
@@ -196,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());
                 }
@@ -219,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());
@@ -238,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());
@@ -251,8 +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);
+                }
 
-                apiSocialInfoVo.setMuse(apiSocialMuseVo);
 
 //                Integer likeCnt = clothesSocial.getLikeCnt();
 //                Integer collectCnt = clothesSocial.getCollectCnt();
@@ -431,8 +438,6 @@
             clothesSocialFollow.setSourceOptionId(dto.getCommentId());
             clothesSocialFollow.setType(SocialTypeEnum.LIKE.getValue());
             clothesSocialFollowMapper.insert(clothesSocialFollow);
-
-            agentProducer.sendAddCollect(socialId);
         }
         return new FebsResponse().success().message("操作成功");
     }
@@ -460,6 +465,8 @@
             clothesSocialFollow.setSourceId(socialId);
             clothesSocialFollow.setType(SocialTypeEnum.COLLECT.getValue());
             clothesSocialFollowMapper.insert(clothesSocialFollow);
+
+            agentProducer.sendAddCollect(socialId);
         }
         return new FebsResponse().success().message("操作成功");
     }

--
Gitblit v1.9.1