Merge remote-tracking branch 'origin/master'

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

@@ -15,6 +15,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -27,14 +28,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.entity.SysUserRole;
-import com.ym.mec.biz.dal.dao.MusicGroupDao;
-import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
-import com.ym.mec.biz.dal.dao.MusicGroupSubjectPlanDao;
-import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
-import com.ym.mec.biz.dal.dao.SubjectDao;
-import com.ym.mec.biz.dal.dao.SysConfigDao;
-import com.ym.mec.biz.dal.dao.SysUserCashAccountDao;
-import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.StudentAddDto;
 import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
 import com.ym.mec.biz.dal.dto.StudentFeeDetailDto;
@@ -112,6 +105,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Autowired
     private SysUserCashAccountDao sysUserCashAccountDao;
     @Autowired
+    private StudentDao studentDao;
+    @Autowired
     private ContractService contractService;
     @Autowired
     private ImFeignService imFeignService;
@@ -534,6 +529,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         /*if(studentAddDto.getSignClassId() == null && studentAddDto.getMixClassId() == null){
             throw new BizException("参数校验失败: 单技班或合奏班必填一项");
         }*/
+        Date date = new Date();
         String musicGroupId = studentRegistration.getMusicGroupId();
 
         StudentRegistration phoneAndMusicGroupId = studentRegistrationDao.getByPhoneAndMusicGroupId(musicGroupId, studentRegistration.getParentsPhone());
@@ -556,6 +552,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 sysUser.setBirthdate(studentRegistration.getBirthdate());
                 teacherDao.addSysUser(sysUser);
                 userId = sysUser.getId();
+                studentDao.insert(new Student(userId,studentRegistration.getSubjectId().toString()));
                 //添加用户现金账户
                 sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
                 //添加用户电子签章账户
@@ -575,6 +572,23 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 sysUser.setBirthdate(studentRegistration.getBirthdate());
                 teacherDao.updateUser(sysUser);
                 userId = sysUser.getId();
+                Student student = studentDao.get(userId);
+                if(student == null){
+                    studentDao.insert(new Student(userId,studentRegistration.getSubjectId().toString()));
+                }else if(StringUtils.isEmpty(student.getSubjectIdList())){
+                    student.setSubjectIdList(studentRegistration.getSubjectId().toString());
+                    student.setUpdateTime(date);
+                    studentDao.update(student);
+                }else if(StringUtils.isNotEmpty(student.getSubjectIdList())){
+                    String[] split = student.getSubjectIdList().split(",");
+                    List<String> list = new ArrayList<>(Arrays.asList(split));
+                    if(!list.contains(studentRegistration.getSubjectId())){
+                        list.add(studentRegistration.getSubjectId().toString());
+                        student.setSubjectIdList(StringUtils.join(list,","));
+                        student.setUpdateTime(date);
+                        studentDao.update(student);
+                    }
+                }
             }
             studentRegistration.setActualSubjectId(studentRegistration.getSubjectId());
             studentRegistration.setUserId(userId);
@@ -590,7 +604,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             musicGroupSubjectPlanService.addApplyStudentNum(musicGroupId, studentRegistration.getSubjectId(), 1);
             //添加班级关联
             addStudents(studentAddDto, userId);
-            Date date = new Date();
             //保存乐团学生费用表
             if (studentAddDto.getCourseFee() == null) {
                 MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(musicGroupId, studentRegistration.getActualSubjectId());