Merge remote-tracking branch 'origin/master'

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

@@ -121,7 +121,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
 
         Date now=new Date();
         courseGroup.setSingleClassMinutes(courseCycleInfo.getSingleClassMinutes());
-        courseGroup.setStatus(GroupStatusEnum.APPLYING);
+        courseGroup.setStatus(GroupStatusEnum.NORMAL);
         List<CourseSchedule> newCourses = courseScheduleService.createCourses(courseGroupCreateInfo.getCourseCycleInfo());
         for (CourseSchedule newCourse : newCourses) {
             newCourse.setTeachMode(TeachModeEnum.ONLINE);

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

@@ -1,15 +1,13 @@
 package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.*;
-import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.entity.CoursesGroup;
-import com.ym.mec.biz.dal.entity.PracticeGroup;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.PlatformCashAccountDetailTypeEnum;
 import com.ym.mec.biz.service.GroupClassService;
+import com.ym.mec.biz.service.SysTenantAccountService;
 import com.ym.mec.biz.service.SysUserCashAccountService;
 import com.ym.mec.common.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +57,8 @@ public class GroupClassServiceImpl implements GroupClassService {
     private StudentPaymentOrderDao studentPaymentOrderDao;
     @Autowired
     private CoursesGroupDao coursesGroupDao;
+    @Autowired
+    private SysTenantAccountService sysTenantAccountService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -151,6 +151,12 @@ public class GroupClassServiceImpl implements GroupClassService {
                 throw new BizException("当前课程组不可关闭");
             }
             cleanGroupInfo(groupId.toString(), GroupType.COMM);
+            List<CourseSchedule> groupNotStartCourses = courseScheduleDao.findGroupNotStartCourses(groupId.toString(), groupType);
+            if(!CollectionUtils.isEmpty(groupNotStartCourses)){
+                //剩余课程时长
+                Integer totalCourseTime=groupNotStartCourses.size()*coursesGroup.getSingleClassMinutes();
+                sysTenantAccountService.update(coursesGroup.getTeacherId(), totalCourseTime, "", SysTenantAccountDetail.TransType.CONSUME, "",BigDecimal.ZERO,"关闭课程组");
+            }
             coursesGroup.setMemo("主动关闭课程组");
             coursesGroup.setStatus(GroupStatusEnum.CANCEL);
             coursesGroupDao.update(coursesGroup);