增加商品重复入库判断条件-》通用名称

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductScrmMapper.java

@@ -727,5 +727,6 @@ public interface FsStoreProductScrmMapper
      * @param productName
      * @return
      */
-    Boolean productNameExist(@Param("productName") String productName, @Param("storeId") Long storeId);
+    Boolean productNameExist(@Param("productName") String productName,@Param("commonName") String commonName,
+                             @Param("storeId") Long storeId);
 }

fs-service/src/main/java/com/fs/hisStore/mapper/IFsPlatformProductScrmMapper.java

@@ -76,5 +76,5 @@ public interface IFsPlatformProductScrmMapper {
      * @param productName
      * @return
      */
-    Boolean productNameExist(@Param("productName") String productName);
+    Boolean productNameExist(@Param("productName") String productName, @Param("commonName") String commonName);
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsPlatformProductScrmServiceImpl.java

@@ -264,7 +264,7 @@ public class FsPlatformProductScrmServiceImpl implements IFsPlatformProductScrmS
             return R.error("复制，商品数据不存在！");
         }
         //存在,这个商品是否已经在我店铺存在了
-        boolean existFlag = fsStoreProductMapper.productNameExist(copyProductInfo.getProductName(), fsStoreProduct.getStoreId());
+        boolean existFlag = fsStoreProductMapper.productNameExist(copyProductInfo.getProductName(), copyProductInfo.getCommonName(),fsStoreProduct.getStoreId());
         if(existFlag){
             return R.error("这个商品你店铺已经有了，无需重复添加！");
         }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductScrmServiceImpl.java

@@ -1333,7 +1333,7 @@ private void addProductAttr(Long productId, List<ProductArrtDTO> items, List<FsS
                 //原商品库
                 FsStoreProductScrm fsStoreProductScrm = fsStoreProductMapper.selectFsStoreProductById(storeProductId);
                 //存在的商品不用一直添加到总库
-                Boolean flag = iFsPlatformProductScrmMapper.productNameExist(fsStoreProductScrm.getProductName());
+                Boolean flag = iFsPlatformProductScrmMapper.productNameExist(fsStoreProductScrm.getProductName(), fsStoreProductScrm.getCommonName());
                 if(flag){
                     continue;
                 }

fs-service/src/main/resources/mapper/hisStore/FsPlatformProductScrmMapper.xml

@@ -305,7 +305,7 @@
 
     <select id="productNameExist" resultType="java.lang.Boolean">
         select count(product_id)
-        from fs_platform_product_scrm p where p.product_name = #{productName}
+        from fs_platform_product_scrm p where p.product_name = #{productName} or p.common_name = #{commonName}
     </select>
 
     <delete id="deleteFsPlatFormProductByIds">

fs-service/src/main/resources/mapper/hisStore/FsStoreProductScrmMapper.xml

@@ -1032,7 +1032,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="productNameExist" resultType="java.lang.Boolean">
        select count(*) from fs_store_product_scrm
-       where product_name = #{productName} and store_id = #{storeId}
+       where store_id = #{storeId} and  (product_name = #{productName} or common_name = #{commonName})
     </select>