活动排课

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

@@ -4511,8 +4511,12 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         }
         Map<String,BigDecimal> results = new HashMap<>(1);
 
-        BigDecimal onlineClassNum = new BigDecimal(practice.getAllCourseNum());
-        BigDecimal totalPrice = practiceGroupSellPrice.getSingleClassMinutesPrice().multiply(onlineClassNum);
+        BigDecimal totalPrice = BigDecimal.ZERO;
+        if(practice.getAllCourseNum() != null){
+            BigDecimal onlineClassNum = new BigDecimal(practice.getAllCourseNum());
+            totalPrice = practiceGroupSellPrice.getSingleClassMinutesPrice().multiply(onlineClassNum);
+        }
+
         //课程购买费用计算
         VipGroupSalarySettlementTypeDto salarySettlement = null;
         if(practice.getVipGroupActivityId() != null){

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherPracticeGroupController.java

@@ -58,7 +58,9 @@ public class TeacherPracticeGroupController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
+		Teacher teacher = teacherDao.get(sysUser.getId());
 		practice.setUserId(sysUser.getId());
+		practice.setOrganId(teacher.getOrganId());
 		Map results = practiceGroupService.countPracticeGroupPredictFee(practice,practice.getUserId(), null);
 		return succeed(results);
 	}