Merge remote-tracking branch 'origin/master'

This commit is contained in:
wangw 2025-04-12 17:42:54 +08:00
commit 68ba67a853
1 changed files with 5 additions and 0 deletions

View File

@ -307,6 +307,10 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
}
entity.setIsDel(DeleteEnum.NORMAL.value());
entity.setShopId(shopId);
if(!ProductTypeEnum.SKU.value().equals(entity.getType())){
entity.setSpecId(null);
}
entity.setSpecId(null);
super.updateById(entity);
List<ProdSkuDTO> skuList = dto.getSkuList();
// 商品SKU-ID列表
@ -429,6 +433,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
.eq(Product::getShopId, shopId)
.update();
prodGroupRelationMapper.deleteByQuery(query().eq(ProdGroupRelation::getProductId, id));
prodConsRelationMapper.deleteByQuery(query().eq(ProdConsRelation::getProductId, id));
}
@Override