Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -177,11 +177,24 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @param userIdList
      * @return
      */
-    List<StudentRegistration> findStudentListByUserIdList(@Param("musicGroupId") String musicGroupId, @Param("userIdList") List<Integer> userIdList);
+    List<StudentRegistration> findStudentListByUserIdList(@Param("musicGroupId") String musicGroupId, @Param("userIdList") String userIdList);
 
     /**
      * @param ids
      * @return
      */
     int batchOpenPay(@Param("ids") String ids, @Param("paymentStatus") PaymentStatusEnum paymentStatus);
+
+    /**
+     * 乐团添加学员
+     * @param studentRegistration
+     */
+    void insertBasic(StudentRegistration studentRegistration);
+
+    /**
+     * 获取乐团已缴费学员列表
+     * @param musicGroupId
+     * @return
+     */
+    List<StudentRegistration> queryStudentByMusicGroupId(String musicGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -180,4 +180,10 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @return
 	 */
 	List<ImGroupMember> queryMusicGroupTeachers(String musicGroupId);
+
+	/**
+	 * 乐团确认成立
+	 * @param musicGroupId
+	 */
+    void musicGroupFound(String musicGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentRegistrationService.java

@@ -202,4 +202,10 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
 	 */
 	int openPayment(String ids);
 
+	/**
+	 * 根据乐团编号获取已缴费学员列表
+	 * @param musicGroupId
+	 * @return
+	 */
+	List<StudentRegistration> queryStudentByMusicGroupId(String musicGroupId);
 }

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

@@ -184,7 +184,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if(musicCardDto != null){
             musicCardDto.setMusicGroupNum(musicGroupDao.countUserMusicGroups(userId));
             musicCardDto.setVipClassNum(musicGroupDao.countCourseByType(userId, ClassGroupTypeEnum.VIP));
-            return musicGroupDao.queryPersonalMusicGroups(userId);
+            return musicCardDto;
         }
         return new MusicCardDto();
     }
@@ -701,4 +701,17 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         return groupMembers;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void musicGroupFound(String musicGroupId) {
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+        musicGroup.setStatus(MusicGroupStatusEnum.PREPARE);
+        musicGroup.setUpdateTime(new Date());
+        musicGroupDao.update(musicGroup);
+        //给家长发送乐团基础训练课短信
+        //获取所有乐团学员列表
+        List<StudentRegistration> students = studentRegistrationService.queryStudentByMusicGroupId(musicGroupId);
+//        sysMessageService.sendMessage(MessageSender.YIMEI,);
+    }
 }

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

@@ -389,6 +389,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Integer insertStudent(StudentRegistration studentRegistration) throws Exception {
         StudentRegistration phoneAndMusicGroupId = studentRegistrationDao.getByPhoneAndMusicGroupId(studentRegistration.getMusicGroupId(), studentRegistration.getParentsPhone());
         if (phoneAndMusicGroupId != null) {
@@ -421,8 +422,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 userId = sysUser.getId();
             }
             studentRegistration.setUserId(userId);
+            studentRegistration.setPaymentStatus(PaymentStatusEnum.YES);
+            studentRegistration.setMusicGroupStatus(ClassGroupStudentStatusEnum.NORMAL);
             //学生报名表
-            studentRegistrationDao.insert(studentRegistration);
+            studentRegistrationDao.insertBasic(studentRegistration);
             //增加报名学生数
             musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId(),1);
             if (studentRegistration.getClassGroupId() != null) {
@@ -482,6 +485,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public StudentPaymentOrder updateApplyOrder(StudentPaymentOrder studentPaymentOrder) {
         //更新订单状态
         studentPaymentOrderService.update(studentPaymentOrder);
@@ -558,11 +562,16 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     public List<StudentRegistration> findStudentListByUserIdList(String musicGroupId, List<Integer> userIdList) {
-        return studentRegistrationDao.findStudentListByUserIdList(musicGroupId, userIdList);
+        return studentRegistrationDao.findStudentListByUserIdList(musicGroupId, StringUtils.join(userIdList,","));
     }
 
     @Override
     public int openPayment(String ids) {
         return studentRegistrationDao.batchOpenPay(ids, PaymentStatusEnum.OPEN);
     }
+
+    @Override
+    public List<StudentRegistration> queryStudentByMusicGroupId(String musicGroupId) {
+        return studentRegistrationDao.queryStudentByMusicGroupId(musicGroupId);
+    }
 }

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

@@ -405,13 +405,21 @@
             #{item.remark},now(),now(),#{item.parentsName},#{item.parentsCompany},#{item.paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.subjectId},#{item.musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
         </foreach>
     </insert>
+    <insert id="insertBasic" parameterType="com.ym.mec.biz.dal.entity.StudentRegistration">
+        INSERT INTO student_registration
+        (parents_phone_,user_id_,name_,music_group_id_,current_grade_,current_class_,subject_id_,
+        create_time_,update_time_,parents_name_,payment_status_,actual_subject_id_,music_group_status_)
+        VALUES (#{parentsPhone},#{userId},#{name},#{musicGroupId},#{currentGrade},#{currentClass},#{subjectId},
+            now(),now(),#{parentsName},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectId},
+            #{musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+    </insert>
 
     <!-- 查询乐团userIdList的学生 -->
     <select id="findStudentListByUserIdList" resultMap="StudentRegistration">
-        SELECT * FROM student_registration WHERE music_group_id_ = #{musicGroupId} AND user_id_ IN
-        <foreach collection="userIdList" item="userId" index="index" open="(" close=")" separator=",">
-            #{userId}
-        </foreach>
+        SELECT * FROM student_registration WHERE music_group_id_ = #{musicGroupId} AND FIND_IN_SET(user_id_,#{userIdList})
+    </select>
+    <select id="queryStudentByMusicGroupId" resultMap="StudentRegistration">
+
     </select>
 
     <!-- 批量开启缴费 -->

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupController.java

@@ -98,4 +98,15 @@ public class MusicGroupController extends BaseController {
         return succeed(musicGroupService.openPay(musicGroupId,expireDate));
     }
 
+    @ApiOperation(value = "乐团确认成立")
+    @PostMapping("/found")
+    @PreAuthorize("@pcs.hasPermissions('musicGroup/found')")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")
+    })
+    public Object found(String musicGroupId) {
+        musicGroupService.musicGroupFound(musicGroupId);
+        return succeed();
+    }
+
 }