Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/AuthenticationFailureListener.java

@@ -50,6 +50,7 @@ public class AuthenticationFailureListener implements ApplicationListener<Authen
                 userLogin = new SysUserLogin();
                 userLogin.setUserId(sysUser.getId());
                 userLogin.setFailCount(0);
+                userLogin.setLoginCount(1);
                 userLogin.setLastLoginTime(date);
                 userLogin.setLastLoginIp(hashMap.get("remoteAddress"));
                 sysUserLoginService.insert(userLogin);

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserDao.java

@@ -1,10 +1,8 @@
 package com.ym.mec.auth.dal.dao;
 
-import com.ym.mec.auth.api.entity.SysMenu;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImUserModel;
-import com.ym.mec.common.page.PageInfo;
 import org.apache.ibatis.annotations.Param;
 
 public interface SysUserDao extends BaseDAO<Integer, SysUser> {

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysUserService.java

@@ -62,4 +62,10 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * @return
 	 */
 	ImUserModel getBasic(Integer userId);
+
+	/**
+	 * 修改用户基本信息
+	 * @param sysUser
+	 */
+    void updateBaseInfo(SysUser sysUser);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -1,24 +1,23 @@
 package com.ym.mec.auth.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
-import com.ym.mec.im.ImFeignService;
-import com.ym.mec.auth.api.enums.YesOrNoEnum;
-import com.ym.mec.common.entity.ImResult;
-import com.ym.mec.common.entity.ImUserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.ym.mec.auth.api.dto.SysUserInfo;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import com.ym.mec.auth.dal.dao.SysUserDao;
 import com.ym.mec.auth.service.SysRoleMenuService;
 import com.ym.mec.auth.service.SysUserRoleService;
 import com.ym.mec.auth.service.SysUserService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.entity.ImResult;
+import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.im.ImFeignService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implements SysUserService {
@@ -108,7 +107,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 			case TEACHER:
 
 		}
-		ImResult imResult = (ImResult)imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getUsername(), sysUser.getAvatar()));
+		ImResult imResult = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getUsername(), sysUser.getAvatar()));
 		sysUser.setImToken(imResult.getToken());
 		sysUserDao.update(sysUser);
 		return sysUser.getId();
@@ -119,4 +118,10 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		return sysUserDao.getBasic(userId);
 	}
 
+	@Override
+	public void updateBaseInfo(SysUser sysUser) {
+		sysUserDao.update(sysUser);
+		imFeignService.register(new ImUserModel(sysUser.getId().toString(),sysUser.getUsername(),sysUser.getAvatar()));
+	}
+
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -97,7 +97,9 @@ public class UserController extends BaseController {
 			return failed("用户不存在");
 		}
 		password = new BCryptPasswordEncoder().encode(password);
-		sysUserService.updatePassword(mobile, password);
+		sysUser.setPassword(password);
+		sysUser.setUpdateTime(new Date());
+		sysUserService.update(sysUser);
 		return succeed();
 	}
 
