进行中加学员bug修改

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

@@ -2991,15 +2991,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         StudentRegistration studentRegistration = studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
 
         if (studentPaymentOrder.getStatus() == SUCCESS) {
-            //当前乐团报名是否赠送乐团网管课
-//            MusicGroupStudentFee musicGroupStudentFee = musicGroupPaymentCalenderService.updateCalender(calenderDetail.getId(), studentRegistration.getUserId());
-//            if (musicGroupStudentFee != null) {
-//                musicGroupStudentFee.setUpdateTime(date);
-//                musicGroupStudentFee.setLatestPaidTime(date);
-//                musicGroupStudentFee.setPaymentStatus(PaymentStatus.PAID_COMPLETED);
-//                musicGroupStudentFee.setTemporaryCourseFee(new BigDecimal(0));
-//                musicGroupStudentFeeDao.update(musicGroupStudentFee);
-//            }
             //如果是进行中加学员
             MusicGroupPaymentCalender paymentCalender = musicGroupPaymentCalenderDao.get(studentPaymentOrder.getCalenderId());
             if (paymentCalender.getPaymentType() == MusicGroupPaymentCalender.PaymentType.ADD_STUDENT) {

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

@@ -1677,10 +1677,10 @@
             and status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
         union all
-        select ncs.* from course_schedule cs left join course_schedule ncs on ncs.id_ = cs.new_course_id_
-        where cs.new_course_id_ &gt; 0 and cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ = 0
+        select * from course_schedule
+        where class_group_id_ = #{classGroupId} AND pre_course_flag_ = 0 AND id_ = new_course_id_
         <if test="status != null">
-            and ncs.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            and status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
     </select>