update

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

@@ -456,11 +456,9 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         Long paymentOrderId = null;
         		
         for(StudentPaymentOrderDetail detail : details){
-        	if(detail.getType() == OrderDetailTypeEnum.ACCESSORIES || detail.getType() == OrderDetailTypeEnum.MUSICAL){
-        		if(paymentOrderId == null || paymentOrderId < detail.getPaymentOrderId()){
-        			paymentOrderId = detail.getPaymentOrderId();
-        		}
-        	}
+        	if(paymentOrderId == null || paymentOrderId < detail.getPaymentOrderId()){
+    			paymentOrderId = detail.getPaymentOrderId();
+    		}
         }
 
 		Set<Integer> refundSellOrderGoodsIds = new HashSet<Integer>();
@@ -474,7 +472,9 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         subjectChange.setCooperationOrganId(musicGroup.getCooperationOrganId());
         subjectChange.setMusicGroupId(musicGroupId);
 
-		subjectChange.setOrderId(paymentOrderId.intValue());
+        if(paymentOrderId != null){
+        	subjectChange.setOrderId(paymentOrderId.intValue());
+        }
 		
         String accessoriesIds = "";
         BigDecimal accessoriesPrice = BigDecimal.ZERO;