czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ww' into test

Browse Source 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDtoV2.java
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
This commit is contained in:
wangw
2024-09-24 17:08:14 +08:00
parent 064e683a68 0de9071813
commit b4c795e7d5
5 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
View File

@@ -255,15 +255,22 @@ 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")){
//规格填充
productNewVo.setSkuList(convert(tbProductSkus));
}
ViewConSku viewConSku = new ViewConSku();
viewConSku.setShopId(Integer.valueOf(product.getShopId()));
viewConSku.setProductId(product.getId());
Example<ViewConSku> query = Example.of(viewConSku);
List<ViewConSku> skuCons = viewConSkuRepository.findAll(query);
if(product.getTypeEnum().equals("sku")){
//规格填充
productNewVo.setSkuList(convert(tbProductSkus));
//耗材弹窗选项
if (!CollectionUtils.isEmpty(skuCons)) {
Integer productSkuId = skuCons.get(0).getProductSkuId();
if (productSkuId != 0) {//添加至商品
productNewVo.setIsSaveSku(1);
}
}
}
productNewVo.setConInfos(CollectionUtils.isEmpty(skuCons)?Arrays.asList():skuCons);
products.add(productNewVo);
}