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 4c05cad5..3d9bb2f1 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 @@ -1065,33 +1065,33 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl item_ids_deprecate = (List) CollUtil.disjunction(item_ids_all, item_ids_new); //start 清理sku相关数据 根据前端规则,不做处理 -// if (CollUtil.isNotEmpty(item_ids_deprecate)) { -// QueryWrapper cartQueryWrapper = new QueryWrapper<>(); -// cartQueryWrapper.in("item_id", item_ids_deprecate); -// 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); -// 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); -// 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失败!")); -// } -// } + if (CollUtil.isNotEmpty(item_ids_deprecate)) { + QueryWrapper cartQueryWrapper = new QueryWrapper<>(); + cartQueryWrapper.in("item_id", item_ids_deprecate); + 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); + 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); + 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失败!")); + } + } //end 清理sku相关数据 // 注:shopProductInfo