Merge branch 'zx_online_update_1218' into develop-new

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

@@ -1560,6 +1560,9 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
                             .set(CourseSchedule::getStatus, CourseScheduleEnum.CANCEL.getCode())
                     );
 
+                    //退款
+                    this.refund(courseGroup);
+
                     // 小组课成课推送
                     if (courseGroup.getType().equals(CourseScheduleEnum.GROUP.getCode())) {
 
@@ -1573,8 +1576,6 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
                         this.sendStudentMessage(userIds, courseGroup);
                     }
 
-                    //退款
-                    this.refund(courseGroup);
                 }
                 courseGroup.setUpdatedTime(new Date());
                 this.updateById(courseGroup);
@@ -1602,7 +1603,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
                 .eq(CourseScheduleStudentPayment::getCourseGroupId, courseGroup.getId()));
         Set<Long> userIds = list.stream().map(CourseScheduleStudentPayment::getUserId).collect(Collectors.toSet());
         // 学生
-        Map<Long, com.yonge.cooleshow.biz.dal.entity.SysUser> mapByIds = sysUserService.getMapByIds((List<Long>) userIds);
+        Map<Long, com.yonge.cooleshow.biz.dal.entity.SysUser> mapByIds = sysUserService.getMapByIds(new ArrayList<>( userIds));
 
         Map<Long, String> receivers = new HashMap<>();
         for (com.yonge.cooleshow.biz.dal.entity.SysUser value : mapByIds.values()) {