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

Merge branch 'ww' into test

This commit is contained in:
wangw 2024-09-20 09:23:57 +08:00
parent 0d06185849 0f2eea3e13
commit 6a96987857
2 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -391,7 +391,6 @@ public class StockServiceImpl implements StockService {
sqlQuery.append(" id = ").append(updateValueVO.getTargetId());
sqlQuery.append(" ;");
System.out.println(sqlQuery);
Query nativeQuery = em.createNativeQuery(String.valueOf(sqlQuery));
nativeQuery.executeUpdate();

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

@ -154,9 +154,11 @@ public class TbProductServiceImpl implements TbProductService {
for (TbProduct product : page.getContent()) {
//sku
List<TbProductSku> tbProductSkus = tbProductSkuRepository.searchSku(product.getId().toString());
BigDecimal maxPrice=tbProductSkus.stream().map(TbProductSku::getSalePrice).max(BigDecimal::compareTo).get();
log.info("maxPrice:{}",maxPrice);
BigDecimal maxPrice = BigDecimal.ZERO;
Optional<BigDecimal> max = tbProductSkus.stream().map(TbProductSku::getSalePrice).max(BigDecimal::compareTo);
if (max.isPresent()) {
maxPrice = max.get();
}
List<TbProductSku> skuList = new ArrayList<>();
TbProductVo tbProductVo = new TbProductVo();