diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdGroupServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdGroupServiceImpl.java index 823b9d483..9dadc75c1 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdGroupServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdGroupServiceImpl.java @@ -68,7 +68,20 @@ public class ProdGroupServiceImpl extends ServiceImpl getProdGroupList(ProdGroupDTO param) { QueryWrapper queryWrapper = buildQueryWrapper(param); queryWrapper.eq(ProdGroup::getStatus, SystemConstants.OneZero.ONE); - return super.listAs(queryWrapper, ProdGroupDTO.class); + List groups = listAs(queryWrapper, ProdGroupDTO.class); + groups.forEach(group -> { + List productIdList = prodGroupRelationMapper.selectObjectListByQueryAs(query() + .select(ProdGroupRelation::getProductId).eq(ProdGroupRelation::getProdGroupId, group.getId()), Long.class); + if (CollUtil.isNotEmpty(productIdList)) { + List productList = productMapper.selectListByQueryAs(query() + .select(Product::getId, Product::getCategoryId, Product::getName, Product::getCoverImg) + .in(Product::getId, productIdList), ProductBriefDTO.class); + group.setProductList(productList); + } else { + group.setProductList(new ArrayList<>()); + } + }); + return groups; } @Override @@ -77,7 +90,9 @@ public class ProdGroupServiceImpl extends ServiceImpl productIdList = prodGroupRelationMapper.selectObjectListByQueryAs(query().select(ProdGroupRelation::getProductId).eq(ProdGroupRelation::getProdGroupId, id), Long.class); if (CollUtil.isNotEmpty(productIdList)) { - List productList = productMapper.selectListByQueryAs(query().select(Product::getId, Product::getCategoryId, Product::getName, Product::getCoverImg).in(Product::getId, productIdList), ProductBriefDTO.class); + List productList = productMapper.selectListByQueryAs(query() + .select(Product::getId, Product::getCategoryId, Product::getName, Product::getCoverImg) + .in(Product::getId, productIdList), ProductBriefDTO.class); dto.setProductList(productList); } else { dto.setProductList(new ArrayList<>()); @@ -171,7 +186,7 @@ public class ProdGroupServiceImpl extends ServiceImpl