From 2eeb79f139049ff679228e24738da94d512ee2b6 Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Sat, 12 Jul 2025 10:20:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=B7=BB=E5=8A=A0=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E9=97=AE=E9=A2=98=E4=B8=8B=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ShopBaseProductBrandServiceImpl.java |  3 +-
 .../impl/ShopProductBaseServiceImpl.java      | 61 +++++++++----------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductBrandServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductBrandServiceImpl.java
index d0cf5f5f..906ea0a9 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductBrandServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductBrandServiceImpl.java
@@ -133,10 +133,9 @@ public class ShopBaseProductBrandServiceImpl extends BaseServiceImpl<ShopBasePro
             store_id = Convert.toInt(user.getStore_id());
             isPlatform = getCurrentUser().isPlatform();
         }
-
+        shopBaseProductBrand.setBrand_apply(1);//申请通过
         if (ObjectUtil.isEmpty(shopBaseProductBrand.getBrand_id())) {
             if (!isPlatform) {
-                shopBaseProductBrand.setBrand_apply(0);
                 shopBaseProductBrand.setStore_id(store_id);
             }
         }
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 08c3f5c5..f8aa3993 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
@@ -745,7 +745,6 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
             } else {
                 shopProductBase.setProduct_id(productId);
             }
-
             // begin 新增，判断发布商品数量是否超限
             Integer store_grade_id = storeBase.getStore_grade_id();
             ShopBaseStoreGrade store_grade_row = baseStoreGradeService.get(store_grade_id);
@@ -773,7 +772,7 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
                 isUpdate = true;
             }
         }
-
+        shopProductBase.setProduct_src_id(productId);
         if (verify_type) {
             shopProductBase.setProduct_verify_id(StateCode.PRODUCT_VERIFY_WAITING);
         } else {
@@ -1032,7 +1031,7 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
             }
 
             item_row.setItem_id(item_id);
-
+            item_row.setItem_src_id(String.valueOf(item_id));
             // 修正默认价格， 防止出现不合理价格
             BigDecimal item_platform_price = NumberUtil.max(item_row.getItem_cost_price(), item_row.getItem_platform_price());
             BigDecimal _item_unit_price = NumberUtil.max(item_row.getItem_unit_price(), item_row.getItem_platform_price());
@@ -1066,34 +1065,34 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
         List<Serializable> item_ids_all = (List<Serializable>) CollUtil.union(item_ids_new, item_ids_old);
         List<Serializable> item_ids_deprecate = (List<Serializable>) CollUtil.disjunction(item_ids_all, item_ids_new);
 
-        //start 清理sku相关数据
-        if (CollUtil.isNotEmpty(item_ids_deprecate)) {
-            QueryWrapper<ShopUserCart> cartQueryWrapper = new QueryWrapper<>();
-            cartQueryWrapper.in("item_id", item_ids_deprecate);
-            List<ShopUserCart> shopUserCarts=shopUserCartService.list(cartQueryWrapper);
-            List<Integer> shopUserCartIds=shopUserCarts.stream().map(ShopUserCart::getCart_id).collect(Collectors.toList());
-            if(CollectionUtil.isNotEmpty(shopUserCarts)){
-                shopUserCartService.removeBatchByIds(shopUserCartIds);
-            }
-
-            QueryWrapper<ShopProductItemSeq> seqQueryWrapper = new QueryWrapper<>();
-            seqQueryWrapper.in("item_id", item_ids_deprecate);
-            List<ShopProductItemSeq> shopProductItemSeqs=shopProductItemSeqService.list(seqQueryWrapper);
-            List<String> shopProductItemSeqIds=shopProductItemSeqs.stream().map(ShopProductItemSeq::getProduct_item_seq_id).collect(Collectors.toList());
-            if(CollectionUtil.isNotEmpty(shopProductItemSeqIds)) {
-                shopProductItemSeqService.removeBatchByIds(shopProductItemSeqIds);
-            }
-            QueryWrapper<ShopStoreActivityItem> activityItemQueryWrapper = new QueryWrapper<>();
-            activityItemQueryWrapper.in("item_id", item_ids_deprecate);
-            List<ShopStoreActivityItem> shopStoreActivityItems= shopStoreActivityItemService.list(activityItemQueryWrapper);
-            List<Long> 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失败！"));
-            }
-        }
+        //start 清理sku相关数据 根据前端规则，不做处理
+//        if (CollUtil.isNotEmpty(item_ids_deprecate)) {
+//            QueryWrapper<ShopUserCart> cartQueryWrapper = new QueryWrapper<>();
+//            cartQueryWrapper.in("item_id", item_ids_deprecate);
+//            List<ShopUserCart> shopUserCarts=shopUserCartService.list(cartQueryWrapper);
+//            List<Integer> shopUserCartIds=shopUserCarts.stream().map(ShopUserCart::getCart_id).collect(Collectors.toList());
+//            if(CollectionUtil.isNotEmpty(shopUserCarts)){
+//                shopUserCartService.removeBatchByIds(shopUserCartIds);
+//            }
+//
+//            QueryWrapper<ShopProductItemSeq> seqQueryWrapper = new QueryWrapper<>();
+//            seqQueryWrapper.in("item_id", item_ids_deprecate);
+//            List<ShopProductItemSeq> shopProductItemSeqs=shopProductItemSeqService.list(seqQueryWrapper);
+//            List<String> shopProductItemSeqIds=shopProductItemSeqs.stream().map(ShopProductItemSeq::getProduct_item_seq_id).collect(Collectors.toList());
+//            if(CollectionUtil.isNotEmpty(shopProductItemSeqIds)) {
+//                shopProductItemSeqService.removeBatchByIds(shopProductItemSeqIds);
+//            }
+//            QueryWrapper<ShopStoreActivityItem> activityItemQueryWrapper = new QueryWrapper<>();
+//            activityItemQueryWrapper.in("item_id", item_ids_deprecate);
+//            List<ShopStoreActivityItem> shopStoreActivityItems= shopStoreActivityItemService.list(activityItemQueryWrapper);
+//            List<Long> 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