From c6ac1561db0b2f1c8e3a799d7f49808f4bae67c7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:55:58 +0800
Subject: [PATCH] refactor(mall): 优化订单收货类型判断逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
index 5780232..39c3074 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
@@ -47,6 +47,7 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallCarriageRuleMapper mallCarriageRuleMapper;
private final MallCarriageRuleInfoMapper mallCarriageRuleInfoMapper;
+ private final MallMemberCollectionMapper mallMemberCollectionMapper;
@Override
@@ -121,6 +122,22 @@
List<String> images = goodsImagesMapper.selectGoodsImagesByGoodsId(mallGoods.getId());
MallGoodsDetailsVo mallGoodsDetailsVo = MallGoodsConversion.INSTANCE.entityToDetailsVo(mallGoods);
+ MallMember loginUser = LoginUserUtil.getLoginUser();
+ if (loginUser != null) {
+ List<MallMemberCollection> mallMemberCollections = mallMemberCollectionMapper.selectList(
+ new LambdaQueryWrapper<MallMemberCollection>()
+ .eq(MallMemberCollection::getGoodsId, id)
+ .eq(MallMemberCollection::getMemberId, loginUser.getId())
+ );
+ if (CollUtil.isNotEmpty(mallMemberCollections)) {
+ mallGoodsDetailsVo.setHasCollect(1);
+ }else {
+ mallGoodsDetailsVo.setHasCollect(2);
+ }
+ }
+
+ mallGoodsDetailsVo.setMainImage(mallGoods.getThumb());
+
List<GoodsDetailsStyleVo> styles = mallGoodsDetailsVo.getStyles();
if(ObjectUtil.isNotEmpty(styles)){
for(GoodsDetailsStyleVo goodsDetailsStyleVo : styles){
@@ -144,8 +161,9 @@
}
mallGoodsDetailsVo.setImages(images);
- QueryWrapper<MallGoodsComment> objectQueryWrapper = new QueryWrapper<>();
- objectQueryWrapper.eq("goods_id",id);
+ LambdaQueryWrapper<MallGoodsComment> objectQueryWrapper = new LambdaQueryWrapper<>();
+ objectQueryWrapper.eq(MallGoodsComment::getGoodsId,id);
+ objectQueryWrapper.eq(MallGoodsComment::getShowState,1);
Integer commentCount = mallGoodsCommentMapper.selectCount(objectQueryWrapper);
mallGoodsDetailsVo.setCommentCount(commentCount);
return mallGoodsDetailsVo;
--
Gitblit v1.9.1