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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityRewardServiceImpl.java

@@ -157,7 +157,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
     @Transactional(rollbackFor = Exception.class)
     public List<Long> sendReward(Long userId, Long activityId) {
         if (userRewarded(userId, activityId)) {
-            return null;
+            return new ArrayList<>();
         }
         ActivityPlan activityPlan = activityPlanService.getById(activityId);
         if (activityPlan == null) {

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonGroupMapper.xml

@@ -375,8 +375,9 @@
 		SELECT
 			COUNT(1) AS videoLessonCount,
 			(SELECT COUNT(1) FROM (SELECT COUNT(1) FROM video_lesson_purchase_record GROUP BY student_id_) a) AS payingUser,
-			(SELECT COUNT(1) FROM video_lesson_group_detail WHERE video_lesson_group_id_ IN (SELECT id_ FROM video_lesson_group WHERE audit_status_='PASS')) AS lessonCount
-		FROM video_lesson_group WHERE audit_status_='PASS'
+			(SELECT COUNT(1) FROM video_lesson_group_detail WHERE video_lesson_group_id_ IN
+											  (SELECT id_ FROM video_lesson_group WHERE audit_status_='PASS'  and shelves_flag_ = 1)) AS lessonCount
+		FROM video_lesson_group WHERE audit_status_='PASS' and shelves_flag_ = 1
 	</select>
 	<select id="selectVideoLesson" resultType="com.yonge.cooleshow.biz.dal.vo.CountVideoGroupVo$VideoLesson">
 		SELECT