From 01ba195445187083d47828c213c98f1f412b1901 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 23 Sep 2024 11:36:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=20?= =?UTF-8?q?=E5=B1=95=E5=BC=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productimpl/TbProductServiceImpl.java | 23 +++++++++++++++---- .../cn/ysk/cashier/vo/TbProductNewVo.java | 7 +++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java index 1173febc..fd213c03 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java @@ -254,20 +254,35 @@ public class TbProductServiceImpl implements TbProductService { BigDecimal maxPrice = tbProductSkus.stream().map(TbProductSku::getSalePrice).max(BigDecimal::compareTo).get(); productNewVo.setLowPrice(productNewVo.getLowPrice() + "~￥" + maxPrice); } - //规格填充 - List tbProductSkuVos = JSONUtil.parseListTNewList(tbProductSkus, TbProductNewVo.TbProductSkuVos.class); - productNewVo.setSkuList(tbProductSkuVos); + if(!product.getTypeEnum().equals("sku")){ + //规格填充 + productNewVo.setSkuList(convert(tbProductSkus)); + } ViewConSku viewConSku = new ViewConSku(); viewConSku.setShopId(Integer.valueOf(product.getShopId())); viewConSku.setProductId(product.getId()); Example query = Example.of(viewConSku); List skuCons = viewConSkuRepository.findAll(query); - productNewVo.setConInfos(skuCons); + productNewVo.setConInfos(CollectionUtils.isEmpty(skuCons)?Arrays.asList():skuCons); products.add(productNewVo); } return PageUtil.toPage(products, page.getTotalElements()); } + public List convert(List skuVo1List) { + return skuVo1List.stream() + .map(skuVo1 -> { + TbProductNewVo.TbProductSkuVos skuVo2 = new TbProductNewVo.TbProductSkuVos(); + skuVo2.setId(skuVo1.getId()); + skuVo2.setName(skuVo1.getSpecSnap()); + skuVo2.setLowPrice("￥"+skuVo1.getSalePrice().toString()); + skuVo2.setIsPauseSale(skuVo1.getIsPauseSale()); + skuVo2.setIsGrounding(skuVo1.getIsGrounding()); + return skuVo2; + }) + .collect(Collectors.toList()); + } + @Override public TbProductVo findByProductId(Integer id) throws Exception { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductNewVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductNewVo.java index e2128b68..b9998421 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductNewVo.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductNewVo.java @@ -7,6 +7,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.List; /** @@ -36,7 +37,7 @@ public class TbProductNewVo { private List conInfos; - private List skuList; + private List skuList = new ArrayList<>(); //排序 private Integer sort; @@ -67,8 +68,8 @@ public class TbProductNewVo { @JsonIgnoreProperties(ignoreUnknown = true) public static class TbProductSkuVos { private Integer id; - private BigDecimal salePrice = new BigDecimal("0.00"); - private String specSnap=""; + private String name; + private String lowPrice; private Integer isPauseSale; private Integer isGrounding; } From 6af7109afb5a187b92c8a1b884a4c603e1eb06f4 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 23 Sep 2024 11:43:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=20?= =?UTF-8?q?=E5=B1=95=E5=BC=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashier/service/impl/productimpl/TbProductServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java index fd213c03..a6a75ba1 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java @@ -254,7 +254,7 @@ public class TbProductServiceImpl implements TbProductService { BigDecimal maxPrice = tbProductSkus.stream().map(TbProductSku::getSalePrice).max(BigDecimal::compareTo).get(); productNewVo.setLowPrice(productNewVo.getLowPrice() + "~￥" + maxPrice); } - if(!product.getTypeEnum().equals("sku")){ + if(product.getTypeEnum().equals("sku")){ //规格填充 productNewVo.setSkuList(convert(tbProductSkus)); }