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

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

@@ -1600,9 +1600,6 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
                 .eq(CourseScheduleStudentPayment::getCourseGroupId, courseGroup.getId()));
         Set<Long> userIds = list.stream().map(CourseScheduleStudentPayment::getUserId).collect(Collectors.toSet());
 
-        if (courseGroup.getPreStudentNum() < courseGroup.getMixStudentNum() || !courseGroup.getStatus().equals(CourseGroupEnum.APPLY.getCode())) {
-            return;
-        }
         //人数达标则修改课程组为进行中状态
         courseGroup.setStatus(CourseGroupEnum.ING.getCode());
         List<Long> noGroupJoinUserIds = Lists.newArrayList();

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

@@ -640,7 +640,10 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
 
             saveData(userPaymentOrder, tenantdivMap, teacherMap, bizMap, serviceFeeAmount);
         }
-        courseGroupService.groupSuccess(courseGroupService.getById(courseGroup.getId()));
+        CourseGroup group = courseGroupService.getById(courseGroup.getId());
+        if (group.getType().equals(CourseScheduleEnum.GROUP.name()) && group.getMaxStudentNum() == group.getPreStudentNum() &&group.getStatus().equals(CourseGroupEnum.APPLY.getCode())) {
+            courseGroupService.groupSuccess(group);
+        }
         log.info("buyLiveCourseSuccess ok");
         //课程购买成功后进行消息推送