diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java index d2614e77..08c3f5c5 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java @@ -1070,16 +1070,26 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl cartQueryWrapper = new QueryWrapper<>(); cartQueryWrapper.in("item_id", item_ids_deprecate); - shopUserCartService.remove(cartQueryWrapper); + List shopUserCarts=shopUserCartService.list(cartQueryWrapper); + List shopUserCartIds=shopUserCarts.stream().map(ShopUserCart::getCart_id).collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(shopUserCarts)){ + shopUserCartService.removeBatchByIds(shopUserCartIds); + } QueryWrapper seqQueryWrapper = new QueryWrapper<>(); seqQueryWrapper.in("item_id", item_ids_deprecate); - shopProductItemSeqService.remove(seqQueryWrapper); - + List shopProductItemSeqs=shopProductItemSeqService.list(seqQueryWrapper); + List shopProductItemSeqIds=shopProductItemSeqs.stream().map(ShopProductItemSeq::getProduct_item_seq_id).collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(shopProductItemSeqIds)) { + shopProductItemSeqService.removeBatchByIds(shopProductItemSeqIds); + } QueryWrapper activityItemQueryWrapper = new QueryWrapper<>(); activityItemQueryWrapper.in("item_id", item_ids_deprecate); - shopStoreActivityItemService.remove(activityItemQueryWrapper); - + List shopStoreActivityItems= shopStoreActivityItemService.list(activityItemQueryWrapper); + List shopStoreActivityItemIds=shopStoreActivityItems.stream().map(ShopStoreActivityItem::getActivity_item_id).collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(shopStoreActivityItemIds)) { + shopStoreActivityItemService.removeBatchByIds(shopStoreActivityItemIds); + } if (!shopProductItemService.remove(item_ids_deprecate)) { return Pair.of(false, I18nUtil._("删除废弃sku失败!")); } @@ -3435,11 +3445,19 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl cartQueryWrapper = new QueryWrapper<>(); cartQueryWrapper.in("item_id", product_item_ids); - shopUserCartService.remove(cartQueryWrapper); + List shopUserCarts=shopUserCartService.list(cartQueryWrapper); + List shopUserCartIds=shopUserCarts.stream().map(ShopUserCart::getCart_id).collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(shopUserCartIds)){ + shopUserCartService.removeBatchByIds(shopUserCartIds); + } QueryWrapper seqQueryWrapper = new QueryWrapper<>(); seqQueryWrapper.in("item_id", product_item_ids); - shopProductItemSeqService.remove(seqQueryWrapper); + List shopProductItemSeqs=shopProductItemSeqService.list(seqQueryWrapper); + List shopProductItemSeqIds=shopProductItemSeqs.stream().map(ShopProductItemSeq::getProduct_item_seq_id).collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(shopProductItemSeqIds)) { + shopProductItemSeqService.removeBatchByIds(shopProductItemSeqIds); + } } QueryWrapper itemQueryWrapper = new QueryWrapper<>(); @@ -6311,7 +6329,6 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl metaQueryWrapper = new QueryWrapper<>(); queryWrapper.in("data_id", longProductList); List key = shopProductMetaService.findKey(metaQueryWrapper); @@ -6319,7 +6336,6 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl product_item_ids = shopProductItemService.findKey(new QueryWrapper().in("product_id", longProductList)); if (CollUtil.isNotEmpty(product_item_ids)) { shopProductItemService.removeBatchByIds(product_item_ids); - QueryWrapper cartQueryWrapper = new QueryWrapper<>(); cartQueryWrapper.in("item_id", product_item_ids); - shopUserCartService.remove(cartQueryWrapper); - + List shopUserCarts=shopUserCartService.list(cartQueryWrapper); + List shopUserCartIds=shopUserCarts.stream().map(ShopUserCart::getCart_id).collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(shopUserCartIds)){ + shopUserCartService.removeBatchByIds(shopUserCartIds); + } QueryWrapper seqQueryWrapper = new QueryWrapper<>(); seqQueryWrapper.in("item_id", product_item_ids); - shopProductItemSeqService.remove(seqQueryWrapper); + List shopProductItemSeqs=shopProductItemSeqService.list(seqQueryWrapper); + List shopProductItemSeqIds=shopProductItemSeqs.stream().map(ShopProductItemSeq::getProduct_item_seq_id).collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(shopProductItemSeqIds)){ + shopProductItemSeqService.removeBatchByIds(shopProductItemSeqIds); + } } QueryWrapper itemQueryWrapper = new QueryWrapper<>();