Merge remote-tracking branch 'origin/master'

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

@@ -289,6 +289,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     studentRegistration.setMusicGroupId(musicGroupId);
                     studentRegistration.setSubjectId(e.getSubjectId());
                     studentRegistration.setActualSubjectId(e.getSubjectId());
+                    studentRegistration.setTemporaryCourseFee(null);
                 }
                 studentRegistrationList.addAll(musicGroupStudentRegistrationList);
 

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

@@ -764,7 +764,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             studentRegistrationDao.update(studentRegistration);
 
             //进行中乐团加入学生缴费
-            if (studentRegistration.getTemporaryCourseFee() != null && studentRegistration.getTemporaryCourseFee().compareTo(new BigDecimal("0")) > 0) {
+            if (studentRegistration.getTemporaryCourseFee() != null) {
                 //关闭待支付订单
                 StudentPaymentOrder waitPayOrder = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(studentRegistration.getUserId(), studentRegistration.getMusicGroupId(), DealStatusEnum.WAIT_PAY);
                 waitPayOrder.setStatus(DealStatusEnum.CLOSE);