From c515cd9ac4fa1e75d59689b894a979421a752f60 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 18 Mar 2026 11:49:40 +0800
Subject: [PATCH] fix(mall): 修复小程序登录公司验证逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 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 9993963..6854549 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
@@ -11,7 +11,6 @@
import cc.mrbird.febs.mall.service.ApiClothesSocialService;
import cc.mrbird.febs.mall.vo.activity.ApiScCategoryInfoVo;
import cc.mrbird.febs.mall.vo.clothes.*;
-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;
@@ -64,7 +63,6 @@
private final ClothesLocationRemarkMapper clothesLocationRemarkMapper;
private final ClothesPatternRemarkMapper clothesPatternRemarkMapper;
private final ClothesSocialCommentMapper clothesSocialCommentMapper;
- private final AgentProducer agentProducer;
@Override
@@ -197,17 +195,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 +218,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 +237,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,12 +250,14 @@
apiSocialMuseVo.setLocationRemarkList(locationRemarkList);
}
apiSocialMuseVo.setTotalAmount(totalAmount.setScale(2, RoundingMode.DOWN));
- if(StrUtil.isNotBlank(apiSocialMuseVo.getArtName())
- && StrUtil.isNotBlank(apiSocialMuseVo.getSizeName())
- && StrUtil.isNotBlank(apiSocialMuseVo.getClothName())
- ){
- apiSocialInfoVo.setMuse(apiSocialMuseVo);
- }
+// if(
+// ObjectUtil.isNotNull(clothesArt)
+// && ObjectUtil.isNotNull(clothesSize)
+// && ObjectUtil.isNotNull(clothesCloth)
+// ){
+// apiSocialInfoVo.setMuse(apiSocialMuseVo);
+// }
+ apiSocialInfoVo.setMuse(apiSocialMuseVo);
// Integer likeCnt = clothesSocial.getLikeCnt();
@@ -419,7 +419,6 @@
clothesSocialFollow.setType(SocialTypeEnum.LIKE.getValue());
clothesSocialFollowMapper.insert(clothesSocialFollow);
- agentProducer.sendAddLike(socialId);
}
return new FebsResponse().success().message("操作成功");
}
@@ -465,7 +464,6 @@
clothesSocialFollow.setType(SocialTypeEnum.COLLECT.getValue());
clothesSocialFollowMapper.insert(clothesSocialFollow);
- agentProducer.sendAddCollect(socialId);
}
return new FebsResponse().success().message("操作成功");
}
@@ -531,6 +529,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());
@@ -555,6 +557,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