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

Browse Source
This commit is contained in:
SongZhang
2024-09-20 09:49:41 +08:00
parent 34c052902a c020a64469
commit 4a2fc4e2e0
3 changed files with 42 additions and 40 deletions
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(" id = ").append(updateValueVO.getTargetId());
sqlQuery.append(" ;"); sqlQuery.append(" ;");
System.out.println(sqlQuery);
Query nativeQuery = em.createNativeQuery(String.valueOf(sqlQuery)); Query nativeQuery = em.createNativeQuery(String.valueOf(sqlQuery));
nativeQuery.executeUpdate(); 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()) { for (TbProduct product : page.getContent()) {
//sku //sku
List<TbProductSku> tbProductSkus = tbProductSkuRepository.searchSku(product.getId().toString()); List<TbProductSku> tbProductSkus = tbProductSkuRepository.searchSku(product.getId().toString());
BigDecimal maxPrice = BigDecimal.ZERO;
BigDecimal maxPrice=tbProductSkus.stream().map(TbProductSku::getSalePrice).max(BigDecimal::compareTo).get(); Optional<BigDecimal> max = tbProductSkus.stream().map(TbProductSku::getSalePrice).max(BigDecimal::compareTo);
log.info("maxPrice:{}",maxPrice); if (max.isPresent()) {
maxPrice = max.get();
}
List<TbProductSku> skuList = new ArrayList<>(); List<TbProductSku> skuList = new ArrayList<>();
TbProductVo tbProductVo = new TbProductVo(); TbProductVo tbProductVo = new TbProductVo();

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

@@ -69,6 +69,7 @@ public class TbProductNewVo {
private Integer id; private Integer id;
private BigDecimal salePrice = new BigDecimal("0.00"); private BigDecimal salePrice = new BigDecimal("0.00");
private String specSnap=""; private String specSnap="";
private Integer isPauseSale = 0; private Integer isPauseSale;
private Integer isGrounding;
} }
} }