bug修复

mitao

2024-05-23 95c67a5dd1f0ae0651c84f76e429fef6c601f1c2

 meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallGoodsController.java

@@ -1,5 +1,6 @@
package com.sinata.rest.modular.mall.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -22,6 +23,11 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import java.math.BigDecimal;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Function;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -72,10 +78,14 @@
        Page page = new Page<VoGoods>(current, size);
        // 查询商品信息
        List<VoGoods> list = goodsService.listGoods(EnumMallGoodsGroupType.GOODS.index, merchantId, goodsName, firstClassifyId, null, type, sortType, page);
        Map<Integer, BigDecimal> minPriceSale = goodsSkuService.queryPlatMinSalePrice(null).stream()
                .collect(Collectors.toMap(MallGoodsSku::getGoodsId, MallGoodsSku::getPriceSale));
        return ApiUtils.returnOK(
                list.stream()
                        .map(o -> {
                            BigDecimal money = minPriceSale.get(o.getId());
                            o.setTagList(mallTagService.getTagListByGoodsId(mallTags, o.getTagIds()));
                            o.setPriceSale(Optional.ofNullable(money).orElse(o.getPriceSale()));
                            return o;
                        })
                        .collect(Collectors.toList())
@@ -114,8 +124,17 @@
    })
    public ApiUtils<VoGoodsDetail> detail(@PathVariable("id") Integer id) {
        VoGoodsDetail o = goodsService.goodsDetail(id, null);
        List<MallGoodsSku> skuList = goodsSkuService.queryPlatMinSalePrice(null);
        Map<Integer, BigDecimal> minPriceSale = skuList.stream()
                .collect(Collectors.toMap(MallGoodsSku::getGoodsId, MallGoodsSku::getPriceSale));
        Map<Integer, BigDecimal> minPriceMember = skuList.stream()
                .collect(Collectors.toMap(MallGoodsSku::getGoodsId, MallGoodsSku::getPriceMember));
        if (o != null) {
            BigDecimal money = minPriceSale.get(o.getId());
            BigDecimal minMemberMoney = minPriceMember.get(o.getId());
            o.setTagList(mallTagService.getTagListByGoodsId(null, o.getTagIds()));
            o.setPriceSale(Optional.ofNullable(money).orElse(o.getPriceSale()));
            o.setPriceMember(Optional.ofNullable(minMemberMoney).orElse(o.getPriceMerchant()));
        }
        return ApiUtils.returnOK(o);
    }