Merge remote-tracking branch 'origin/master'

fs-service/src/main/resources/mapper/course/FsUserCoursePeriodDaysMapper.xml

@@ -30,6 +30,7 @@
         inner join fs_user_course b on a.course_id = b.course_id
         inner join fs_user_course_video c on a.video_id = c.video_id
         <where>
+            and a.del_flag ='0'
             <if test="periodId != null "> and period_id = #{periodId}</if>
             <if test="courseId != null "> and a.course_id = #{courseId}</if>
             <if test="videoId != null "> and a.video_id = #{videoId}</if>
@@ -119,7 +120,7 @@
     </delete>
 
     <select id="selectCourseVideoList" resultType="FsUserCoursePeriodDays">
-        select * from fs_user_course_period_days where period_id in
+        select * from fs_user_course_period_days where  del_flag ='0' and period_id in
         <foreach collection="periodIds" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -132,6 +133,7 @@
         ucp.period_name dictLabel
         from fs_user_course_period ucp
         <where>
+            and ucp.del_flag ='0'
             <if test="params.name != null and params.name != ''">
                 and ucp.period_name like concat('%', #{params.name}, '%')
             </if>

fs-service/src/main/resources/mapper/course/FsUserCourseVideoRedPackageMapper.xml

@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectByParamsList" resultMap="FsUserCourseVideoRedPackageResult">
         select id, company_id, video_id, red_packet_money, period_id, data_type
         from fs_user_course_video_red_package
-        where data_type = 2
+        where del_flag ='0' and data_type = 2
         and (
         <foreach collection="list" item="item" separator=" OR ">
             (period_id = #{item.periodId} AND video_id = #{item.videoId} AND company_id = #{item.companyId})
@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <select id="selectByRuleIds" resultType="com.fs.course.domain.FsUserCourseVideoRedPackage">
-        select * from fs_user_course_video_red_package where data_type = 3 and rule_id in <foreach collection="ruleIds" open="(" separator="," close=")" item="item">#{item}</foreach>
+        select * from fs_user_course_video_red_package where del_flag ='0' and data_type = 3 and rule_id in <foreach collection="ruleIds" open="(" separator="," close=")" item="item">#{item}</foreach>
     </select>
     <insert id="batchSaveFsUserCourseVideoRedPackage" useGeneratedKeys="true" keyProperty="id">
         insert into fs_user_course_video_red_package
@@ -131,9 +131,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
     <select id="listByCompanyIdAndVideoIds" resultType="com.fs.course.domain.FsUserCourseVideoRedPackage">
-        select * from fs_user_course_video_red_package where data_type = 1 and company_id = #{companyId} and video_id in <foreach collection="videoIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
+        select * from fs_user_course_video_red_package where del_flag ='0' and data_type = 1 and company_id = #{companyId} and video_id in <foreach collection="videoIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
     </select>
     <select id="listByRuleIds" resultType="com.fs.course.domain.FsUserCourseVideoRedPackage">
-        select * from fs_user_course_video_red_package where data_type = 3 and rule_id in <foreach collection="ids" item="item" open="(" separator="," close=")">#{item}</foreach>
+        select * from fs_user_course_video_red_package where del_flag ='0' and data_type = 3 and rule_id in <foreach collection="ids" item="item" open="(" separator="," close=")">#{item}</foreach>
     </select>
 </mapper>