From 6539b325b5ce95d1fafa864c75a32279c954167f Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 07 Feb 2025 11:03:31 +0800
Subject: [PATCH] refactor(mall): 重构订单退款流程
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 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 cc9f184..42bc29c 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
@@ -2,9 +2,8 @@
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.exception.FebsException;
-import cc.mrbird.febs.common.utils.AppContants;
+import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.mall.conversion.MallGoodsConversion;
-import cc.mrbird.febs.mall.conversion.MallMemberConversion;
import cc.mrbird.febs.mall.dto.ApiMallGoodsCommentDto;
import cc.mrbird.febs.mall.dto.MallGoodsQueryDto;
import cc.mrbird.febs.mall.entity.*;
@@ -15,19 +14,21 @@
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;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
import org.springframework.stereotype.Service;
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
@@ -45,10 +46,54 @@
private final MallCarriageRuleInfoMapper mallCarriageRuleInfoMapper;
+ /**
+ * 根据查询条件分页查找商城商品列表，并为每个商品添加排名
+ * 排名基于商品的销售状态、正常状态和销量进行排序
+ *
+ * @param queryDto 查询条件封装对象，包含分页信息和查询参数
+ * @return 分页的商品列表，每个商品包含其排名
+ */
@Override
public IPage<MallGoodsListVo> findMallGoodsListInPage(MallGoodsQueryDto queryDto) {
+ // 获取当前登录的用户信息
+ MallMember loginUser = LoginUserUtil.getLoginUser();
+ // 如果用户已登录，设置查询条件中的会员ID
+ if (loginUser != null) {
+ queryDto.setMemberId(loginUser.getId());
+ }
+ // 初始化分页对象
Page<MallGoodsListVo> page = new Page<>(queryDto.getPageNow(), queryDto.getPageSize());
- return this.baseMapper.selectMallGoodsListQueryInPage(queryDto, page);
+ // 调用Mapper方法，根据查询条件分页获取商品列表
+ IPage<MallGoodsListVo> result = this.baseMapper.selectMallGoodsListQueryInPage(queryDto, page);
+
+ // 初始化商品查询条件，筛选出正在销售的、状态正常的商品，并按销量降序排序，限制结果数量
+ LambdaQueryWrapper<MallGoods> goodsQuery = new LambdaQueryWrapper<>();
+ goodsQuery.eq(MallGoods::getIsSale, 1)
+ .eq(MallGoods::getIsNormal, 1)
+ .select(MallGoods::getId)
+ .orderByDesc(MallGoods::getVolume)
+ .last("limit 5");
+ // 执行查询，获取商品列表
+ List<MallGoods> mallGoods = this.baseMapper.selectList(goodsQuery);
+ // 初始化商品ID与排名的映射关系
+ 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
@@ -91,6 +136,7 @@
}
List<String> images = goodsImagesMapper.selectGoodsImagesByGoodsId(mallGoods.getId());
MallGoodsDetailsVo mallGoodsDetailsVo = MallGoodsConversion.INSTANCE.entityToDetailsVo(mallGoods);
+ mallGoodsDetailsVo.setMainImage(mallGoods.getThumb());
List<GoodsDetailsStyleVo> styles = mallGoodsDetailsVo.getStyles();
if(ObjectUtil.isNotEmpty(styles)){
--
Gitblit v1.9.1