From b3a60ae2f32f9ef251ecb5f3630472dfd648a11a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 29 Nov 2024 15:00:49 +0800
Subject: [PATCH] refactor(mall): 优化退款金额计算逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java | 144 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 134 insertions(+), 10 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 6135e77..3e2401b 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
@@ -1,20 +1,20 @@
package cc.mrbird.febs.mall.service.impl;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.exception.FebsException;
+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.MallGoods;
-import cc.mrbird.febs.mall.entity.MallGoodsComment;
-import cc.mrbird.febs.mall.mapper.MallGoodsCommentMapper;
-import cc.mrbird.febs.mall.mapper.MallGoodsImagesMapper;
-import cc.mrbird.febs.mall.mapper.MallGoodsMapper;
+import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IApiMallGoodsService;
-import cc.mrbird.febs.mall.vo.MallGoodsCommentVo;
-import cc.mrbird.febs.mall.vo.MallGoodsDetailsVo;
-import cc.mrbird.febs.mall.vo.MallGoodsListVo;
+import cc.mrbird.febs.mall.vo.*;
import cn.hutool.core.collection.CollUtil;
+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;
@@ -24,8 +24,11 @@
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
@@ -38,12 +41,90 @@
private final MallGoodsImagesMapper goodsImagesMapper;
private final MallGoodsCommentMapper mallGoodsCommentMapper;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final MallCarriageRuleMapper mallCarriageRuleMapper;
+ 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)
+ .orderByDesc(MallGoods::getVolume)
+ .last("limit 10");
+ // 执行查询，获取商品列表
+ 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
+ public List<MallGoodsListVo> findMallGoodsListNoPage(MallGoodsQueryDto queryDto) {
+ return this.baseMapper.selectMallGoodsListQueryNoPage(queryDto);
+ }
+
+ @Override
+ public ApiMallCarriageRuleVo findMallCarriageRuleById(Long id) {
+ ApiMallCarriageRuleVo apiMallCarriageRuleVo = new ApiMallCarriageRuleVo();
+
+ MallCarriageRule mallCarriageRule = mallCarriageRuleMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallCarriageRule)){
+ throw new FebsException("商品不存在");
+ }
+ apiMallCarriageRuleVo.setName(mallCarriageRule.getName());
+
+ List<MallCarriageRuleInfo> mallCarriageRuleInfos = mallCarriageRuleInfoMapper.selectMallCarriageRuleInfoByRuleIdAndAreaAddress(id, null);
+ if(CollUtil.isNotEmpty(mallCarriageRuleInfos)){
+ List<ApiMallCarriageRuleInfoVo> apiMallCarriageRuleInfoVos = new ArrayList<>();
+ for(MallCarriageRuleInfo mallCarriageRuleInfo : mallCarriageRuleInfos){
+ ApiMallCarriageRuleInfoVo apiMallCarriageRuleInfoVo = new ApiMallCarriageRuleInfoVo();
+ apiMallCarriageRuleInfoVo.setAreaAddress(mallCarriageRuleInfo.getAreaAddress());
+ apiMallCarriageRuleInfoVo.setBasicPrice(mallCarriageRuleInfo.getBasicPrice());
+ apiMallCarriageRuleInfoVo.setBasicCnt(mallCarriageRuleInfo.getBasicCnt());
+ apiMallCarriageRuleInfoVo.setMoreCnt(mallCarriageRuleInfo.getMoreCnt());
+ apiMallCarriageRuleInfoVo.setMorePrice(mallCarriageRuleInfo.getMorePrice());
+ apiMallCarriageRuleInfoVos.add(apiMallCarriageRuleInfoVo);
+ }
+ apiMallCarriageRuleVo.setApiMallCarriageRuleInfoVos(apiMallCarriageRuleInfoVos);
+ }
+ return apiMallCarriageRuleVo;
}
@Override
@@ -54,6 +135,23 @@
}
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)){
+ for(GoodsDetailsStyleVo goodsDetailsStyleVo : styles){
+ List<GoodsDetailsSkuVo> skus = goodsDetailsStyleVo.getSkus();
+ if(CollUtil.isNotEmpty(skus) ){
+ for(GoodsDetailsSkuVo goodsDetailsSkuVo : skus){
+ if(StrUtil.isNotEmpty(goodsDetailsSkuVo.getSample())){
+ goodsDetailsSkuVo.setSampleFlag(true);
+ }else{
+ goodsDetailsSkuVo.setSampleFlag(false);
+ }
+ }
+ }
+ }
+ }
if (CollUtil.isNotEmpty(mallGoods.getStyles())) {
Map<String, BigDecimal> stockAndVolume = this.baseMapper.selectGoodsStockAndVolume(id);
@@ -74,6 +172,32 @@
Page<MallGoodsCommentVo> page = new Page<>(queryDto.getPageNow(), queryDto.getPageSize());
MallGoodsComment mallGoodsComment = new MallGoodsComment();
mallGoodsComment.setGoodsId(queryDto.getGoodsId());
+ mallGoodsComment.setCommentType(queryDto.getCommentType());
return this.baseMapper.selectMallGoodsCommentListQueryInPage(page,mallGoodsComment);
}
+
+ @Override
+ public ApiMallGoodsDeliveryVo findDeliverySetting() {
+ ApiMallGoodsDeliveryVo apiMallGoodsDeliveryVo = new ApiMallGoodsDeliveryVo();
+ DataDictionaryCustom deliverySetting = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.HOME_DELIVERY_AMOUNT.getType(), DataDictionaryEnum.HOME_DELIVERY_AMOUNT.getCode());
+ if(ObjectUtil.isNotNull(deliverySetting)){
+ apiMallGoodsDeliveryVo.setHomeDeliveryServiceAmount(Double.parseDouble(deliverySetting.getValue()));
+ }
+ List<DataDictionaryCustom> homeDeliverySettings = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.FRIST_COST_LEVEL.getType());
+ if(CollUtil.isNotEmpty(homeDeliverySettings)){
+ List<ApiMallGoodsDeliverySettingVo> apiMallGoodsDeliverySettingVos = new ArrayList<>();
+ for(DataDictionaryCustom dic : homeDeliverySettings){
+ String apiMallGoodsDeliverySettingVoJson = dic.getValue();
+ ApiMallGoodsDeliverySettingVo apiMallGoodsDeliverySettingVo = JSONUtil.toBean(apiMallGoodsDeliverySettingVoJson, ApiMallGoodsDeliverySettingVo.class);
+ apiMallGoodsDeliverySettingVos.add(apiMallGoodsDeliverySettingVo);
+ }
+ apiMallGoodsDeliveryVo.setApiMallGoodsDeliverySettingVos(apiMallGoodsDeliverySettingVos);
+ }
+ return apiMallGoodsDeliveryVo;
+ }
+
+ @Override
+ public MallGoodsCommentVo findMallGoodsCommentLevelByGoodsId(Long id) {
+ return this.baseMapper.findMallGoodsCommentLevelByGoodsId(id);
+ }
}
--
Gitblit v1.9.1