修复商品导入相关问题

mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductItem.java

@@ -34,6 +34,7 @@ public class ShopProductItem implements Serializable {
     private Long item_id;
 
     @ApiModelProperty(value = "副标题(DOT):SKU名称")
+    @TableField(updateStrategy=NOT_EMPTY)
     private String item_name;
 
     @ApiModelProperty(value = "产品编号")

mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncBaseThirdSxAbstract.java

@@ -990,7 +990,10 @@ public abstract class SyncBaseThirdSxAbstract{
         QueryWrapper<ShopProductItem> itemQuery=new QueryWrapper<>();
         itemQuery.select("MAX(item_id) as item_id");
         ShopProductItem shopProductItem= shopProductItemService.getOne(itemQuery);
-        Long itemtId= shopProductItem.getItem_id();
+        Long itemtId=1L;
+        if(null!=shopProductItem){
+            itemtId= shopProductItem.getItem_id();
+        }
         // QueryWrapper<ShopNumberSeq> itemWrapper=new QueryWrapper();
         //itemWrapper.eq("prefix", "item_id");
         ShopNumberSeq shopNumberSeqItem= new ShopNumberSeq();

mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncStoreSpecsServiceImpl.java

@@ -14,6 +14,8 @@ import com.suisung.mall.common.modules.base.ShopBaseProductType;
 import com.suisung.mall.common.modules.product.*;
 import com.suisung.mall.common.modules.sync.SyncStoreSpecs;
 import com.suisung.mall.common.utils.StringUtils;
+import com.suisung.mall.core.consts.ConstantRedis;
+import com.suisung.mall.core.web.service.RedisService;
 import com.suisung.mall.shop.base.service.ShopBaseProductSpecService;
 import com.suisung.mall.shop.base.service.ShopBaseProductTypeService;
 import com.suisung.mall.shop.number.service.ShopNumberSeqService;
@@ -70,6 +72,8 @@ public class SyncStoreSpecsServiceImpl extends ServiceImpl<SyncStoreSpecsMapper,
     private SyncStoreSpecsMapper syncStoreSpecsMapper;
 
 
+    @Autowired
+    private RedisService redisService;
 
     @Autowired
     private PlatformTransactionManager transactionManager;
@@ -272,6 +276,7 @@ public class SyncStoreSpecsServiceImpl extends ServiceImpl<SyncStoreSpecsMapper,
 //                    shopProductSpecItemService.updateBatchById(updateSpecItemList,updateSpecItemList.size());
 //                }
                 //3、新增规格类型
+                List<String> shopBaseProductTypeReidisKeyList=new ArrayList<>();
                 List<ShopBaseProductType> shopBaseProductTypes= getShopBaseProductTypeList(syncStoreSpecsList,storeId);
                 for(ShopBaseProductType shopBaseProductType:shopBaseProductTypes){
                     List<Integer> specIdList=new ArrayList<>();
@@ -290,9 +295,11 @@ public class SyncStoreSpecsServiceImpl extends ServiceImpl<SyncStoreSpecsMapper,
                             shopBaseProductType.setType_spec_ids(typeSpecIds);
                         }
                     }
+                    shopBaseProductTypeReidisKeyList.add(ConstantRedis.Cache_NameSpace  + "shop_base_product_type:" +shopBaseProductType.getType_id());
                 }
                 if(!shopBaseProductTypes.isEmpty()){//更新规格类型
                     shopBaseProductTypeService.updateBatchById(shopBaseProductTypes,shopBaseProductTypes.size());
+                    redisService.del(shopBaseProductTypeReidisKeyList);
                 }
                 //4、新增shopItem
                 List<ShopProductItem> addShopProductItemList=new ArrayList<>();
@@ -329,8 +336,10 @@ public class SyncStoreSpecsServiceImpl extends ServiceImpl<SyncStoreSpecsMapper,
                     item.setItem_title("");
                     item.setItem_freetime(0);
                     item.setCategory_id(specCateGoryMap.get(item.getItem_barcode()));
