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

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

@@ -704,11 +704,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                     maintenanceGoodsId = goodsGroup.getGoodsIdList();
                 }
                 
-                if(goodsGroup.getOrganShareProfit() != null){
+                if(goodsGroup.getOrganShareProfit() != null && goodsGroup.getKitGroupPurchaseType() == KitGroupPurchaseTypeEnum.GROUP){
                 	organShareProfit = organShareProfit.add(goodsGroup.getOrganShareProfit());
                 }
             }
-            
             //分部分润
             if(organShareProfit.compareTo(BigDecimal.ZERO) > 0) {
             	StudentPaymentOrderDetail spod = new StudentPaymentOrderDetail();