Merge branch 'musicgroup_0806'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentInstrumentServiceImpl.java

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

@@ -381,10 +381,13 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
 
     @Override
     public Boolean subjectChangeUpdateInstrument(SubjectChange subjectChange) {
+        StudentInstrument studentInstrument = null;
+    	
+		if (subjectChange.getOriginalOrderId() != null) {
+			studentInstrument = studentInstrumentDao.getByOrderId(subjectChange.getOriginalOrderId().longValue());
+		}
         
-    	StudentInstrument studentInstrument = studentInstrumentDao.getByOrderId(subjectChange.getOriginalOrderId().longValue());
-        
-        if (subjectChange == null || subjectChange.getChangeMusical() == null ||
+		if (subjectChange == null || subjectChange.getChangeMusical() == null ||
                 KitGroupPurchaseTypeEnum.OWNED.equals(subjectChange.getKitGroupPurchaseType())) {
         	
         	if(studentInstrument != null){
@@ -399,7 +402,9 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
             studentInstrument = new StudentInstrument();
             studentInstrument.setStudentId(subjectChange.getStudentId());
             studentInstrument.setOrganId(subjectChange.getOrganId());
-            studentInstrument.setOrderId(subjectChange.getOriginalOrderId().longValue());
+            if (subjectChange.getOriginalOrderId() != null) {
+            	studentInstrument.setOrderId(subjectChange.getOriginalOrderId().longValue());
+            }
             studentInstrument.setStatus(0);
         }
         studentInstrument.setChangeOrderId(subjectChange.getOrderId().longValue());

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

@@ -578,7 +578,9 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
             if (StringUtils.isNotBlank(goodsIds)) {
                 List<Integer> goodsIdList = Arrays.stream(goodsIds.split(",")).map(Integer::parseInt).collect(Collectors.toList());
                 //退原订单商品
-                sellOrderService.refundByOrderId(subjectChange.getOriginalOrderId().longValue(), false);
+                if(subjectChange.getOriginalOrderId() != null){
+                	sellOrderService.refundByOrderId(subjectChange.getOriginalOrderId().longValue(), false);
+                }
                 //添加新订单
                 this.addSellOrder(studentPaymentOrder.getId(), subjectChange.getMusicGroupId(), goodsIdList, studentPaymentOrder.getExpectAmount(), studentPaymentOrder.getBalancePaymentAmount(), subjectChange.getKitGroupPurchaseType());
             }