update

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

@@ -2035,6 +2035,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             if (studentPaymentOrderList.size() > 0) {
             	
             	List<Long> paymentOrderIdList = studentPaymentOrderList.stream().map(t -> t.getId()).collect(Collectors.toList());
+            	
+            	Long minPaymentOrderId = Collections.min(paymentCalenderIdList);
 
                 List<StudentPaymentOrderDetail> orderDetailList = studentPaymentOrderDetailDao.getWithIds(paymentOrderIdList);
 
@@ -2043,7 +2045,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     studentLastChange = subjectChangeDao.getStudentLastChange(userId, musicGroupId);
                 }
                 
-				if (studentLastChange != null) {
+				if (studentLastChange != null && minPaymentOrderId >= studentLastChange.getOriginalOrderId()) {
 					if (isRefundInstrumentFee) {
 						amount = amount.add(studentLastChange.getChangeMusicalPrice());
 					}
@@ -2304,6 +2306,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (studentPaymentOrderList.size() > 0) {
         	
         	List<Long> paymentOrderIdList = studentPaymentOrderList.stream().map(t -> t.getId()).collect(Collectors.toList());
+        	
+        	Long minPaymentOrderId = Collections.min(paymentCalenderIdList);
 
             List<StudentPaymentOrderDetail> orderDetailList = studentPaymentOrderDetailDao.getWithIds(paymentOrderIdList);
 
@@ -2312,7 +2316,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 studentLastChange = subjectChangeDao.getStudentLastChange(userId, musicGroupId);
             }
             
-			if (studentLastChange != null && paymentOrderIdList.contains(studentLastChange.getOriginalOrderId().longValue())) {
+			if (studentLastChange != null && minPaymentOrderId >= studentLastChange.getOriginalOrderId()) {
 				if (isRefundInstrumentFee) {
 					amount = amount.add(studentLastChange.getChangeMusicalPrice());
 				}