update

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

@@ -3679,10 +3679,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 //获取学员剩余课程费用
                 surplusCourseFeeMapList.addAll(studentRegistrationDao.querySurplusCourseFeeByClassGroupId(Integer.parseInt(integer),classGroupStudent.get(integer)));
                 MusicGroup byClassId = musicGroupDao.findByClassId(Integer.parseInt(integer));
+                if (byClassId == null){
+                    throw new BizException("操作失败：班级所在乐团状态不支持");
+                }
                 //学员可能来自不同的分部，获取对应的课程单价
                 classGroupUnitPriceMap.put(Integer.parseInt(integer),MapUtil.convertIntegerMap(organizationCourseUnitPriceSettingsDao.queryMapByOrganIdAndChargeTypeId(byClassId.getChargeTypeId(), byClassId.getOrganId())));
                 //获取班级剩余课程时长
-                classSubCoursePriceMap.put(Integer.parseInt(integer),MapUtil.convertIntegerMap(courseScheduleDao.querySubCourseTimeMap(masterClassGroupId)));
+                classSubCoursePriceMap.put(Integer.parseInt(integer),MapUtil.convertIntegerMap(courseScheduleDao.querySubCourseTimeMap(Integer.parseInt(integer))));
                 String[] s = classGroupStudent.get(integer).split(",");
                 for (String s1 : s) {
                     studentCLassMap.put(Integer.parseInt(s1),Integer.parseInt(integer));
@@ -3728,6 +3731,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 if (unitPrice == null) {
                     throw new BizException("分部默认课程类型单价不存在，请设置");
                 }
+                if(courseTime == null){
+                    courseTime = BigDecimal.ZERO;
+                }
                 BigDecimal totalPrice = unitPrice.multiply(courseTime).setScale(0, BigDecimal.ROUND_HALF_UP);
                 totalPriceMap.put(studentId,totalPrice);
                 calenderDto.setMasterSubCoursePrice(masterTotalPrice);