| 
					
				 | 
			
			
				@@ -11,10 +11,6 @@ import com.ym.mec.collectfee.service.CourseGroupInfoService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.collectfee.service.OrderService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.collectfee.service.SchoolService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.collectfee.utils.Constants; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import io.swagger.annotations.Api; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import io.swagger.annotations.ApiImplicitParam; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import io.swagger.annotations.ApiImplicitParams; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import io.swagger.annotations.ApiOperation; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.apache.commons.lang3.StringUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Autowired; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.dao.DuplicateKeyException; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -24,7 +20,7 @@ import java.util.Date; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 @RestController() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 @RequestMapping("user") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-@Api("用户服务") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//@Api("用户服务") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 public class UserController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Autowired 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -44,9 +40,9 @@ public class UserController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @GetMapping("/getUserDetailByPhone") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "根据乐团编号、用户手机,查询用户详情") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiImplicitParams({ @ApiImplicitParam(name = "phone", value = "用户手机", required = true, dataType = "String"), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            @ApiImplicitParam(name = "clazzId", value = "乐团编号", required = true, dataType = "Integer")}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiOperation(value = "根据乐团编号、用户手机,查询用户详情") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiImplicitParams({ @ApiImplicitParam(name = "phone", value = "用户手机", required = true, dataType = "String"), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            @ApiImplicitParam(name = "clazzId", value = "乐团编号", required = true, dataType = "Integer")}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Object getUserDetailByPhone(String phone,Integer clazzId){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(StringUtils.isEmpty(phone) || clazzId == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return failed(Constants.PARAM_VERIFY_ERROR_MSG); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -70,7 +66,7 @@ public class UserController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param applyInfo 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "学生报名乐团") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiOperation(value = "学生报名乐团") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @PostMapping("/userApply") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Object userApply(ApplyInfo applyInfo){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(applyInfo != null){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -96,10 +92,10 @@ public class UserController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param clazzId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "根据乐团编号获取乐团详情,查询乐团状态也通过该接口") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiOperation(value = "根据乐团编号获取乐团详情,查询乐团状态也通过该接口") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @PostMapping("/getClassDetail") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiImplicitParams({ @ApiImplicitParam(name = "clazzId", value = "乐团编号", required = true, dataType = "Integer"), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            @ApiImplicitParam(name = "schoolId", value = "学校编号", required = true, dataType = "Integer")}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiImplicitParams({ @ApiImplicitParam(name = "clazzId", value = "乐团编号", required = true, dataType = "Integer"), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            @ApiImplicitParam(name = "schoolId", value = "学校编号", required = true, dataType = "Integer")}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Object getSchoolDetail(Integer schoolId,Integer clazzId){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(schoolId == null || clazzId == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return failed(Constants.PARAM_VERIFY_ERROR_MSG); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -112,7 +108,7 @@ public class UserController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param stuId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "根据学生编号获取乐团注册页面数据") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiOperation(value = "根据学生编号获取乐团注册页面数据") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @PostMapping("/getUserRegisterViewDetail") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Object getUserRegisterViewDetail(Integer stuId){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(stuId == null){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -135,8 +131,8 @@ public class UserController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @PostMapping("/getCourses") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "根据乐团编号,获取乐团课程组列表") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiImplicitParams({ @ApiImplicitParam(name = "clazzId", value = "乐团编号", required = true, dataType = "Integer")}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiOperation(value = "根据乐团编号,获取乐团课程组列表") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiImplicitParams({ @ApiImplicitParam(name = "clazzId", value = "乐团编号", required = true, dataType = "Integer")}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Object getCourses(Integer clazzId){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(clazzId == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return failed(Constants.PARAM_VERIFY_ERROR_MSG); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -144,25 +140,25 @@ public class UserController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return succeed(courseGroupInfoService.getCourses(clazzId)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "获取所有乐团列表") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiOperation(value = "获取所有乐团列表") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @PostMapping("/getMusicTeams") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Object getMusicTeams(MusicTeamsPageInfo pageInfo){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return succeed(schoolService.queryPage(pageInfo)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "根据乐团编号,获取学员列表") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiOperation(value = "根据乐团编号,获取学员列表") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @PostMapping("/getMusicTeamStu") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Object getMusicTeamStu(StudentsQueryInfo queryInfo){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return succeed(applyInfoService.queryUserPage(queryInfo)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "获取所有分部列表") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiOperation(value = "获取所有分部列表") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @GetMapping("/getBranches") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Object getBranches(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return succeed(applyInfoService.getBranches()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "获取学校详情") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiOperation(value = "获取学校详情") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @GetMapping("/getSchool") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Object getSchool(Integer schoolId){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(schoolId == null){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -185,7 +181,7 @@ public class UserController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 修改乐团信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "修改乐团信息") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiOperation(value = "修改乐团信息") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @PostMapping("/updateClass") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Object updateClass(School school){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         school.setUpdateTime(new Date()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -197,7 +193,7 @@ public class UserController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 开启乐团缴费功能 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "开启乐团缴费功能") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiOperation(value = "开启乐团缴费功能") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @PostMapping("/openClassPay") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Object openClassPay(Integer id){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(id == null){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -212,7 +208,7 @@ public class UserController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 修改学生信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "修改学生信息") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiOperation(value = "修改学生信息") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @PostMapping("/updateUser") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Object updateUser(@ModelAttribute ApplyInfo applyInfo){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         applyInfo.setUpdateTime(new Date()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -224,7 +220,7 @@ public class UserController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 修改学生信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "批量调剂学员专业") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiOperation(value = "批量调剂学员专业") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @PostMapping("/updateUserSub") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Object updateUserSub(String userId,Integer subId,Integer courseId){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(StringUtils.isEmpty(userId) || subId == null || courseId == null){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -234,9 +230,9 @@ public class UserController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return succeed("修改成功"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "学员课程班查询,本接口用于查询指定学员报名的课程班(小课或乐团)列表") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiOperation(value = "学员课程班查询,本接口用于查询指定学员报名的课程班(小课或乐团)列表") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @PostMapping("/queryUserCourse") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer")}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer")}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Object queryUserCourse(Integer userId){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(userId == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return failed(Constants.PARAM_VERIFY_ERROR_MSG); 
			 |