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

Revert "1.编辑商品不影响上下架" 

This reverts commit ccba29361b.
This commit is contained in:
GYJ 2024-08-01 18:13:22 +08:00
parent cdceb51f92
commit 0a0a863472
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
View File

@ -129,7 +129,7 @@ public class TbProductSku implements Serializable {
@Column(name = "`is_grounding`") @Column(name = "`is_grounding`")
@ApiModelProperty(value = "是否上架") @ApiModelProperty(value = "是否上架")
private Integer isGrounding; private Integer isGrounding = 1;
public void setIsDel(Integer isDel) { public void setIsDel(Integer isDel) {
if(isDel!=null){ if(isDel!=null){

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

@ -374,8 +374,6 @@ public class TbProductServiceImpl implements TbProductService {
} }
} }
// 默认开启共享库存和库存
// product.setIsDistribute(1);
TbProduct save = tbProductRepository.save(product); TbProduct save = tbProductRepository.save(product);
if (save.getId() == null) { if (save.getId() == null) {
throw new BadRequestException("添加商品失败"); throw new BadRequestException("添加商品失败");
@ -491,28 +489,13 @@ public class TbProductServiceImpl implements TbProductService {
// } // }
// } // }
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());
List<Integer> collect = tbProductSkus.stream().map(TbProductSku::getId).collect(Collectors.toList());
HashMap<String, TbProductSku> skuInfo = new HashMap<>();
for (TbProductSku productSkus : tbProductSkus) { for (TbProductSku productSkus : tbProductSkus) {
skuInfo.put(productSkus.getId().toString(), productSkus); if (!collect.contains(productSkus.getId())) {
} tbProductSkuRepository.deleteBySkuId(productSkus.getId());
for (TbProductSku tbProductSku : resources.getSkuList()) {
if (!collect.contains(tbProductSku.getId())) {
tbProductSkuRepository.deleteBySkuId(tbProductSku.getId());
}else {
TbProductSku productSku = skuInfo.get(tbProductSku.getId().toString());
if (productSku != null) {
tbProductSku.setIsGrounding(productSku.getIsGrounding());
}
} }
} }
// for (TbProductSku productSkus : tbProductSkus) {
// if (!collect.contains(productSkus.getId())) {
// tbProductSkuRepository.deleteBySkuId(productSkus.getId());
// }
// }
} }
tbProductSkuRepository.saveAll(resources.getSkuList()); tbProductSkuRepository.saveAll(resources.getSkuList());
} }