update

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

@@ -265,7 +265,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 		if(orignStudentPaymentOrder == null){
 			return false;
 		}
-		if(orignStudentPaymentOrder.getStatus() != DealStatusEnum.ING || orignStudentPaymentOrder.getStatus() != DealStatusEnum.WAIT_PAY){
+		if(orignStudentPaymentOrder.getStatus() != DealStatusEnum.ING){
 			return false;
 		}
 		

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

@@ -1352,6 +1352,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 musicGroupPaymentCalenderDetail.setExpectAmount(musicGroupPaymentCalender.getPaymentAmount());
                 musicGroupPaymentCalenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.NON_PAYMENT);
             }
+            musicGroupPaymentCalenderDetail.setExpectAmount(musicGroupPaymentCalenderDetail.getExpectAmount().add(musicGroupPaymentCalender.getMemberPaymentAmount()));
             musicGroupPaymentCalenderDetail.setUserStatus(null);
             musicGroupPaymentCalenderDetail.setDeadlinePaymentDate(musicGroupPaymentCalender.getDeadlinePaymentDate());
             musicGroupPaymentCalenderDetail.setStartPaymentDate(musicGroupPaymentCalender.getStartPaymentDate());