Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseMapper.java

@@ -287,7 +287,7 @@ public interface FsUserCourseMapper
 
     @Select("select video_id,title,course_id,video_url,SEC_TO_TIME(duration) as total_duration," +
             "thumbnail videoImgUrl,description videoDescription,video_url videoUrl,question_bank_id questionBankId " +
-            " from fs_user_course_video where course_id = #{courseId} and is_del = 0 order by course_sort,video_id")
+            " from fs_user_course_video where course_id = #{courseId} and is_del = 0 order by course_sort DESC,video_id")
     List<FsUserCourseVideoAppletVO.FsUserCourseVideo> selectFsUserCourseVideoAppletByCourseId(@Param("courseId") Long courseId);
 
 }

fs-service/src/main/java/com/fs/course/param/FsUserCourseVideoFinishUParam.java

@@ -22,4 +22,6 @@ public class FsUserCourseVideoFinishUParam implements Serializable {
     private Integer linkType;
     private Integer isRoom;//是否群聊
     private Integer isOpen;//是否公开课
+    private Long periodId;
+    private Integer projectId;
 }

fs-service/src/main/java/com/fs/his/mapper/FsCouponMapper.java

@@ -96,6 +96,6 @@ public interface FsCouponMapper
             " order by c.coupon_id desc "+
             "</script>"})
     List<FsCouponListUVO> selectFsCouponListUVO(@Param("maps")FsCouponListUParam param);
-    @Update("update fs_coupon set remain_number=(select ifnull(count(1),0) from fs_user_coupon uc where uc.coupon_id=#{couponId}) where coupon_id=#{couponId}")
+    @Update("update fs_coupon set remain_number=number-(select ifnull(count(1),0) from fs_user_coupon uc where uc.coupon_id=#{couponId}) where coupon_id=#{couponId}")
     int updateRemainCount(Long couponId);
 }

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -1760,6 +1760,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             fs_course_red_packet_log flog
                 LEFT JOIN fs_user ON fs_user.user_id = flog.user_id
                 LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
+        where flog.`status` = 1
         GROUP BY
             flog.period_id,
             flog.video_id,