From 2377b0ca8cd1839c80c6271a7067ea43a0b78aa7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:49:54 +0800
Subject: [PATCH] fix(order): 修复订单列表中提货方式的显示逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 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 ab411fd..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
@@ -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;
--
Gitblit v1.9.1