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

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -3045,7 +3045,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         }
 
 
-        if (videoDuration==null){
+        if (videoDuration==null && videoDuration == 0L){
             FsUserCourseVideo video = fsUserCourseVideoMapper.selectFsUserCourseVideoByVideoId(videoId);
             videoDuration=video.getDuration();
             redisCache.setCacheObject(videoRedisKey,video.getDuration());

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

@@ -315,7 +315,10 @@
 
     <select id="productNameExist" resultType="java.lang.Boolean">
         select count(product_id)
-        from fs_platform_product_scrm p where p.product_name = #{productName} or p.common_name = #{commonName}
+        from fs_platform_product_scrm p where p.product_name = #{productName}
+        <if test="commonName != null and commonName != ''">
+            or (p.common_name = #{commonName} AND p.common_name != '-')
+        </if>
     </select>
 
     <delete id="deleteFsPlatFormProductByIds">