Merge remote-tracking branch 'origin/master'

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

@@ -3714,20 +3714,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         checkMergeClassSplitClassAffirmParam(mergeClassSplitClassAffirmDto);
         //如果缴费项目不需要审核，那么生成班级以及课表
         if(status == null || status != AUDITING){
-
-            ClassGroup4MixDto classGroup4MixDto = classGroup4MixDtos.get(0);
-            classGroup4MixDto.setMusicGroupStudentClassAdjustId(musicGroupStudentClassAdjust.getId());
-            //保存课程时长
-            classGroup4MixDto.setClassCourseMinute(musicGroupStudentClassAdjust.getClassCourseMinute());
-            //拷贝课程类型
-            List<CourseTimeDto> courseTimeDtoList = classGroup4MixDto.getCourseTimeDtoList();
-            List<CourseTimeDto> courseTimeDtoListBackup = Arrays.asList(new CourseTimeDto[courseTimeDtoList.size()]);
-            Collections.copy(courseTimeDtoListBackup,courseTimeDtoList);
-            //每种课程类型单独排课
-            for (CourseTimeDto courseTimeDto : courseTimeDtoListBackup) {
-                List<CourseTimeDto> courseTimeDtos = new ArrayList<>();
-                courseTimeDtos.add(courseTimeDto);
-                classGroup4MixDto.setCourseTimeDtoList(courseTimeDtos);
+            //每种课程类型单独进行排课
+            for (ClassGroup4MixDto classGroup4MixDto : classGroup4MixDtos) {
+                classGroup4MixDto.setMusicGroupStudentClassAdjustId(musicGroupStudentClassAdjust.getId());
+                classGroup4MixDto.setClassCourseMinute(musicGroupStudentClassAdjust.getClassCourseMinute());
                 classGroupService.classGroupAdjust2(classGroup4MixDto);
             }
             //排课完成后删除所选课程

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

@@ -34,7 +34,7 @@
         <!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval
             AS ID FROM DUAL </selectKey> -->
         INSERT INTO organization_course_duration_settings
-        (id_,organ_id_,course_type_,duration,create_time_,update_time_)
+        (id_,organ_id_,course_type_,duration_,create_time_,update_time_)
         VALUES(#{id},#{organId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{duration},now(),now())
     </insert>
 

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

@@ -597,7 +597,7 @@
                SUM(IF(g.type_ != 'INSTRUMENT', so.expect_amount_, 0)) teachingFee
         FROM student_payment_order spo
                  LEFT JOIN sell_order so ON spo.id_ = so.order_id_
-                 LEFT JOIN goods g ON g.id_ = so.goods_id_
+                 LEFT JOIN goods g ON IF(so.parent_goods_id_ IS NOT NULL,g.id_ = so.parent_goods_id_,g.id_ = so.goods_id_)
         WHERE spo.id_ = #{orderId}
     </select>
 </mapper>