Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

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

@@ -721,4 +721,11 @@ public interface FsStoreProductScrmMapper
             "WHERE p.product_id = #{productId} " +
             "FOR UPDATE;")
     FsStoreProductScrm selectLockById(@Param("productId") Long productId);
+
+    /**
+     * 商品名称在店铺是否存在
+     * @param productName
+     * @return
+     */
+    Boolean productNameExist(@Param("productName") String productName, @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, @Param("storeId") Long storeId);
+    Boolean productNameExist(@Param("productName") String productName);
 }

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

@@ -263,11 +263,9 @@ public class FsPlatformProductScrmServiceImpl implements IFsPlatformProductScrmS
         if(copyProductInfo==null){
             return R.error("复制，商品数据不存在！");
         }
-        //这个商品是否已经在我店铺存在了
-        Long storeProductId = copyProductInfo.getStoreProductId();
-        //存在
-        FsStoreProductScrm  ObjectExist = fsStoreProductMapper.selectFsStoreProductById(storeProductId);
-        if(ObjectUtils.isNotEmpty(ObjectExist)){
+        //存在,这个商品是否已经在我店铺存在了
+        boolean existFlag = fsStoreProductMapper.productNameExist(copyProductInfo.getProductName(), 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(), fsStoreProductScrm.getStoreId());
+                Boolean flag = iFsPlatformProductScrmMapper.productNameExist(fsStoreProductScrm.getProductName());
                 if(flag){
                     continue;
                 }

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

@@ -299,7 +299,6 @@
     <select id="productNameExist" resultType="java.lang.Boolean">
         select count(product_id)
         from fs_platform_product_scrm p where p.product_name = #{productName}
-        and p.store_id = #{storeId}
     </select>
 
     <delete id="deleteFsPlatFormProductByIds">

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

@@ -972,6 +972,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ORDER BY
             p.product_id DESC
     </select>
+
     <update id="updateBatchById">
         UPDATE fs_store_product_scrm
         <set>
@@ -994,4 +995,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.productId}
         </foreach>
     </update>
+
+    <select id="productNameExist" resultType="java.lang.Boolean">
+       select count(*) from fs_store_product_scrm
+       where product_name = #{productName} and store_id = #{storeId}
+    </select>
+
+
+
+
 </mapper>

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

@@ -912,7 +912,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         other_special_qualification_start,other_special_qualification_end,is_business_license_permanent,store_seq,merchant_id,business_code,
         drug_code,medical_device1_code,medical_device2_code,medical_device3_code,food_code,medical_code,other_special_qualification_code,
         quality_assurance_agreement_code,settlement_agreement_code,title_name_one,title_Name_two,title_Name_three,
-        qualification_update_time,
+        qualification_update_time,medical_device3,
         DATE_ADD(qualification_update_time, INTERVAL 6 MONTH) as next_qualification_update_time,
         DATEDIFF(DATE_ADD(qualification_update_time, INTERVAL 6 MONTH), NOW()) AS days_diff,
         ( SELECT COUNT(*) FROM fs_store_product_scrm sps WHERE sps.store_id = ss.store_id ) AS productCount