@@ -115,7 +117,10 @@ public class UserController extends BaseController {
 			return failed("用户不存在");
 		}
 		if (smsCodeService.verifyValidCode(mobile, authCode)) {
-			sysUserService.updatePassword(mobile, new BCryptPasswordEncoder().encode(newPassword));
+			String password = new BCryptPasswordEncoder().encode(newPassword);
+			sysUser.setPassword(password);
+			sysUser.setUpdateTime(new Date());
+			sysUserService.update(sysUser);
 			return succeed();
 		} else {
 			return failed("验证码错误");
@@ -123,7 +128,6 @@ public class UserController extends BaseController {
 	}
 
 	@ApiOperation(value = "修改用户")
-    @PreAuthorize("@pcs.hasPermissions('user/update')")
 	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 	public Object update(SysUser sysUser) {
 		AuthUser user = SecurityUtils.getUser();
@@ -131,7 +135,7 @@ public class UserController extends BaseController {
 			Date date = new Date();
 			sysUser.setId(user.getUserId());
 			sysUser.setUpdateTime(date);
-			sysUserService.update(sysUser);
+			sysUserService.updateBaseInfo(sysUser);
 			return succeed();
 		}
 		return failed();

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -125,6 +125,9 @@
             <if test="idCardNo != null">
                 id_card_no_ = #{idCardNo},
             </if>
+            <if test="password != null">
+                password_ = #{password},
+            </if>
             <if test="wechatId != null">
                 wechat_id_ = #{wechatId},
             </if>

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
 import com.ym.mec.biz.dal.dto.StudentFeeDetailDto;
 import com.ym.mec.biz.dal.dto.StudentFeeDto;
 import com.ym.mec.biz.dal.dto.StudentInfo;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
 import com.ym.mec.common.dal.BaseDAO;
@@ -64,7 +65,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @param musicGroupId
      * @return
      */
-    List<Map<Integer, Long>> getNoClassStuCountBySubjectId(@Param("musicGroupId") String musicGroupId);
+     List<MusicGroupSubjectPlan> getNoClassStuCountByMusicGroupId(@Param("musicGroupId") String musicGroupId);
 
     /**
      * 根据乐团id和user_id 更新

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

@@ -1,10 +1,7 @@
 package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dto.BasicUserDto;
-import com.ym.mec.biz.dal.dto.MusicGroupTeacherAttendanceDto;
-import com.ym.mec.biz.dal.dto.MusicGroupTeachersDto;
-import com.ym.mec.biz.dal.dto.TeacherCloseDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
@@ -136,4 +133,18 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @return
      */
     int countTeacherAttendance(Map<String, Object> params);
+
+    /**
+     * 获取乐团学员报名列表
+     * @param params
+     * @return
+     */
+    List<musicGroupStudentApplyDto> queryMusicGroupStudentApply(Map<String, Object> params);
+
+    /**
+     * COUNT乐团学员报名列表
+     * @param params
+     * @return
+     */
+    int countMusicGroupStudentApply(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/musicGroupStudentApplyDto.java

@@ -0,0 +1,96 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class musicGroupStudentApplyDto {
+    private Integer userId;
+
+    private String name;
+
+    private String currentGrade;
+
+    private String currentClass;
+
+    private String subjectName;
+
+    private Integer subjectId;
+
+    private String remark;
+
+    private BigDecimal paymentAmount;
+
+    private Date payTime;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCurrentGrade() {
+        return currentGrade;
+    }
+
+    public void setCurrentGrade(String currentGrade) {
+        this.currentGrade = currentGrade;
+    }
+
+    public String getCurrentClass() {
+        return currentClass;
+    }
+
+    public void setCurrentClass(String currentClass) {
+        this.currentClass = currentClass;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public BigDecimal getPaymentAmount() {
+        return paymentAmount;
+    }
+
+    public void setPaymentAmount(BigDecimal paymentAmount) {
+        this.paymentAmount = paymentAmount;
+    }
+
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/queryMusicGroupStudentQueryInfo.java

@@ -0,0 +1,28 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+public class queryMusicGroupStudentQueryInfo extends QueryInfo {
+    private String musicGroupId;
+
+    private Integer subjectId;
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+}

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

@@ -7,9 +7,12 @@ public interface ContractService {
 	/**
 	 * 用户注册
 	 * @param userId
+	 * @param realName
+	 * @param idCardNo
+	 * @param mobileNo
 	 * @return
 	 */
-	SysUserTsign register(Integer userId);
+	SysUserTsign register(Integer userId, String realName, String idCardNo, String mobileNo);
 
 	/**
 	 * 传递注册协议至第三方公证平台

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

@@ -9,10 +9,7 @@ import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
 import com.ym.mec.biz.dal.dto.StudentFeeDetailDto;
 import com.ym.mec.biz.dal.dto.StudentFeeDto;
 import com.ym.mec.biz.dal.dto.StudentInfo;
-import com.ym.mec.biz.dal.entity.Goods;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.page.StudentRegistrationQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
@@ -61,7 +58,7 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
 	 * @param musicGroupId
 	 * @return
 	 */
-	List<Map<Integer,Long>> getNoClassStuCountBySubjectId(String musicGroupId);
+	List<MusicGroupSubjectPlan> getNoClassStuCountByMusicGroupId(String musicGroupId);
 
 	/**
 	 * 根据user_id 和 乐团id更新

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

@@ -1,6 +1,9 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dto.musicGroupStudentApplyDto;
 import com.ym.mec.biz.dal.entity.SysUserBankCard;
+import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.List;

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

@@ -1,14 +1,8 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.BasicUserDto;
-import com.ym.mec.biz.dal.dto.MusicGroupTeacherAttendanceDto;
-import com.ym.mec.biz.dal.dto.MusicGroupTeachersDto;
-import com.ym.mec.biz.dal.dto.TeacherCloseDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.Teacher;
-import com.ym.mec.biz.dal.page.MusicGroupTeacherAttendanceQueryInfo;
-import com.ym.mec.biz.dal.page.MusicGroupTeachersQueryInfo;
-import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
-import com.ym.mec.biz.dal.page.TeacherQueryInfo;
+import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
@@ -120,4 +114,11 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @return
      */
     PageInfo<MusicGroupTeacherAttendanceDto> queryTeacherAttendance(MusicGroupTeacherAttendanceQueryInfo queryInfo);
+
+    /**
+     * 获取乐团学员的报名列表
+     * @param queryInfo
+     * @return
+     */
+    PageInfo<musicGroupStudentApplyDto> queryMusicGroupStudentApply(queryMusicGroupStudentQueryInfo queryInfo);
 }

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

@@ -1,89 +1,16 @@
 package com.ym.mec.biz.service.impl;
 
-import java.math.BigDecimal;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.ClassGroupDao;
-import com.ym.mec.biz.dal.dao.ClassGroupRelationDao;
-import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
-import com.ym.mec.biz.dal.dao.ClassGroupTeacherMapperDao;
-import com.ym.mec.biz.dal.dao.CourseScheduleDao;
-import com.ym.mec.biz.dal.dao.CourseScheduleStudentPaymentDao;
-import com.ym.mec.biz.dal.dao.CourseScheduleTeacherSalaryDao;
-import com.ym.mec.biz.dal.dao.MusicGroupDao;
-import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
-import com.ym.mec.biz.dal.dao.SchoolDao;
-import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
-import com.ym.mec.biz.dal.dao.TeacherAttendanceDao;
-import com.ym.mec.biz.dal.dao.VipGroupActivityDao;
-import com.ym.mec.biz.dal.dao.VipGroupDao;
-import com.ym.mec.biz.dal.dto.ClassGroup4MixDto;
-import com.ym.mec.biz.dal.dto.ClassGroupTeachersDto;
-import com.ym.mec.biz.dal.dto.CourseListDto;
-import com.ym.mec.biz.dal.dto.CourseTimeDto;
-import com.ym.mec.biz.dal.dto.HighClassGroupDto;
-import com.ym.mec.biz.dal.dto.MusicGroupClassGroupDto;
-import com.ym.mec.biz.dal.dto.MusicGroupCourseScheduleDto;
-import com.ym.mec.biz.dal.dto.StudentAttendanceViewDto;
-import com.ym.mec.biz.dal.dto.StudentPayInfoDto;
-import com.ym.mec.biz.dal.dto.TeacherClassGroupDto;
-import com.ym.mec.biz.dal.dto.TeacherClassHeadInfo;
-import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
-import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
-import com.ym.mec.biz.dal.entity.ClassGroup;
-import com.ym.mec.biz.dal.entity.ClassGroupRelation;
-import com.ym.mec.biz.dal.entity.ClassGroupStudentMapper;
-import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
-import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.entity.CourseScheduleStudentPayment;
-import com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary;
-import com.ym.mec.biz.dal.entity.MusicGroup;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
-import com.ym.mec.biz.dal.entity.Subject;
-import com.ym.mec.biz.dal.entity.TeacherDefaultMusicGroupSalary;
-import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
-import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.biz.dal.enums.CourseStatusEnum;
-import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
-import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
-import com.ym.mec.biz.dal.enums.TeachModeEnum;
-import com.ym.mec.biz.dal.enums.TeachTypeEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
 import com.ym.mec.biz.dal.page.StudentPayLogQueryInfo;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.biz.dal.page.queryMusicGroupCourseScheduleQueryInfo;
-import com.ym.mec.biz.service.ClassGroupRelationService;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.ClassGroupTeacherMapperService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.SubjectService;
-import com.ym.mec.biz.service.TeacherDefaultMusicGroupSalaryService;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupMember;
 import com.ym.mec.common.entity.ImGroupModel;
@@ -97,6 +24,18 @@ import com.ym.mec.jiari.JiaRiFeignService;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateConvertor;
 import com.ym.mec.util.date.DateUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.time.*;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup> implements ClassGroupService {
@@ -225,8 +164,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentList);
         ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);
         // 创建群组
-        imFeignService.groupCreate(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
-
+        imFeignService.groupCreate(new ImGroupModel(2,classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
         return classGroup;
     }
 
@@ -279,7 +217,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);
         // 创建群组
-        imFeignService.groupCreate(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+        imFeignService.groupCreate(new ImGroupModel(2,classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
         return classGroup;
     }
 
@@ -365,7 +303,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
             ImGroupMember[] imGroupMembers = {new ImGroupMember(classGroupTeacherMapper.getUserId().toString())};
             // 创建群组
-            imFeignService.groupCreate(new ImGroupModel(highClassGroup.getId().toString(), imGroupMembers, highClassGroup.getName()));
+            imFeignService.groupCreate(new ImGroupModel(2,highClassGroup.getId().toString(), imGroupMembers, highClassGroup.getName()));
         }
         return highClassGroupList;
     }

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

@@ -1,17 +1,16 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
 import com.ym.mec.biz.service.*;
+import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupMember;
 import com.ym.mec.common.entity.ImGroupModel;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
@@ -72,8 +71,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
         ImGroupMember[] imGroupMembers = {new ImGroupMember(userId.toString())};
         // 退出群组
-        imFeignService.groupQuit(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
-
+        imFeignService.groupQuit(new ImGroupModel(2,classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
         return true;
     }
 

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

@@ -73,7 +73,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 imGroupMemberList.add(new ImGroupMember(classGroupTeacherMapper.getUserId().toString()));
                 ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);
                 // 加入群组
-                imFeignService.groupJoin(new ImGroupModel(classGroupTeacherMapper.getClassGroupId().toString(), imGroupMembers, classGroup.getName()));
+                imFeignService.groupJoin(new ImGroupModel(2,classGroupTeacherMapper.getClassGroupId().toString(), imGroupMembers, classGroup.getName()));
             }
         }
 

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

@@ -87,17 +87,13 @@ public class ContractServiceImpl implements ContractService {
 	private DateFormat dateFormatOss = new SimpleDateFormat("yyyy/MM/dd");
 
 	@Override
-	public SysUserTsign register(Integer userId) {
+	public SysUserTsign register(Integer userId, String realName, String idCardNo, String mobileNo) {
 
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
 
-			SysUser user = sysUserFeignService.queryUserById(userId);
-			if (user == null) {
-				return null;
-			}
-			String accountId = eSealPlugin.createUserAccount(user.getRealName(), user.getIdCardNo(), user.getPhone());
+			String accountId = eSealPlugin.createUserAccount(realName, idCardNo, mobileNo);
 
 			if (StringUtils.isBlank(accountId)) {
 				throw new BizException("创建电子存证账户失败");
@@ -112,7 +108,7 @@ public class ContractServiceImpl implements ContractService {
 			sysUserTsign = new SysUserTsign(userId, accountId, sealData);
 
 			sysUserTsignService.insert(sysUserTsign);
-			
+
 			return sysUserTsign;
 		}
 
@@ -125,7 +121,11 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			sysUserTsign = register(userId);
+			SysUser user = sysUserFeignService.queryUserById(userId);
+			if(user == null){
+				throw new BizException("用户信息查询失败");
+			}
+			sysUserTsign = register(userId,user.getRealName(),user.getIdCardNo(),user.getPhone());
 		}
 
 		// 合成freemarker
@@ -209,7 +209,11 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			sysUserTsign = register(userId);
+			SysUser user = sysUserFeignService.queryUserById(userId);
+			if(user == null){
+				throw new BizException("用户信息查询失败");
+			}
+			sysUserTsign = register(userId,user.getRealName(),user.getIdCardNo(),user.getPhone());
 		}
 
 		// 合成freemarker
@@ -348,7 +352,11 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			sysUserTsign = register(userId);
+			SysUser user = sysUserFeignService.queryUserById(userId);
+			if(user == null){
+				throw new BizException("用户信息查询失败");
+			}
+			sysUserTsign = register(userId,user.getRealName(),user.getIdCardNo(),user.getPhone());
 		}
 
 		// 合成freemarker
@@ -465,7 +473,11 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			sysUserTsign = register(userId);
+			SysUser user = sysUserFeignService.queryUserById(userId);
+			if(user == null){
+				throw new BizException("用户信息查询失败");
+			}
+			sysUserTsign = register(userId,user.getRealName(),user.getIdCardNo(),user.getPhone());
 		}
 
 		// 合成freemarker
@@ -485,7 +497,7 @@ public class ContractServiceImpl implements ContractService {
 
 		// 查询参数信息
 		StudentInfo studentInfo = studentRegistrationService.queryStudentInfo(userId);
-		
+
 		int subjectId = studentInfo.getSubject().getId();
 
 		Subject subject = subjectService.get(subjectId);
@@ -495,8 +507,8 @@ public class ContractServiceImpl implements ContractService {
 
 		List<Goods> goodsList = studentPaymentOrderService.queryApplyGoodsList(musicGroupId, OrderDetailTypeEnum.MUSICAL);
 		params.put("goodsList", goodsList);
-		
-		MusicGroupSubjectPlan musicGroupSubjectPlan =musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
+
+		MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
 		if (musicGroupSubjectPlan == null) {
 			throw new BizException("声部课程费用设置找不到");
 		}
@@ -553,7 +565,7 @@ public class ContractServiceImpl implements ContractService {
 
 		// 查询参数信息
 		StudentInfo studentInfo = studentRegistrationService.queryStudentInfo(userId);
-		
+
 		int subjectId = studentInfo.getSubject().getId();
 
 		Subject subject = subjectService.get(subjectId);
@@ -563,8 +575,8 @@ public class ContractServiceImpl implements ContractService {
 
 		List<Goods> goodsList = studentPaymentOrderService.queryApplyGoodsList(musicGroupId, OrderDetailTypeEnum.MUSICAL);
 		params.put("goodsList", goodsList);
-		
-		MusicGroupSubjectPlan musicGroupSubjectPlan =musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
+
+		MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
 		if (musicGroupSubjectPlan == null) {
 			throw new BizException("声部课程费用设置找不到");
 		}

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

@@ -190,14 +190,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(Objects.isNull(classDate)){
 			throw new BizException("请选择上课日期!");
 		}
-
 		SysUser user = sysUserFeignService.queryUserInfo();
 		if(null==user){
 			throw new BizException("请登录");
 		}
 		SysConfig vip_appeal_days_range = sysConfigDao.findByParamName("vip_appeal_days_range");
-		Map<String,Object> result=new HashMap<>();
+		SysConfig advance_leave_hours = sysConfigDao.findByParamName("advance_leave_hours");
+		Map<String,Object> result=new HashMap<>(3);
 		result.put("vipAppealDaysRange",vip_appeal_days_range.getParanValue());
+		result.put("advanceLeaveHours",advance_leave_hours.getParanValue());
 		result.put("list",courseScheduleDao.getStudentCourseSchedulesWithDate(classDate,user.getId().longValue()));
 		return result;
 	}

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

@@ -5,6 +5,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
+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.EmployeeDto;
@@ -49,6 +50,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	private SysUserCashAccountDao sysUserCashAccountDao;
 	@Autowired
 	private ContractService contractService;
+	@Autowired
+	private SysConfigDao sysConfigDao;
 
 	@Override
 	public BaseDAO<Integer, Employee> getDAO() {
@@ -85,10 +88,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds());
 		//添加用户现金账户
 		sysUserCashAccountDao.insert(new SysUserCashAccount(employee.getId(),"CNY"));
-		//添加用户电子签章账户
-		contractService.register(employee.getId());
+		contractService.register(employee.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
 		ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(),
-				StringUtils.isEmpty(employee.getAvatar())?"https://daya-online.oss-cn-beijing.aliyuncs.com/201910/RgHwgKc.jpg":employee.getAvatar()));
+				StringUtils.isEmpty(employee.getAvatar())?sysConfigDao.findByParamName("user_default_head_url").getParanValue():employee.getAvatar()));
 		employee.setImToken(imResult.getToken());
 		employeeDao.update(employee);
 	}

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

@@ -20,7 +20,6 @@ import com.ym.mec.im.ImFeignService;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -165,13 +164,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (musicGroupSubjectGoodsGroups != null) {
             musicGroupSubjectGoodsGroupDao.batchInsert(musicGroupSubjectGoodsGroups,musicGroupId);
         }
-        // 新增聊天群
-        // ImGroupModel imGroupModel = new ImGroupModel(musicGroupId, musicGroup.getName());
         // 教务老师和运营主管加入群组
         ImGroupMember[] imGroupMembers = { new ImGroupMember(musicGroup.getTeamTeacherId().toString()),
                 new ImGroupMember(musicGroup.getEducationalTeacherId().toString()) };
         // 创建群组
-        imFeignService.groupCreate(new ImGroupModel(musicGroupId, imGroupMembers, musicGroup.getName()));
+        imFeignService.groupCreate(new ImGroupModel(1,musicGroupId, imGroupMembers, musicGroup.getName()));
         // 记录创建日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "提交建团申请", userId, ""));
         return musicGroupId;

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

@@ -47,11 +47,16 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     @Override
     public List<MusicGroupSubjectPlan> getMusicSubjectClassPlan(String musicGroupId) {
         List<MusicGroupSubjectPlan> musicSubjectClassPlans = musicGroupSubjectPlanDao.getMusicSubjectClassPlan(musicGroupId);
-        List<Map<Integer, Long>> noClassStuCountBySubjectIds = studentRegistrationService.getNoClassStuCountBySubjectId(musicGroupId);
-        Map<Integer, Long> map = MapUtil.convertMybatisMap(noClassStuCountBySubjectIds);
+        List<MusicGroupSubjectPlan> noClassStuCounts = studentRegistrationService.getNoClassStuCountByMusicGroupId(musicGroupId);
+
         for (MusicGroupSubjectPlan musicSubjectClassPlan : musicSubjectClassPlans) {
-            Long aLong = map.get(musicSubjectClassPlan.getSubjectId());
-            musicSubjectClassPlan.setNoClassStudentNum(aLong==null?0:aLong.intValue());
+            for (MusicGroupSubjectPlan noClassStuCount : noClassStuCounts) {
+                if (!noClassStuCount.getSubjectId().equals(musicSubjectClassPlan.getSubjectId())) continue;
+                musicSubjectClassPlan.setNoClassStudentNum(noClassStuCount.getNoClassStudentNum());
+            }
+            if (musicSubjectClassPlan.getNoClassStudentNum() == null) {
+                musicSubjectClassPlan.setNoClassStudentNum(0);
+            }
         }
         return musicSubjectClassPlans;
     }
@@ -106,7 +111,7 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     }
 
     @Override
-    public void addApplyStudentNum(String musicGroupId, Integer subjectId,int num) {
+    public void addApplyStudentNum(String musicGroupId, Integer subjectId, int num) {
         MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
         int applyNum = musicOneSubjectClassPlan.getApplyStudentNum() == null ? 0 : musicOneSubjectClassPlan.getApplyStudentNum();
         musicOneSubjectClassPlan.setApplyStudentNum(applyNum + num);

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

@@ -40,6 +40,9 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
     @Override
     public List<Goods> getMusicalList(String musicGroupId) {
         List<StudentPaymentOrderDetail> applyOrder = findApplyOrderSuccess(musicGroupId, DealStatusEnum.SUCCESS);
+        if(applyOrder == null){
+            return null;
+        }
         String goodsIdsStr = "";
         for (StudentPaymentOrderDetail studentPaymentOrderDetail : applyOrder) {
             if (studentPaymentOrderDetail.getGoodsIdList() != null && !studentPaymentOrderDetail.getGoodsIdList().isEmpty()) {

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

@@ -133,8 +133,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
-    public List<Map<Integer, Long>> getNoClassStuCountBySubjectId(String musicGroupId) {
-        return studentRegistrationDao.getNoClassStuCountBySubjectId(musicGroupId);
+    public List<MusicGroupSubjectPlan> getNoClassStuCountByMusicGroupId(String musicGroupId) {
+        return studentRegistrationDao.getNoClassStuCountByMusicGroupId(musicGroupId);
     }
 
     @Override
@@ -165,8 +165,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             userId = sysUser.getId();
             //添加用户现金账户
             sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
-            //添加用户电子签章账户
-            contractService.register(userId);
+			// 添加用户电子签章账户
+			contractService.register(userId, sysUser.getRealName(), sysUser.getIdCardNo(), sysUser.getPhone());
             //注册到融云
             ImResult register = imFeignService.register(new ImUserModel(userId.toString(), sysUser.getUsername(), sysUser.getAvatar()));
             sysUser.setImToken(register.getToken());
@@ -379,7 +379,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 //添加用户现金账户
                 sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
                 //添加用户电子签章账户
-                contractService.register(userId);
+                contractService.register(userId, sysUser.getRealName(), sysUser.getIdCardNo(), sysUser.getPhone());
                 //注册到融云
                 ImResult register = imFeignService.register(new ImUserModel(userId.toString(), sysUser.getUsername(), sysUser.getAvatar()));
                 sysUser.setImToken(register.getToken());

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

@@ -1,9 +1,12 @@
 package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.SysUserBankCardDao;
+import com.ym.mec.biz.dal.dto.musicGroupStudentApplyDto;
 import com.ym.mec.biz.dal.entity.SysUserBankCard;
+import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
 import com.ym.mec.biz.service.SysUserBankCardService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;

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

@@ -5,10 +5,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.dao.*;
-import com.ym.mec.biz.dal.dto.BasicUserDto;
-import com.ym.mec.biz.dal.dto.MusicGroupTeacherAttendanceDto;
-import com.ym.mec.biz.dal.dto.MusicGroupTeachersDto;
-import com.ym.mec.biz.dal.dto.TeacherCloseDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.School;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
@@ -16,6 +13,7 @@ import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.page.MusicGroupTeacherAttendanceQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherQueryInfo;
+import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
 import com.ym.mec.biz.service.ContractService;
 import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.common.dal.BaseDAO;
@@ -96,7 +94,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		//添加用户现金账户
 		sysUserCashAccountDao.insert(new SysUserCashAccount(teacher.getId(),"CNY"));
 		//添加用户电子签章账户
-		contractService.register(teacher.getId());
+		contractService.register(teacher.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
 		teacherDao.insert(teacher);
 		ImResult imResult = imFeignService.register(new ImUserModel(teacher.getId().toString(), teacher.getUsername(), teacher.getAvatar()));
 		if(imResult != null){
@@ -264,6 +262,26 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	}
 
 	@Override
+	public PageInfo<musicGroupStudentApplyDto> queryMusicGroupStudentApply(queryMusicGroupStudentQueryInfo queryInfo) {
+		PageInfo<musicGroupStudentApplyDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<>();
+		MapUtil.populateMap(params, queryInfo);
+
+		List<musicGroupStudentApplyDto> dataList = null;
+		int count = teacherDao.countMusicGroupStudentApply(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = teacherDao.queryMusicGroupStudentApply(params);
+		}
+		if (count == 0) {
+			dataList = new ArrayList<>();
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
+
+	@Override
 	public List<BasicUserDto> queryMusicGroupTeacher(String musicGroupId) {
 		if(Objects.isNull(musicGroupId)){
 			throw new BizException("请指定乐团");

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

@@ -215,7 +215,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		// 指导老师加入群组
 		ImGroupMember[] imGroupMembers = { new ImGroupMember(vipGroup.getVipGroupApplyBaseInfo().getUserId().toString())};
 		// 创建群组
-		imFeignService.groupCreate(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+		imFeignService.groupCreate(new ImGroupModel(2,classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
 
 		//创建班级老师关联记录
 		ClassGroupTeacherMapper classGroupTeacherMapper=new ClassGroupTeacherMapper();

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

@@ -50,10 +50,11 @@
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group
 		(id_,name_,organ_id_,school_id_,apply_expire_date_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_form_,create_time_,update_time_,status_,
-		bill_start_date_,improvent_classes_num_,enroll_classes_,payment_expire_date_,is_extra_class_,cooperation_organ_id_,enlightenment_course_time_,parent_meeting_time_,img_,director_user_id_)
+		bill_start_date_,improvent_classes_num_,enroll_classes_,payment_expire_date_,is_extra_class_,settlement_type_,cooperation_organ_id_,enlightenment_course_time_,parent_meeting_time_,img_,director_user_id_)
 		VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseForm},now(),now(),
 		#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{billStartDate},#{improventClassesNum},#{enrollClasses},#{paymentExpireDate},
-		#{isExtraClass, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime},#{img},#{directorUserId})
+		#{isExtraClass, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{settlementType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+		#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime},#{img},#{directorUserId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->

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

@@ -29,7 +29,7 @@
         <result column="payment_status_" property="paymentStatus"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="music_group_status_" property="musicGroupStatus"/>
-        <result column="class_group_name_" property="classGroupName" />
+        <result column="class_group_name_" property="classGroupName"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.StudentInfo" id="StudentInfo">
@@ -108,15 +108,21 @@
             <if test="currentClass!=null">#{currentClass},</if>
             <if test="subjectId!=null">#{subjectId},</if>
             <if test="actualSubjectId!=null">#{actualSubjectId},</if>
-            <if test="isAllowAdjust!=null">#{isAllowAdjust,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
-            <if test="kitPurchaseMethod!=null">#{kitPurchaseMethod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
+            <if test="isAllowAdjust!=null">#{isAllowAdjust,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="kitPurchaseMethod!=null">
+                #{kitPurchaseMethod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
             <if test="remark!=null">#{remark},</if>
             <if test="parentsName!=null">#{parentsName},</if>
             <if test="parentsPhone!=null">#{parentsPhone},</if>
             <if test="parentsCompany!=null">#{parentsCompany},</if>
-            <if test="paymentStatus!=null">#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
+            <if test="paymentStatus!=null">#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
             <if test="classGroupId!=null">#{classGroupId},</if>
-            <if test="musicGroupStatus!=null">#{musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
+            <if test="musicGroupStatus!=null">
+                #{musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
             <if test="createTime!=null">#{createTime},</if>
             <if test="updateTime!=null">#{updateTime},</if>
         </trim>
@@ -268,7 +274,8 @@
         </collection>
     </resultMap>
     <select id="queryFeeDetail" resultMap="queryFeeDetailMap">
-        SELECT spo.actual_amount_,spo.expect_amount_,spod.price_,GROUP_CONCAT(g.name_) goods_name_,MAX(g.type_) goods_type_
+        SELECT spo.actual_amount_,spo.expect_amount_,spod.price_,GROUP_CONCAT(g.name_) goods_name_,MAX(g.type_)
+        goods_type_
         FROM student_registration sr
         LEFT JOIN student_payment_order spo ON sr.music_group_id_ = spo.music_group_id_ AND spo.user_id_ = sr.user_id_
         LEFT JOIN student_payment_order_detail spod ON spod.payment_order_id_ = spo.id_
@@ -279,25 +286,21 @@
 
     <!-- 根据乐团和声部获取未分班的学生 -->
     <select id="getNoClassStuBySubjectId" resultMap="StudentRegistration">
-        SELECT sr.* FROM student_registration sr
-        WHERE sr.user_id_ NOT IN (
-        SELECT DISTINCT cgsm.user_id_ FROM class_group_student_mapper cgsm
-        LEFT JOIN class_group cg ON cg.id_ = cgsm.class_group_id_
-        WHERE cg.music_group_id_ = #{musicGroupId})
-        AND sr.music_group_id_ = #{musicGroupId}
+        SELECT * FROM student_registration
+        WHERE music_group_id_ = #{musicGroupId} AND payment_status_ = 2 AND class_group_id_=0
         <if test="actualSubjectId != null">
-            AND FIND_IN_SET(sr.actual_subject_id_,#{actualSubjectId})
+            AND FIND_IN_SET(actual_subject_id_,#{actualSubjectId})
         </if>
     </select>
 
+    <resultMap type="com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan" id="getNoClassStuCountByMusicGroupId">
+        <result column="actual_subject_id_" property="subjectId"/>
+        <result column="nums" property="noClassStudentNum"/>
+    </resultMap>
     <!-- 根据乐团和声部获取未分班人数 -->
-    <select id="getNoClassStuCountBySubjectId" resultType="map">
-        SELECT COUNT(DISTINCT sr.user_id_) `value`,sr.actual_subject_id_ `key` FROM student_registration sr
-        WHERE sr.user_id_ NOT IN (
-        SELECT DISTINCT cgsm.user_id_ FROM class_group_student_mapper cgsm
-        LEFT JOIN class_group cg ON cg.id_ = cgsm.class_group_id_
-        WHERE cg.music_group_id_ = #{musicGroupId})
-        AND sr.music_group_id_ = #{musicGroupId} GROUP BY sr.actual_subject_id_
+    <select id="getNoClassStuCountByMusicGroupId" resultMap="getNoClassStuCountByMusicGroupId">
+        SELECT actual_subject_id_ ,COUNT(*) nums FROM student_registration
+        WHERE music_group_id_ = #{musicGroupId} AND payment_status_=2 AND class_group_id_=0 GROUP BY actual_subject_id_;
     </select>
 
     <update id="updateByUserIdAndMusicGroupId" parameterType="com.ym.mec.biz.dal.entity.StudentRegistration">
@@ -307,7 +310,7 @@
 
     <update id="batchUpdateSubject">
         UPDATE student_registration SET actual_subject_id_ = #{subId},update_time_ = now()
-        WHERE user_id_ = #{userIds} AND payment_status_ = 0 AND music_group_id_ = #{musicGroupId}
+        WHERE user_id_ = #{userId} AND payment_status_ = 0 AND music_group_id_ = #{musicGroupId}
     </update>
 
     <select id="queryStudentInfo" resultMap="StudentInfo">
@@ -373,7 +376,7 @@
 
     <!-- 获取乐团声部下的学生 -->
     <select id="findMusicGroupStudent" resultMap="StudentRegistration">
-        SELECT sr.*,cg.name_ class_group_name_  FROM student_registration sr
+        SELECT sr.*,cg.name_ class_group_name_ FROM student_registration sr
         LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
         WHERE sr.music_group_id_ = #{musicGroupId}
         <if test="actualSubjectId != null and actualSubjectId !=''">
@@ -412,4 +415,5 @@
     <update id="batchOpenPay">
         UPDATE student_registration SET payment_status_ = #{paymentStatus},update_time_ = now()
         WHERE FIND_IN_SET(id_,#{ids}) AND payment_status_ = 0
-    </update></mapper>
+    </update>
+</mapper>

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

@@ -401,6 +401,35 @@
     <select id="queryNameById" resultType="java.lang.String">
         select real_name_ FROM sys_user s WHERE id_ = #{userId}
     </select>
+    <resultMap id="musicGroupStudentApplyDto" type="com.ym.mec.biz.dal.dto.musicGroupStudentApplyDto">
+
+    </resultMap>
+    <select id="queryMusicGroupStudentApply" resultType="com.ym.mec.biz.dal.dto.musicGroupStudentApplyDto">
+        SELECT sr.user_id_,su.username_,sr.current_class_,sr.current_grade_,s.name_ subject_name_,sr.remark_,
+        spo.actual_amount_,spo.pay_time_,sr.payment_status_
+        FROM student_registration sr
+        LEFT JOIN sys_user su ON sr.user_id_ = su.id_
+        LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
+        LEFT JOIN student_payment_order spo ON spo.user_id_ = sr.user_id_ AND spo.music_group_id_ = sr.music_group_id_
+        <include refid="queryMusicGroupStudentApplySql"/>
+        <include refid="global.limit"/>
+    </select>
+    <sql id="queryMusicGroupStudentApplySql">
+        <where>
+            sr.music_group_id_ = #{musicGroupId} AND (spo.type_ = 'APPLY' OR spo.type_ IS NULL)
+            <if test="subjectId != null">
+                AND sr.actual_subject_id_ = #{subjectId}
+            </if>
+        </where>
+    </sql>
+    <select id="countMusicGroupStudentApply" resultType="java.lang.Integer">
+        SELECT COUNT(sr.user_id_)
+        FROM student_registration sr
+        LEFT JOIN sys_user su ON sr.user_id_ = su.id_
+        LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
+        LEFT JOIN student_payment_order spo ON spo.user_id_ = sr.user_id_ AND spo.music_group_id_ = sr.music_group_id_
+        <include refid="queryMusicGroupStudentApplySql"/>
+    </select>
 
     <sql id="queryCloses">
         <where>

mec-client-api/src/main/java/com/ym/mec/im/ImFeignService.java

@@ -23,6 +23,14 @@ public interface ImFeignService {
 	ImResult register(@RequestBody ImUserModel userModel);
 
 	/**
+	 * 用户注册
+	 * @param userModel
+	 * @return
+	 */
+	@PostMapping(value = "user/update", consumes = MediaType.APPLICATION_JSON_VALUE)
+	void update(@RequestBody ImUserModel userModel);
+
+	/**
 	 * 创建群组
 	 * @param groupModel
 	 * @return

mec-client-api/src/main/java/com/ym/mec/im/fallback/ImFeignServiceFallback.java

@@ -17,6 +17,11 @@ public class ImFeignServiceFallback implements ImFeignService {
     }
 
     @Override
+    public void update(ImUserModel userModel) {
+
+    }
+
+    @Override
     public Object groupCreate(ImGroupModel groupModel) {
         return null;
     }

mec-common/common-core/src/main/java/com/ym/mec/common/config/RequestAttributeHystrixConcurrencyStrategy.java

@@ -23,7 +23,7 @@ import com.netflix.hystrix.strategy.metrics.HystrixMetricsPublisher;
 import com.netflix.hystrix.strategy.properties.HystrixPropertiesStrategy;
 import com.netflix.hystrix.strategy.properties.HystrixProperty;
 
-@Component
+//@Component
 public class RequestAttributeHystrixConcurrencyStrategy extends HystrixConcurrencyStrategy {
 	private static final Logger log = LoggerFactory.getLogger(RequestAttributeHystrixConcurrencyStrategy.class);
 

mec-common/common-core/src/main/java/com/ym/mec/common/entity/ImGroupModel.java

@@ -12,6 +12,16 @@ public class ImGroupModel {
     private Integer minute;
     private Integer count;
     private Integer status;
+    //区分班级和乐团1表示乐团，2表示班级
+    private Integer type;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
 
     public ImGroupModel() {
     }
@@ -21,7 +31,12 @@ public class ImGroupModel {
         this.name = name;
     }
 
-    public ImGroupModel(String id, ImGroupMember[] members, String name) {
+    public ImGroupModel(Integer type,String id, ImGroupMember[] members, String name) {
+        if(type == 1){
+            this.id = "mg" + id;
+        }else {
+            this.id = "cg" + id;
+        }
         this.id = id;
         this.members = members;
         this.name = name;

mec-im/src/main/java/com/ym/config/ResourceServerConfig.java

@@ -10,6 +10,6 @@ import org.springframework.security.oauth2.config.annotation.web.configuration.R
 public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
     @Override
     public void configure(HttpSecurity http) throws Exception {
-        http.authorizeRequests().antMatchers("/v2/api-docs").permitAll().anyRequest().authenticated().and().csrf().disable();
+        http.authorizeRequests().antMatchers("/v2/api-docs","/user/register").permitAll().anyRequest().authenticated().and().csrf().disable();
     }
 }

mec-im/src/main/java/com/ym/controller/UserController.java

@@ -22,15 +22,6 @@ public class UserController {
     @Autowired
     UserService userService;
 
-//    @RequestMapping(value = "/refresh-token", method = RequestMethod.POST)
-//    public Object refreshToken(@RequestBody ReqUserData reqUserData)
-//            throws ApiException, Exception {
-//        String token = userService.refreshToken(reqUserData.getUserId(), reqUserData.getUserId());
-//        BaseResponse<String> response = new BaseResponse<>();
-//        response.setData(token);
-//        return response;
-//    }
-
     @RequestMapping(value = "/register", method = RequestMethod.POST)
     public Object register(@RequestBody UserModel userModel) throws Exception {
         return userService.register(userModel);

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

@@ -1,32 +1,54 @@
 package com.ym.mec.student.controller;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
 import com.ym.mec.biz.dal.dto.RegisterPayDto;
-import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.entity.Goods;
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
-import com.ym.mec.biz.dal.enums.*;
-import com.ym.mec.biz.service.*;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.entity.StudentRegistration;
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.biz.dal.enums.GoodsType;
+import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
+import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.biz.service.GoodsService;
+import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
+import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
+import com.ym.mec.biz.service.PayService;
+import com.ym.mec.biz.service.StudentPaymentOrderService;
+import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.util.string.IdWorker;
-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.http.HttpStatus;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
 
 @RequestMapping("musicGroup")
 @Api(tags = "乐团服务")
@@ -59,7 +81,7 @@ public class MusicGroupController extends BaseController {
     public Object queryUserMusicGroups() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
-            return failed("获取用户信息失败");
+            return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(musicGroupService.queryUserMusicGroups(sysUser.getId()));
     }
@@ -69,7 +91,7 @@ public class MusicGroupController extends BaseController {
     public Object queryPersonalMusicGroups() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
-            return failed("获取用户信息失败");
+            return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(musicGroupService.queryPersonalMusicGroups(sysUser.getId()));
     }
@@ -79,7 +101,7 @@ public class MusicGroupController extends BaseController {
     public Object findTeachersByStuId() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
-            return failed("获取用户信息失败");
+            return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(musicGroupService.findTeachersByStuId(sysUser.getId()));
     }

mec-student/src/main/java/com/ym/mec/student/controller/SysMessageController.java

@@ -75,7 +75,7 @@ public class SysMessageController extends BaseController {
 	public Object queryCountOfUnread() {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
-			return failed("请重新登录");
+			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 		return succeed(sysMessageService.queryCountOfUnread(sysUser.getId()));
 	}

mec-student/src/main/resources/application.yml

@@ -78,10 +78,12 @@ management:
     health:
       show-details: ALWAYS
   
-feign:
-  hystrix:
-    enabled: true
 
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000
+    
 logging:
   level:
-    com.ym.mec.auth.api.client.SysUserFeignService: DEBUG
+    com.ym.mec.auth.api.client.SysUserFeignService: DEBUG
+    

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherController.java

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherQueryInfo;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
+import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
 import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.SchoolService;
 import com.ym.mec.biz.service.TeacherService;
@@ -126,4 +127,10 @@ public class TeacherController extends BaseController {
         }
         return succeed(schoolService.findVipSchoolByTeacher(sysUser.getId()));
     }
+
+    @ApiOperation(value = "获取乐团学院学员报名列表")
+    @GetMapping("queryStudentApply")
+    public Object queryMusicGroupStudentApply(queryMusicGroupStudentQueryInfo queryInfo) {
+        return succeed(teacherService.queryMusicGroupStudentApply(queryInfo));
+    }
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherManageController.java

@@ -5,6 +5,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.CashAccountDetail;
 import com.ym.mec.biz.dal.entity.SysSuggestion;
 import com.ym.mec.biz.dal.entity.SysUserBankCard;
+import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.UploadReturnBean;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -31,10 +31,10 @@ import com.ym.mec.thirdparty.exception.ThirdpartyException;
 @Service
 public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBean {
 
-	@Value("${eseal.tsign.projectid:1111563517}")
+	@Value("${eseal.tsign.projectid:4438776254}")
 	public String projectId; // = "1111563517";
 
-	@Value("${eseal.tsign.projectSecret:95439b0863c241c63a861b87d1e647b7}")
+	@Value("${eseal.tsign.projectSecret:a94cf63d6361084d232f345d71321691}")
 	public String projectSecret; // = "95439b0863c241c63a861b87d1e647b7";
 
 	@Value("${eseal.tsign.apisUrl:http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2}")

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

@@ -35,7 +35,7 @@ public class StudentPaymentOrderController extends BaseController {
 
     @ApiOperation(value = "获取乐器采购清单")
     @GetMapping("/getMusicalList")
-    //@PreAuthorize("@pcs.hasPermissions('order/getMusicalList')")
+    @PreAuthorize("@pcs.hasPermissions('order/getMusicalList')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String")})
     public Object getMusicalList(String musicGroupId){
         return succeed(studentPaymentOrderDetailService.getMusicalList(musicGroupId));