update

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

@@ -2309,7 +2309,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
 				// 退乐器费用
 				if (isRefundInstrumentFee && detail.getType() == OrderDetailTypeEnum.MUSICAL) {
-					if (studentLastChange.getOriginalOrderId() != null && studentLastChange.getOriginalOrderId() == detail.getPaymentOrderId().intValue()) {
+					if (studentLastChange != null && studentLastChange.getOriginalOrderId() != null && studentLastChange.getOriginalOrderId() == detail.getPaymentOrderId().intValue()) {
 						amount = amount.add(studentLastChange.getChangeMusicalPrice());
 					} else {
 						amount = amount.add(detail.getPrice()).subtract(detail.getRemitFee());
@@ -2319,7 +2319,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				// 退教辅费用
 				if (isRefundTeachingAssistantsFee
 						&& (detail.getType() == OrderDetailTypeEnum.ACCESSORIES || detail.getType() == OrderDetailTypeEnum.TEACHING)) {
-					if (studentLastChange.getOriginalOrderId() != null && studentLastChange.getOriginalOrderId() == detail.getPaymentOrderId().intValue()) {
+					if (studentLastChange != null && studentLastChange.getOriginalOrderId() != null && studentLastChange.getOriginalOrderId() == detail.getPaymentOrderId().intValue()) {
 						amount = amount.add(studentLastChange.getChangeAccessoriesPrice());
 					} else {
 						amount = amount.add(detail.getPrice()).subtract(detail.getRemitFee());