Merge remote-tracking branch 'origin/master_saas' into master_saas

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/page/ClassGroupQueryInfo.java

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ClassGroupQueryInfo.java

@@ -26,6 +26,9 @@ public class ClassGroupQueryInfo extends EducationBaseQueryInfo {
     @ApiModelProperty(value = "少于3人的线上基础技能班，大于0。异常传true、提醒传false")
     private Boolean lessThenThreeHighOnline;
 
+    @ApiModelProperty(value = "主教老师编号", required = false)
+    private Integer mainTeacherUserId;
+
 	public Boolean getLessThenThreeHighOnline() {
 		return lessThenThreeHighOnline;
 	}

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

@@ -347,11 +347,11 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         	for(String id : subjectChange.getChangeAccessories().split(",")){
         		changeGoodsList.add(id);
         	}
-        	
-        	if(subjectChange.getChangeMusical() != subjectChange.getOriginalMusical()){
-        		changeGoodsList.add(subjectChange.getChangeMusical()+"");
-        	}
         }
+    	
+    	if(subjectChange.getChangeMusical() != subjectChange.getOriginalMusical()){
+    		changeGoodsList.add(subjectChange.getChangeMusical()+"");
+    	}
         
         if(changeGoodsList.size() > 0){
             String goodsIdsStr = changeGoodsList.stream().map(t -> t.toString()).collect(Collectors.joining(","));
@@ -1009,7 +1009,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                 List<SellOrder> sellOrders = this.addSellOrder(studentPaymentOrder,subjectChange.getMusicGroupId(),
                         goodsIdList,
                         subjectChange.getKitGroupPurchaseType());
-                if (sellOrders != null && sellOrders.size() > 0) {
+                /*if (sellOrders != null && sellOrders.size() > 0) {
                     SubjectChange change = subjectChangeDao.get(subjectChange.getId());
                     BigDecimal instrumentAmount = sellOrders.stream().filter(e -> e.getType() == SellTypeEnum.INSTRUMENT).map(e -> e.getExpectAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
                     BigDecimal accessoriesAmount = sellOrders.stream().filter(e -> e.getType() == SellTypeEnum.ACCESSORIES).map(e -> e.getExpectAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -1017,7 +1017,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                     change.setChangeAccessoriesPrice(accessoriesAmount.add(change.getOriginalAccessoriesPrice()));
                     change.setSellAmount(instrumentAmount.add(accessoriesAmount));
                     subjectChangeDao.update(change);
-                }
+                }*/
             }
             
             //更新学生声部