Merge branch 'dev_1_3_2_20220815'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -52,10 +52,10 @@ public class MusicSheet implements Serializable {
 	@ApiModelProperty(value = "曲目来源类型 TEACHER 老师 PLATFORM 平台")
 	private SourceTypeEnum sourceType;
 
-    @NotBlank(message = "音乐人不能为空!")
-    @Size(max = 32, message = "音乐人长度不能超过32位!")
+    @NotBlank(message = "艺术家不能为空!")
+    @Size(max = 32, message = "艺术家长度不能超过32位!")
     @TableField("composer_")
-    @ApiModelProperty(value = "音乐人")
+    @ApiModelProperty(value = "艺术家")
     private String composer;  //音乐家
 
     @TableField("music_subject_")

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

@@ -81,5 +81,5 @@ public interface ActivityRewardService extends IService<ActivityReward>  {
 	 */
 	IPage<ActivityRewardChangeStockVo> selectChangeStockPage(IPage<ActivityRewardChangeStockVo> page, ActivityRewardChangeStockSearch query);
 
-	void sendReward(Long userId, Long activityId);
+	List<Long> sendReward(Long userId, Long activityId);
 }

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

@@ -152,11 +152,11 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void sendReward(Long userId, Long activityId) {
+    public List<Long> sendReward(Long userId, Long activityId) {
         ActivityPlan activityPlan = activityPlanService.getById(activityId);
         if (activityPlan == null) {
             log.warn("活动不存在");
-            return;
+            return null;
         }
 
         List<ActivityReward> activityRewardList = getActivityReward(activityId);
@@ -171,6 +171,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
 
         RedissonMultiLock lock = new RedissonMultiLock(lockList.toArray(new RLock[lockList.size()]));
 
+        List<Long> activityRewardIdList = new ArrayList<>();
         try {
             lock.lock();
             for (ActivityReward activityReward : activityRewardList) {
@@ -192,6 +193,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
                 }
 
                 activityRewardName.append(activityReward.getRewardName());
+                activityRewardIdList.add(activityReward.getId());
             }
             // 发送活动获奖推送
             if (!StringUtil.isEmpty(activityRewardName)) {
@@ -202,6 +204,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
                 lock.unlock();
         }
 
+        return activityRewardIdList;
     }
 
     /**

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

@@ -61,7 +61,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
                  .forEach(musicTagVo -> {
                      List<MusicTagVo> childrenList = musicTagMap.get(musicTagVo.getId().toString());
                      childrenList.forEach(children -> {
-                         musicTagVo.setEnablePlatformMusicSheetNum(musicTagVo.getEnableTeacherMusicSheetNum() + children.getEnablePlatformMusicSheetNum());
+                         musicTagVo.setEnablePlatformMusicSheetNum(musicTagVo.getEnablePlatformMusicSheetNum() + children.getEnablePlatformMusicSheetNum());
                          musicTagVo.setEnableTeacherMusicSheetNum(musicTagVo.getEnableTeacherMusicSheetNum() + children.getEnableTeacherMusicSheetNum());
                          musicTagVo.setMusicPlatformSheetNum(musicTagVo.getMusicPlatformSheetNum() + children.getMusicPlatformSheetNum());
                          musicTagVo.setMusicTeacherSheetNum(musicTagVo.getMusicTeacherSheetNum() + children.getMusicTeacherSheetNum());

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

@@ -415,6 +415,7 @@
 			where vlg.shelves_flag_ = 1
 			group by vlg.lesson_subject_
 		) e on e.lesson_subject_ = s.id_
+		where s.parent_subject_id_ !=0 and s.parent_subject_id_ is not null
 		order by
 		<choose>
 			<when test="query.sortType == 'MUSIC'">