From a044bf6fcbf8ccbe591c26dc5120f7a5cb365c41 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 01 Aug 2025 11:28:37 +0800
Subject: [PATCH] feat(ai): 新增产品知识点关系模块并更新产品角色模型
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 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 7760047..2bcd490 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,15 @@
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();
@@ -525,6 +533,10 @@
vo.setPatternPrice(pattern.getPrice());
vo.setPatternId(pattern.getId());
vo.setPatternRemark(patternRemark.getRemark());
+ vo.setBoxHeight(pattern.getBoxHeight());
+ vo.setBoxWidth(pattern.getBoxWidth());
+ vo.setLeftPercent(pattern.getLeftPercent());
+ vo.setTopPercent(pattern.getTopPercent());
patternRemarkList.add( vo);
totalPatternAmount = totalPatternAmount.add(pattern.getPrice());
@@ -549,6 +561,10 @@
vo.setLocationImage(clothesLocation.getImage());
vo.setLocationPrice(clothesLocation.getPrice());
vo.setLocationId(clothesLocation.getId());
+ vo.setBoxHeight(clothesLocation.getBoxHeight());
+ vo.setBoxWidth(clothesLocation.getBoxWidth());
+ vo.setLeftPercent(clothesLocation.getLeftPercent());
+ vo.setTopPercent(clothesLocation.getTopPercent());
locationRemarkList.add(vo);
totalLocationAmount = totalLocationAmount.add(clothesLocation.getPrice());
--
Gitblit v1.9.1