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

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
SongZhang 2024-09-23 13:29:53 +08:00
parent 1a01ff5cce 31b20a92fd
commit eacf010f15
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<TbProductNewVo.TbProductSkuVos> 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<ViewConSku> query = Example.of(viewConSku);
List<ViewConSku> 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<TbProductNewVo.TbProductSkuVos> convert(List<TbProductSku> 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 {

7
eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductNewVo.java
View File

@ -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<ViewConSku> conInfos;
private List<TbProductSkuVos> skuList;
private List<TbProductSkuVos> 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;
}