岐济生
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
puzhibing
2024-12-09 a88a536514b0ee5fb863dd5c992279d5b86ad77f 
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java


@@ -7,25 +7,26 @@


import com.ruoyi.common.core.utils.StringUtils;


import com.ruoyi.common.core.utils.bean.BeanUtils;


import com.ruoyi.common.security.service.TokenService;


import com.ruoyi.other.api.domain.Goods;


import com.ruoyi.other.api.domain.GoodsArea;


import com.ruoyi.other.api.domain.GoodsVip;


import com.ruoyi.other.api.domain.VipSetting;


import com.ruoyi.other.api.domain.*;


import com.ruoyi.other.enums.GoodsStatus;


import com.ruoyi.other.mapper.GoodsAreaMapper;


import com.ruoyi.other.mapper.GoodsMapper;


import com.ruoyi.other.mapper.GoodsShopMapper;


import com.ruoyi.other.mapper.ShopMapper;


import com.ruoyi.other.service.GoodsService;


import com.ruoyi.other.service.GoodsVipService;


import com.ruoyi.other.service.VipSettingService;


import com.ruoyi.other.vo.GoodsVO;


import com.ruoyi.system.api.model.LoginUser;


import org.springframework.stereotype.Service;


import org.springframework.util.CollectionUtils;




import javax.annotation.Resource;


import java.math.BigDecimal;


import java.util.ArrayList;


import java.util.List;


import java.util.Objects;


import java.util.stream.Collectors;




/**


 * <p>


@@ -49,11 +50,15 @@


    private GoodsVipService goodsVipService;


    @Resource


    private AppUserClient appUserClient;


    @Resource


    private GoodsShopMapper goodsShopMapper;


    @Resource


    private ShopMapper shopMapper;




    @Override


    public List<GoodsVO> goodsList(Goods search) {


        List<Goods> goodsList = this.list(new LambdaQueryWrapper<Goods>()


                .eq(Goods::getStatus, GoodsStatus.UP)


                .eq(Goods::getStatus, GoodsStatus.UP.getCode())


                .eq(Objects.nonNull(search.getGoodsCategoryId()), Goods::getGoodsCategoryId, search.getGoodsCategoryId())


                .like(StringUtils.isNotEmpty(search.getName()), Goods::getName, search.getName()));




@@ -61,6 +66,8 @@


        for (Goods goods : goodsList) {


            GoodsVO goodsVO = new GoodsVO();


            BeanUtils.copyBeanProp(goodsVO, goods);


            goodsVO.setGoodsId(goods.getId());


            goodsVO.setGoodsName(goods.getName());


            result.add(goodsVO);


        }


        return result;


@@ -99,8 +106,20 @@


        Goods goods = this.getById(goodsId);


        GoodsVO goodsVO = new GoodsVO();


        BeanUtils.copyBeanProp(goodsVO, goods);


        goodsVO.setGoodsId(goods.getId());


        goodsVO.setGoodsName(goods.getName());


        goodsVO.setSellingPrice(sellingPrice);


        goodsVO.setIntegral(integral);




        List<GoodsShop> goodsShopList = goodsShopMapper.selectList(new LambdaQueryWrapper<GoodsShop>()


                .eq(GoodsShop::getGoodsId, goodsId));


        if (!CollectionUtils.isEmpty(goodsShopList)){


            List<Integer> shopIds = goodsShopList.stream().map(GoodsShop::getShopId).collect(Collectors.toList());


            List<Shop> shopList = shopMapper.selectList(new LambdaQueryWrapper<Shop>()


                    .in(Shop::getId, shopIds));




            goodsVO.setShopList(shopList);


        }


        return goodsVO;


    }