diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductVO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductVO.java index 199e6f06e..7c7b9187b 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductVO.java @@ -15,6 +15,7 @@ import java.util.List; @Data public class ProductVO extends Product { private BigDecimal lowPrice; + private Long unitName; private BigDecimal lowMemberPrice; private List skuList; private Integer isSaleTime; diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java index dc4ee099d..f0d6efa8e 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java @@ -118,8 +118,8 @@ public class PadProdServiceImpl implements PadProdService { List skuList = prodSkuService.list(new QueryWrapper().eq(ProdSku::getProductId, item.getId())); item.setSkuList(skuList); item.setIsSaleTime(calcIsSaleTime(item.getDays(), item.getStartTime(), item.getEndTime())); - Optional lowMemberPriceIsPresent = skuList.stream().map(obj -> NumberUtil.nullToZero(obj.getMemberPrice())).min(BigDecimal::compareTo); - lowMemberPriceIsPresent.ifPresent(item::setLowMemberPrice); +// Optional lowMemberPriceIsPresent = skuList.stream().map(obj -> NumberUtil.nullToZero(obj.getMemberPrice())).min(BigDecimal::compareTo); +// lowMemberPriceIsPresent.ifPresent(item::setLowMemberPrice); }); padDetailDTO.setProductList(products); } diff --git a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml index c5999dd7c..67dceac71 100644 --- a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml +++ b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml @@ -246,9 +246,10 @@ where id = #{shopId}