-                    if(existProductItemMap.containsKey(item.getItem_name())){
+                    item.setStore_id(storeId);
-                        item.setItem_id(existProductItemMap.get(item.getItem_barcode()));
+                    if(existProductItemMap.containsKey(item.getItem_barcode())||existProductItemMap.containsKey(item.getItem_name())){
+                        Long itemId=null!=existProductItemMap.get(item.getItem_barcode())?existProductItemMap.get(item.getItem_barcode()):existProductItemMap.get(item.getItem_name());
+                        item.setItem_id(itemId);
                         updateShopProductItemList.add(item);
                     }else {
                         addShopProductItemList.add(item);
@@ -342,7 +351,10 @@ public class SyncStoreSpecsServiceImpl extends ServiceImpl<SyncStoreSpecsMapper,
                         addShopProductItemList.get(i).setItem_id(generatedIds.get(i));
                         addShopProductItemList.get(i).setItem_src_id(String.valueOf(generatedIds.get(i)));
                     }
-                    shopProductItemService.saveBatch(addShopProductItemList,addShopProductItemList.size());
+                    List<ShopProductItem> addShopProductItemListFilter= addShopProductItemList.stream()
+                            .filter(com.suisung.mall.common.utils.CommonUtil.distinctByKey(ShopProductItem::getItem_name))
+                            .collect(Collectors.toList());
+                    shopProductItemService.saveBatch(addShopProductItemListFilter,addShopProductItemListFilter.size());
                 }
                 if(!updateShopProductItemList.isEmpty()){
                     shopProductItemService.updateBatchById(updateShopProductItemList,updateShopProductItemList.size());
@@ -406,36 +418,42 @@ public class SyncStoreSpecsServiceImpl extends ServiceImpl<SyncStoreSpecsMapper,
                     spui.setSpec_ids(spec_ids);
 
                     Map<String,cn.hutool.json.JSONArray> specItemJson=new HashMap<>();
-                    cn.hutool.json.JSONArray productUniqidjsonArray=new cn.hutool.json.JSONArray();
+                    //cn.hutool.json.JSONArray productUniqidjsonArray=new cn.hutool.json.JSONArray();
+                    Map product_uniqidMap = new HashMap();
                     AtomicReference<Integer> itemQuantity= new AtomicReference<>(0);
+                    Map<String,String> jsonArraySpecItemJson=new HashMap<>();
                     sItemList.forEach(item->{
                         String itemSpec=item.getItem_spec();
                         cn.hutool.json.JSONArray arrayItemSpec = cn.hutool.json.JSONUtil.parseArray(itemSpec);
-                        cn.hutool.json.JSONObject uniqidItemJson=new cn.hutool.json.JSONObject();
+                        //cn.hutool.json.JSONObject uniqidItemJson=new cn.hutool.json.JSONObject();
                         String specItemIdSpecItemId="";
                         for (Object josn_item_spec : arrayItemSpec) {
                             Integer specId = Convert.toInt(((cn.hutool.json.JSONObject) josn_item_spec).get("id"));
-                            Integer specName = Convert.toInt(((cn.hutool.json.JSONObject) josn_item_spec).get("name"));
+                            String specName = Convert.toStr(((cn.hutool.json.JSONObject) josn_item_spec).get("name"));
                             String specIdName=specId+"-"+specName;
                             cn.hutool.json.JSONObject itemJson = (cn.hutool.json.JSONObject) ((cn.hutool.json.JSONObject) josn_item_spec).get("item");
+                            if(!jsonArraySpecItemJson.containsKey(itemJson.toString())){
+                                jsonArraySpecItemJson.put(itemJson.toString(),itemSpec);
                                 cn.hutool.json.JSONArray itemsJsonArray=new cn.hutool.json.JSONArray();
                                 if(specItemJson.containsKey(specIdName)){
                                     itemsJsonArray=specItemJson.get(specIdName);
                                 }
                                 itemsJsonArray.add(itemJson);
                                 specItemJson.put(specIdName,itemsJsonArray);
+                            }
                             if(StringUtils.isNotEmpty(specItemIdSpecItemId)){
                                 specItemIdSpecItemId=specItemIdSpecItemId+"-"+itemJson.getStr("id");
                             }else {
                                 specItemIdSpecItemId=itemJson.getStr("id");
                             }
                         }
-                        uniqidItemJson.set(specItemIdSpecItemId,new Object[]{item.getItem_id(),item.getItem_quantity(),"","1001"});
+                        product_uniqidMap.put(specItemIdSpecItemId,new Object[]{item.getItem_id(),item.getItem_quantity(),"",1001});
-                        productUniqidjsonArray.add(uniqidItemJson);
+                       // productUniqidjsonArray.add(uniqidItemJson);
                         itemQuantity.updateAndGet(v -> v + item.getItem_quantity());
                     });
                     itemQualityMap.put(productId,itemQuantity.get());
                     cn.hutool.json.JSONArray jsonArraySpecItem=new cn.hutool.json.JSONArray();
+
                     specItemJson.forEach((key,jsonArray)->{
                         cn.hutool.json.JSONObject itemJson = new cn.hutool.json.JSONObject();
                         itemJson.set("item",jsonArray);
@@ -448,7 +466,7 @@ public class SyncStoreSpecsServiceImpl extends ServiceImpl<SyncStoreSpecsMapper,
                         jsonArraySpecItem.add(itemJson);
                     });
                     String product_spec= JSONUtil.toJsonStr(jsonArraySpecItem);
-                    String product_uniqid=JSONUtil.toJsonStr(productUniqidjsonArray);
+                    String product_uniqid=JSONUtil.toJsonStr(product_uniqidMap);
                     spui.setProduct_spec(product_spec);
                     spui.setProduct_uniqid(product_uniqid);
                     updateShopProductInfoList.add(spui);
@@ -484,6 +502,7 @@ public class SyncStoreSpecsServiceImpl extends ServiceImpl<SyncStoreSpecsMapper,
                 //shopitem 最后删除没有规格的商品
                 QueryWrapper<ShopProductItem> queryWrapper=new QueryWrapper<>();
                 queryWrapper.select("item_id");
+                if(!shopProductIndexList.isEmpty()){
                     for (ShopProductIndex shopProductIndex:shopProductIndexList) {
                         queryWrapper.or(q->q.eq("store_id",storeId)
                                 .eq("product_id",shopProductIndex.getProduct_id())
@@ -502,6 +521,7 @@ public class SyncStoreSpecsServiceImpl extends ServiceImpl<SyncStoreSpecsMapper,
                         shopProductItemSeqService.removeBatchByIds(rmSeqIds);
                         shopProductItemService.removeBatchByIds(ItemIds,ItemIds.size());
                     }
+                }
             }catch (Exception e){
                 status.setRollbackOnly();
                 log.error("批量操作异常", e);
@@ -581,7 +601,12 @@ public class SyncStoreSpecsServiceImpl extends ServiceImpl<SyncStoreSpecsMapper,
         List<ShopProductItem> shopProductItemList=shopProductItemService.list(wrapper);
         Map<String,Long> result=new HashMap<>();
         for (ShopProductItem shopProductItem : shopProductItemList) {
+            if(StringUtils.isNotEmpty(shopProductItem.getItem_name())){
                 result.put(shopProductItem.getItem_name(),shopProductItem.getItem_id());
+            }else {
+                result.put(shopProductItem.getItem_barcode(),shopProductItem.getItem_id());
+            }
+
         }
         return result;
     }

mall-shop/src/main/resources/mapper/number/ShopNumberSeqMapper.xml

@@ -19,7 +19,7 @@
                                         and number =(select max(item_id) from shop_product_item)+1
     </select>
 
-    <select id="findProductAndImtemId">
+    <select id="findProductAndImtemId" resultMap="shopNumberSeqMap">
         SELECT * from shop_number_seq where prefix in("product_id","item_id")
     </select>
 

sql/shop/dev/20250902_dml.sql

@@ -0,0 +1,3 @@
+alter table shop_base_product_type drop INDEX type_is_draft;
+alter table shop_base_product_type drop INDEX type_spec_ids;
+alter table shop_base_product_type drop INDEX idx_shop_base_product_type_type_name;