Merge remote-tracking branch 'origin/master'

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

@@ -30,6 +30,7 @@ import com.ym.mec.biz.dal.enums.TeachTypeEnum;
 import com.ym.mec.biz.service.TeacherDefaultMusicGroupSalaryService;
 import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.date.DateUtil;
 
@@ -132,7 +133,14 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 									String salaryRuleJson = tdms.getSalaryRuleJson();
 									if (StringUtils.isNotBlank(salaryRuleJson)) {
 										JSONObject obj = JSON.parseObject(salaryRuleJson);
-										ts.setExpectSalary(new BigDecimal(obj.getDouble(classGroupStudentNumMap.get(ts.getClassGroupId()) + "")));
+										if(obj == null){
+											throw new BizException("课酬设置不完整");
+										}
+										Integer studentNum = classGroupStudentNumMap.get(ts.getClassGroupId());
+										if(studentNum == null){
+											studentNum = 1;
+										}
+										ts.setExpectSalary(new BigDecimal(obj.getDouble(studentNum + "")));
 										list.add(ts);
 									}
 									

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

@@ -246,7 +246,7 @@
         SELECT cssp.user_id_,
         SUM(case when (cs.group_type_ = 'VIP' AND cs.teach_mode_='ONLINE') then 1 ELSE 0 END) vip_times_,
         SUM(case when (pg.type_='CHARGE') then 1 ELSE 0 END) buy_practice_times_,
-        SUM(case when (pg.type_='MUSIC_NETWORK') then 1 ELSE 0 END) music_netWork_times_
+        SUM(case when (cs.type_='MUSIC_NETWORK') then 1 ELSE 0 END) music_netWork_times_
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         LEFT JOIN practice_group pg ON pg.`id_` = cs.`music_group_id_` AND cs.`group_type_` = 'PRACTICE'
@@ -272,7 +272,7 @@
         SELECT cssp.user_id_,
         SUM(case when (cs.group_type_ = 'VIP' AND cs.teach_mode_='ONLINE') then 1 ELSE 0 END) vip_times_,
         SUM(case when (pg.type_='CHARGE') then 1 ELSE 0 END) buy_practice_times_,
-        SUM(case when (pg.type_='MUSIC_NETWORK') then 1 ELSE 0 END) music_netWork_times_
+        SUM(case when (cs.type_='MUSIC_NETWORK') then 1 ELSE 0 END) music_netWork_times_
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         LEFT JOIN practice_group pg ON pg.`id_` = cs.`music_group_id_` AND cs.`group_type_` = 'PRACTICE'