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(" 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();

78
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();
@ -246,7 +248,7 @@ public class TbProductServiceImpl implements TbProductService {
for (TbProduct product : page.getContent()) { for (TbProduct product : page.getContent()) {
TbProductNewVo productNewVo = new TbProductNewVo(); TbProductNewVo productNewVo = new TbProductNewVo();
BeanUtils.copyProperties(product, productNewVo); BeanUtils.copyProperties(product, productNewVo);
productNewVo.setLowPrice("￥"+product.getLowPrice().toString()); productNewVo.setLowPrice("￥" + product.getLowPrice().toString());
List<TbProductSku> tbProductSkus = tbProductSkuRepository.searchSku(product.getId().toString()); List<TbProductSku> tbProductSkus = tbProductSkuRepository.searchSku(product.getId().toString());
if (tbProductSkus.size() > 1) { if (tbProductSkus.size() > 1) {
BigDecimal maxPrice = tbProductSkus.stream().map(TbProductSku::getSalePrice).max(BigDecimal::compareTo).get(); BigDecimal maxPrice = tbProductSkus.stream().map(TbProductSku::getSalePrice).max(BigDecimal::compareTo).get();
@ -255,7 +257,7 @@ public class TbProductServiceImpl implements TbProductService {
//规格填充 //规格填充
List<TbProductNewVo.TbProductSkuVos> tbProductSkuVos = JSONUtil.parseListTNewList(tbProductSkus, TbProductNewVo.TbProductSkuVos.class); List<TbProductNewVo.TbProductSkuVos> tbProductSkuVos = JSONUtil.parseListTNewList(tbProductSkus, TbProductNewVo.TbProductSkuVos.class);
productNewVo.setSkuList(tbProductSkuVos); productNewVo.setSkuList(tbProductSkuVos);
ViewConSku viewConSku=new ViewConSku(); ViewConSku viewConSku = new ViewConSku();
viewConSku.setShopId(Integer.valueOf(product.getShopId())); viewConSku.setShopId(Integer.valueOf(product.getShopId()));
viewConSku.setProductId(product.getId()); viewConSku.setProductId(product.getId());
Example<ViewConSku> query = Example.of(viewConSku); Example<ViewConSku> query = Example.of(viewConSku);
@ -286,7 +288,7 @@ public class TbProductServiceImpl implements TbProductService {
//组装 //组装
TbProductVo tbProductVo = new TbProductVo(); TbProductVo tbProductVo = new TbProductVo();
// tbProductVo.setStockNumber(tbProduct.getStockNumber() == null ? 0.00 : tbProduct.getStockNumber()); // tbProductVo.setStockNumber(tbProduct.getStockNumber() == null ? 0.00 : tbProduct.getStockNumber());
tbProductVo.setCategoryId(StringUtils.isNotBlank(tbProduct.getCategoryId())?Integer.valueOf(tbProduct.getCategoryId()):null); tbProductVo.setCategoryId(StringUtils.isNotBlank(tbProduct.getCategoryId()) ? Integer.valueOf(tbProduct.getCategoryId()) : null);
//单位 //单位
// if (tbProduct.getUnitId() == null) { // if (tbProduct.getUnitId() == null) {
// tbProductVo.setUnitId(null); // tbProductVo.setUnitId(null);
@ -319,7 +321,7 @@ public class TbProductServiceImpl implements TbProductService {
tbProductVo.setSkuList(tbProductSkus.get()); tbProductVo.setSkuList(tbProductSkus.get());
} }
ViewConSku viewConSku=new ViewConSku(); ViewConSku viewConSku = new ViewConSku();
viewConSku.setShopId(Integer.valueOf(tbProduct.getShopId())); viewConSku.setShopId(Integer.valueOf(tbProduct.getShopId()));
viewConSku.setProductId(tbProduct.getId()); viewConSku.setProductId(tbProduct.getId());
Example<ViewConSku> query = Example.of(viewConSku); Example<ViewConSku> query = Example.of(viewConSku);
@ -382,7 +384,7 @@ public class TbProductServiceImpl implements TbProductService {
TbProduct product = new TbProduct(); TbProduct product = new TbProduct();
//组装 //组装
BeanUtil.copyProperties(resources, product, CopyOptions.create().setIgnoreNullValue(true)); BeanUtil.copyProperties(resources, product, CopyOptions.create().setIgnoreNullValue(true));
if(CollectionUtils.isEmpty(resources.getSkuList())){ if (CollectionUtils.isEmpty(resources.getSkuList())) {
throw new BadRequestException("商品规格不可为空"); throw new BadRequestException("商品规格不可为空");
} }
if (!"group".equals(resources.getTypeEnum())) { if (!"group".equals(resources.getTypeEnum())) {
@ -493,7 +495,7 @@ public class TbProductServiceImpl implements TbProductService {
TbProduct product = new TbProduct(); TbProduct product = new TbProduct();
//组装 //组装
BeanUtils.copyProperties(resources, product); BeanUtils.copyProperties(resources, product);
if(CollectionUtils.isEmpty(resources.getSkuList())){ if (CollectionUtils.isEmpty(resources.getSkuList())) {
throw new BadRequestException("规格内容不可为空"); throw new BadRequestException("规格内容不可为空");
} else if (!"sku".equals(product.getTypeEnum())) { } else if (!"sku".equals(product.getTypeEnum())) {
product.setSelectSpec("[]"); product.setSelectSpec("[]");
@ -538,7 +540,7 @@ public class TbProductServiceImpl implements TbProductService {
} }
noticeRepository.save(resources.getNotices()); noticeRepository.save(resources.getNotices());
}else { } else {
product.setCategoryId(resources.getCategoryId().toString()); product.setCategoryId(resources.getCategoryId().toString());
} }
TbProduct save = tbProductRepository.save(product); TbProduct save = tbProductRepository.save(product);
@ -546,13 +548,13 @@ public class TbProductServiceImpl implements TbProductService {
//sku //sku
if (resources.getSkuList() != null) { if (resources.getSkuList() != null) {
// if ("sku".equals(save.getTypeEnum())) { // if ("sku".equals(save.getTypeEnum())) {
List<Integer> collect = resources.getSkuList().stream().map(TbProductSku::getId).collect(Collectors.toList()); List<Integer> collect = resources.getSkuList().stream().map(TbProductSku::getId).collect(Collectors.toList());
List<TbProductSku> tbProductSkus = tbProductSkuRepository.searchSku(resources.getId().toString()); List<TbProductSku> tbProductSkus = tbProductSkuRepository.searchSku(resources.getId().toString());
for (TbProductSku productSkus : tbProductSkus) { for (TbProductSku productSkus : tbProductSkus) {
if (!collect.contains(productSkus.getId())) { if (!collect.contains(productSkus.getId())) {
tbProductSkuRepository.deleteBySkuId(productSkus.getId()); tbProductSkuRepository.deleteBySkuId(productSkus.getId());
}
} }
}
// } // }
tbProductSkuRepository.saveAll(resources.getSkuList()); tbProductSkuRepository.saveAll(resources.getSkuList());
} }
@ -564,7 +566,7 @@ public class TbProductServiceImpl implements TbProductService {
productSkuResult.setTagSnap(resources.getSkuSnap()); productSkuResult.setTagSnap(resources.getSkuSnap());
productSkuResult.setId(save.getId()); productSkuResult.setId(save.getId());
tbProductSkuResultRepository.save(productSkuResult); tbProductSkuResultRepository.save(productSkuResult);
}else { } else {
tbProductSkuResultRepository.deleteByIdN(save.getId()); tbProductSkuResultRepository.deleteByIdN(save.getId());
if ("group".equals(resources.getTypeEnum())) { if ("group".equals(resources.getTypeEnum())) {
TbPurchaseNotice notices = resources.getNotices(); TbPurchaseNotice notices = resources.getNotices();
@ -582,14 +584,14 @@ public class TbProductServiceImpl implements TbProductService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public void updateIsHot(Integer id,Integer isHot) { public void updateIsHot(Integer id, Integer isHot) {
tbProductRepository.updateIsHot(id,isHot); tbProductRepository.updateIsHot(id, isHot);
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public void updateIsStock(Integer proId, String shopId,Integer isStock) { public void updateIsStock(Integer proId, String shopId, Integer isStock) {
tbProductRepository.updateIsStock(proId,shopId,isStock); tbProductRepository.updateIsStock(proId, shopId, isStock);
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@ -600,15 +602,15 @@ public class TbProductServiceImpl implements TbProductService {
List<TbProduct> list = tbProductRepository.findByIds(param.getIds()); List<TbProduct> list = tbProductRepository.findByIds(param.getIds());
Integer sort = 0; Integer sort = 0;
Integer strIndex = -1; Integer strIndex = -1;
if(strSort<endSort){ if (strSort < endSort) {
for (int i = list.size() - 1; i >= 0; i--) { for (int i = list.size() - 1; i >= 0; i--) {
TbProduct product = list.get(i); TbProduct product = list.get(i);
if(product.getId().equals(param.getEndId())) { if (product.getId().equals(param.getEndId())) {
sort=product.getSort(); sort = product.getSort();
strIndex=i; strIndex = i;
} }
if(!strIndex.equals(-1)){ if (!strIndex.equals(-1)) {
if (product.getId().equals(param.getStrId())){ if (product.getId().equals(param.getStrId())) {
product.setSort(sort); product.setSort(sort);
tbProductRepository.save(product); tbProductRepository.save(product);
break; break;
@ -618,20 +620,20 @@ public class TbProductServiceImpl implements TbProductService {
tbProductRepository.save(product); tbProductRepository.save(product);
} }
} }
}else { } else {
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
TbProduct product = list.get(i); TbProduct product = list.get(i);
if(product.getId().equals(param.getEndId())) { if (product.getId().equals(param.getEndId())) {
sort=product.getSort(); sort = product.getSort();
strIndex=i; strIndex = i;
} }
if(!strIndex.equals(-1)){ if (!strIndex.equals(-1)) {
if (product.getId().equals(param.getStrId())){ if (product.getId().equals(param.getStrId())) {
product.setSort(sort); product.setSort(sort);
tbProductRepository.save(product); tbProductRepository.save(product);
break; break;
} }
Integer nextIndex= i + 1; Integer nextIndex = i + 1;
TbProduct product1 = list.get(nextIndex); TbProduct product1 = list.get(nextIndex);
product.setSort(product1.getSort()); product.setSort(product1.getSort());
tbProductRepository.save(product); tbProductRepository.save(product);
@ -745,7 +747,7 @@ public class TbProductServiceImpl implements TbProductService {
} }
if (product.getIsDistribute() == 1) { if (product.getIsDistribute() == 1) {
tbProductRepository.incrStock(productId, num); tbProductRepository.incrStock(productId, num);
}else { } else {
tbProductSkuRepository.incrStock(productSkuId, Double.valueOf(num)); tbProductSkuRepository.incrStock(productSkuId, Double.valueOf(num));
} }
} }
@ -776,7 +778,7 @@ public class TbProductServiceImpl implements TbProductService {
TbProductSkuResult skuResult = productSkuResultRepository.findById(item.getId()).orElse(null); TbProductSkuResult skuResult = productSkuResultRepository.findById(item.getId()).orElse(null);
List<TbProductSku> tbProductSkus = producSkutMapper.selectList(new LambdaQueryWrapper<TbProductSku>().eq(TbProductSku::getIsDel, 0) List<TbProductSku> tbProductSkus = producSkutMapper.selectList(new LambdaQueryWrapper<TbProductSku>().eq(TbProductSku::getIsDel, 0)
.eq(TbProductSku::getIsPauseSale, 0) .eq(TbProductSku::getIsPauseSale, 0)
.eq(TbProductSku::getProductId, item.getId()) .eq(TbProductSku::getProductId, item.getId())
.eq(TbProductSku::getIsGrounding, 1) .eq(TbProductSku::getIsGrounding, 1)
.select(TbProductSku::getId, TbProductSku::getSpecSnap, TbProductSku::getStockNumber, TbProductSku::getSalePrice, TbProductSku::getSuit)); .select(TbProductSku::getId, TbProductSku::getSpecSnap, TbProductSku::getStockNumber, TbProductSku::getSalePrice, TbProductSku::getSuit));
@ -807,7 +809,7 @@ public class TbProductServiceImpl implements TbProductService {
if (item.getIsDistribute().equals(1)) { if (item.getIsDistribute().equals(1)) {
itemMap.put("stockNumber", item.getStockNumber()); itemMap.put("stockNumber", item.getStockNumber());
}else { } else {
itemMap.put("stockNumber", item2.getStockNumber()); itemMap.put("stockNumber", item2.getStockNumber());
} }
specList.add(itemMap); specList.add(itemMap);
@ -817,7 +819,7 @@ public class TbProductServiceImpl implements TbProductService {
for (String res : result) { for (String res : result) {
boolean found = false; boolean found = false;
for (Map<String, Object> spec : specList) { for (Map<String, Object> spec : specList) {
if (spec.get("specSnap")!= null && res.equals(spec.get("specSnap").toString())) { if (spec.get("specSnap") != null && res.equals(spec.get("specSnap").toString())) {
spec.put("isGrounding", true); spec.put("isGrounding", true);
found = true; found = true;
break; break;