refactor(mall): 优化订单收货类型判断逻辑

Administrator

2025-05-27 c6ac1561db0b2f1c8e3a799d7f49808f4bae67c7

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java

@@ -16,6 +16,7 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,8 +28,10 @@

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;

/**
 * @author wzy
@@ -44,6 +47,7 @@
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
    private final MallCarriageRuleMapper mallCarriageRuleMapper;
    private final MallCarriageRuleInfoMapper mallCarriageRuleInfoMapper;
    private final MallMemberCollectionMapper mallMemberCollectionMapper;


    @Override
@@ -53,7 +57,28 @@
            queryDto.setMemberId(loginUser.getId());
        }
        Page<MallGoodsListVo> page = new Page<>(queryDto.getPageNow(), queryDto.getPageSize());
        return this.baseMapper.selectMallGoodsListQueryInPage(queryDto, page);
        IPage<MallGoodsListVo> result = this.baseMapper.selectMallGoodsListQueryInPage(queryDto, page);

        LambdaQueryWrapper<MallGoods> goodsQuery = new LambdaQueryWrapper<>();
        goodsQuery.eq(MallGoods::getIsSale, 1)
                .eq(MallGoods::getIsNormal, 1)
                .orderByDesc(MallGoods::getVolume)
                .last("limit 10");
        List<MallGoods> mallGoods = this.baseMapper.selectList(goodsQuery);
        Map<Long, Integer> goodsMap = new HashMap<>();
        AtomicInteger rank = new AtomicInteger(1);
        mallGoods.forEach(item -> {
            goodsMap.put(item.getId(), rank.getAndIncrement());
        });

        result.getRecords().forEach(item -> {
            Integer goodsRank = goodsMap.get(item.getId());
            if (goodsRank != null) {
                item.setRank(goodsRank);
            }

        });
        return result;
    }

    @Override
@@ -97,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){
@@ -120,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;