Merge branch 'master' of http://git.dayaedu.com/yonge/mec

# Conflicts:
#	mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderDetailMapper.xml

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

@@ -182,6 +182,11 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
                 musicGroupSubjectGoodsGroup.setName("辅件");
                 musicGroupSubjectGoodsGroup.setType(GoodsType.ACCESSORIES);
             }
+            if(orderDetail.getKitGroupPurchaseType() != null){
+                String kitGroupPurchaseTypeJson = "{\""+orderDetail.getKitGroupPurchaseType().getCode()+"\":0}";
+                musicGroupSubjectGoodsGroup.setKitGroupPurchaseTypeJson(kitGroupPurchaseTypeJson);
+            }
+
             musicGroupSubjectGoodsGroup.setId(orderDetail.getId());
             musicGroupSubjectGoodsGroup.setGoodsIdList(orderDetail.getGoodsIdList());
             musicGroupSubjectGoodsGroup.setMusicGroupId(musicGroupId);

mec-biz/src/main/resources/config/mybatis/ClassGroupStudentMapperMapper.xml

@@ -158,6 +158,7 @@
             LEFT JOIN class_group_student_mapper cgsm ON cssp.user_id_=cgsm.user_id_ AND cssp.class_group_id_=cgsm.class_group_id_
         WHERE
             cssp.course_schedule_id_ =#{courseScheduleId}
+            AND su.id_ IS NOT NULL
             AND cgsm.status_!='QUIT'
     </select>