diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java index 96fcbf26a..aa9b30910 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java @@ -222,8 +222,6 @@ public class ProductDTO implements Serializable { * 商品关联耗材列表 */ private List consList; - // - private List prodConsRelations; /** * 耗材信息 */ diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java index 6c5b6309b..3ad2c07f0 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java @@ -185,9 +185,9 @@ public class ProductServiceImpl extends ServiceImpl impl lowMemberPriceIsPresent.ifPresent(record::setLowMemberPrice); } record.setSkuList(skuList); - record.setProdConsRelations(prodConsRelationService.list(query() + record.setConsList(prodConsRelationService.listAs(query() .eq(ProdConsRelation::getProductId, record.getId()) - .eq(ProdConsRelation::getShopId, record.getShopId()))); + .eq(ProdConsRelation::getShopId, record.getShopId()), ProdConsRelationDTO.class)); }); return records; }