Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-07-21 2d63f8d51d3f349dd3b6e72b5ee005f3c0cf623e

 gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java

@@ -106,6 +106,13 @@
        PageHelper.startPage(model.getPage(), model.getLimit());

        List<QueryGoodsListVo> maps = scoreGoodsMapper.queryGoodsList(name,delFlag);
        if(CollUtil.isNotEmpty(maps)){
            for(QueryGoodsListVo queryGoodsListVo : maps){
                long id = queryGoodsListVo.getId();
                Integer stock = scoreGoodsSkuMapper.selectScoreGoodsSkuMapperByGoodId(id);
                queryGoodsListVo.setStock(stock);
            }
        }
        PageInfo pageInfo = new PageInfo(maps);
        int count = Convert.toInt(pageInfo.getTotal());
        Map<String, Object> map = new HashMap<>();