diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java index c6f97d7f4..b7d62a840 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java @@ -1,5 +1,6 @@ package com.czg.product.vo; +import com.czg.product.dto.ProdConsRelationDTO; import com.czg.product.dto.ProdSkuDTO; import com.czg.product.entity.ProdConsRelation; import lombok.Data; @@ -91,7 +92,7 @@ public class ShopProductVo implements Serializable { * 商品规格列表 */ private List skuList; - private List prodConsRelations; + private List consList; /** * 商品每周销售日 如:Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java index aa6b6ec04..cdeb9f37f 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java @@ -65,7 +65,7 @@ public class UProductServiceImpl extends ServiceImpl imp .eq(ProdSku::getIsGrounding, SystemConstants.OneZero.ONE) .eq(ProdSku::getIsDel, SystemConstants.OneZero.ZERO), ProdSkuDTO.class); item.setSkuList(skuList); - item.setProdConsRelations(prodConsRelationService.list(query() + item.setConsList(prodConsRelationService.list(query() .eq(ProdConsRelation::getProductId, item.getId()) .eq(ProdConsRelation::getShopId, item.getShopId()))); }); @@ -86,7 +86,7 @@ public class UProductServiceImpl extends ServiceImpl imp .eq(ProdSku::getIsGrounding, SystemConstants.OneZero.ONE) .eq(ProdSku::getIsDel, SystemConstants.OneZero.ZERO), ProdSkuDTO.class); item.setSkuList(skuList); - item.setProdConsRelations(prodConsRelationService.list(query() + item.setConsList(prodConsRelationService.list(query() .eq(ProdConsRelation::getProductId, item.getId()) .eq(ProdConsRelation::getShopId, item.getShopId()))); });