update

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

@@ -453,19 +453,13 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
 		}
 
         //查询乐器订单
-        StudentPaymentOrderDetail musicalOrderDetail =null, accessoriesOrderDetail = null;
+        Long paymentOrderId = null;
         		
         for(StudentPaymentOrderDetail detail : details){
-        	if(detail.getType() == OrderDetailTypeEnum.ACCESSORIES){
-        		if(accessoriesOrderDetail == null){
-        			accessoriesOrderDetail = detail;
-        		} else {
-        			if(accessoriesOrderDetail.getPaymentOrderId() < detail.getPaymentOrderId()){
-        				accessoriesOrderDetail = detail;
-        			}
+        	if(detail.getType() == OrderDetailTypeEnum.ACCESSORIES || detail.getType() == OrderDetailTypeEnum.MUSICAL){
+        		if(paymentOrderId == null || paymentOrderId < detail.getPaymentOrderId()){
+        			paymentOrderId = detail.getPaymentOrderId();
         		}
-        	}else if(detail.getType() == OrderDetailTypeEnum.MUSICAL){
-        		musicalOrderDetail = detail;
         	}
         }
 
@@ -479,11 +473,9 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         subjectChange.setOrganId(musicGroup.getOrganId());
         subjectChange.setCooperationOrganId(musicGroup.getCooperationOrganId());
         subjectChange.setMusicGroupId(musicGroupId);
-		if (musicalOrderDetail != null) {
-			subjectChange.setOrderId(musicalOrderDetail.getPaymentOrderId().intValue());
-		} else if (accessoriesOrderDetail != null) {
-			subjectChange.setOrderId(accessoriesOrderDetail.getPaymentOrderId().intValue());
-		}
+
+		subjectChange.setOrderId(paymentOrderId.intValue());
+		
         String accessoriesIds = "";
         BigDecimal accessoriesPrice = BigDecimal.ZERO;
         for (StudentPaymentOrderDetail detail : details) {