update

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupService.java

@@ -180,7 +180,7 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @param vipGroupId: vip课编号
      * @return void
      */
-    void createVipGroupCourseScheInfo(Long vipGroupId);
+    void createVipGroupCourseScheInfo(Long vipGroupId,ClassGroup classGroup);
 
     /**
      * @Author: Joburgess

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -303,7 +303,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(StringUtils.isNotBlank(studentIds)){
 			List<Integer> collect = studentIdList.stream().mapToInt(Integer::parseInt).boxed().collect(Collectors.toList());
 			classGroupService.addStudentIntoClassGroup(vipGroupApplyBaseInfoDto.getId().toString(),classGroup.getId(),collect);
-			createVipGroupCourseScheInfo(vipGroupApplyBaseInfoDto.getId());
+			createVipGroupCourseScheInfo(vipGroupApplyBaseInfoDto.getId(),classGroup);
 		}
 
 		Set<Integer> roleIds = new HashSet<>(1);
@@ -835,11 +835,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		}
 
 		Integer studentPaymentNum=studentPaymentOrderDao.countStudentPaymentNum(vipGroupId.toString());
+
 		if(studentPaymentNum.equals(classGroup.getExpectStudentNum())&&updateVipStatus){
+			classGroup.setStudentNum(studentPaymentNum);
 			classGroup.setDelFlag(YesOrNoEnum.NO);
 			vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
 			vipGroupDao.update(vipGroup);
-			createVipGroupCourseScheInfo(vipGroupId);
+			createVipGroupCourseScheInfo(vipGroupId,classGroup);
 		}
 		if(num!=0||updateVipStatus){
 			classGroupDao.update(classGroup);
@@ -848,15 +850,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void createVipGroupCourseScheInfo(Long vipGroupId){
+	public void createVipGroupCourseScheInfo(Long vipGroupId,ClassGroup classGroup){
 		VipGroup vipGroupApplyBaseInfoDto = vipGroupDao.get(vipGroupId);
 		List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroupApplyBaseInfoDto.getCourseSchedulesJson(),CourseSchedule.class);
 		courseScheduleService.batchAddCourseSchedule(courseSchedules);
 
 		SysUser sysUser = sysUserFeignService.queryUserById(vipGroupApplyBaseInfoDto.getUserId());
 
-		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId,null);
-
 		ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupId.intValue(), vipGroupApplyBaseInfoDto.getUserId());
 
 		//创建老师单节课课酬信息

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -261,7 +261,7 @@
         <![CDATA[ AND create_time_ <= ]]> #{beforeTime}
     </select>
     <select id="countStudentPaymentNum" resultType="int">
-        select count(1) from student_payment_order where  music_group_id_=#{musicGroupId} AND status_ = 'SUCCESS'
+        select count(1) from student_payment_order where  music_group_id_=#{musicGroupId} AND status_ = 'SUCCESS' AND type_='SMALL_CLASS_TO_BUY'
     </select>
 
 </mapper>

mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -155,6 +155,7 @@
     <sql id="vipGroupQueryCondition">
         <where>
             1=1
+            AND vg.audit_status_!='REJECT'
             <if test="search!=null and search!=''">
                 AND (vg.name_ LIKE CONCAT('%',#{search},'%') OR vg.id_=#{search})
             </if>