Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -88,13 +88,27 @@ public class SysUser implements Serializable{
 
 	@ApiModelProperty(value = "融云token",required = false)
 	private String imToken;
-	
+
+	@ApiModelProperty(value = "身份证号",required = false)
 	private String idCardNo;
-	
+
+	@ApiModelProperty(value = "真实姓名",required = false)
+	private String realName;
+
+	@ApiModelProperty(value = "e签宝唯一编号",required = false)
 	private String esignId;
-	
+
+	@ApiModelProperty(value = "微信号",required = false)
 	private String wechatId;
 
+	public String getRealName() {
+		return realName;
+	}
+
+	public void setRealName(String realName) {
+		this.realName = realName;
+	}
+
 	public String getImToken() {
 		return imToken;
 	}

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

@@ -20,4 +20,10 @@ public interface SysRoleMenuDao extends BaseDAO<Integer, SysRoleMenu> {
 	 * @return
 	 */
 	int delete(SysRoleMenu sysRoleMenu);
+
+	/**
+	 * 删除角色所有的菜单权限
+	 * @param id
+	 */
+	void deleteAllMenu(Integer id);
 }

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

@@ -26,4 +26,16 @@ public interface SysRoleService extends BaseService<Integer, SysRole> {
      * @param sysRole
      */
     void addRole(SysRole sysRole);
+
+    /**
+     * 修改角色信息
+     * @param sysRole
+     */
+    void updateRole(SysRole sysRole);
+
+    /**
+     * 删除角色
+     * @param id
+     */
+    void delRole(Integer id);
 }

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -40,6 +41,26 @@ public class SysRoleServiceImpl extends BaseServiceImpl<Integer, SysRole>  imple
 	@Transactional(rollbackFor = Exception.class)
 	public void addRole(SysRole sysRole) {
 		sysRoleDao.insert(sysRole);
+		batchSave(sysRole);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateRole(SysRole sysRole) {
+		sysRole.setUpdateTime(new Date());
+		sysRoleDao.update(sysRole);
+		sysRoleMenuDao.deleteAllMenu(sysRole.getId());
+		batchSave(sysRole);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delRole(Integer id) {
+		sysRoleDao.delete(id);
+		sysRoleMenuDao.deleteAllMenu(id);
+	}
+
+	private void batchSave(SysRole sysRole){
 		List<Integer> menuIds = sysRole.getMenuIds();
 		if(menuIds != null && menuIds.size() > 0){
 			SysRoleMenu sysRoleMenu = new SysRoleMenu(sysRole.getId(),null);

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

@@ -34,20 +34,17 @@ public class RoleController extends BaseController {
     }
 
     @ApiOperation("删除角色")
-    @PostMapping(value = "/del/{id}")
-    public Object delRole(@ApiParam(value = "权限编号", required = true) @PathVariable("id") Integer id) {
-        return succeed(sysRoleService.delete(id));
+    @PostMapping(value = "/del")
+    public Object delRole(Integer id) {
+        sysRoleService.delRole(id);
+        return succeed();
     }
 
     @ApiOperation("修改角色")
     @PostMapping(value = "/update",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
     public Object updateRole(SysRole sysRole) {
-        SysRole roleByCode = sysRoleService.findRoleByCode(sysRole.getRoleCode());
-        if(roleByCode != null && !roleByCode.getId().equals(sysRole.getId())){
-            return failed("权限标识已存在");
-        }
         sysRole.setUpdateTime(new Date());
-        sysRoleService.update(sysRole);
+        sysRoleService.updateRole(sysRole);
         return succeed();
     }
 

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

@@ -36,7 +36,7 @@
         </selectKey>
         -->
         INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_,organ_id_)
-        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now(),,#{organId})
+        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now(),#{organId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -35,8 +35,11 @@
 	<delete id="delete" parameterType="java.util.Map">
 		DELETE FROM sys_role_menu WHERE role_id_ = #{roleId} AND menu_id_ = #{menuId}
 	</delete>
-	
-	<!-- 分页查询 -->
+    <delete id="deleteAllMenu">
+		DELETE FROM sys_role_menu WHERE role_id_ = #{roleId}
+	</delete>
+
+    <!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysRoleMenu" parameterType="map">
 		SELECT * FROM sys_role_menu ORDER BY role_id_,menu_id_ <include refid="global.limit"/>
 	</select>

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

@@ -66,9 +66,9 @@
         </selectKey>
         -->
         INSERT INTO sys_user
-        (im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_,id_card_no_,esign_id_,wechat_id_)
+        (im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_,id_card_no_,esign_id_,wechat_id_,real_name_)
         VALUES(#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{esignId},#{wechatId})
+        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{esignId},#{wechatId},#{realName})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -132,6 +132,9 @@
             <if test="wechatId != null">
                 wechat_id_ = #{wechatId},
             </if>
+            <if test="realName != null">
+                real_name = #{realName},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

mec-biz/pom.xml

@@ -34,5 +34,11 @@
 			<groupId>com.ym</groupId>
 			<artifactId>mec-thirdparty</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>com.ym</groupId>
+            <artifactId>mec-auth-server</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

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

@@ -1,9 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
-import com.ym.mec.biz.dal.dto.CourseListDto;
-import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
-import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.common.dal.BaseDAO;
 
@@ -124,4 +121,18 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @return
      */
     List<ImUserModel> findGroupUsers(String musicGroupId);
+
+    /**
+     * count学员购买列表
+     * @param params
+     * @return
+     */
+    int countStudentPayLog(Map<String, Object> params);
+
+    /**
+     * 分页查询学员购买列表
+     * @param params
+     * @return
+     */
+    List<StudentPayInfoDto> queryStudentPayLog(Map<String, Object> params);
 }

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

@@ -0,0 +1,40 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.Subject;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.util.List;
+
+/**
+ * 乐团报名，乐团基本信息
+ */
+public class MusicGroupRegResp {
+
+    //乐团名称
+    private String musicGroupName;
+
+    //乐团声部信息
+    private List<Subject> subjectList;
+
+
+    public String getMusicGroupName() {
+        return musicGroupName;
+    }
+
+    public void setMusicGroupName(String musicGroupName) {
+        this.musicGroupName = musicGroupName;
+    }
+
+    public List<Subject> getSubjectList() {
+        return subjectList;
+    }
+
+    public void setSubjectList(List<Subject> subjectList) {
+        this.subjectList = subjectList;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.enums.OrderTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class StudentPayInfoDto {
+
+    private String name;
+
+    @ApiModelProperty(value = "订单类型",required = true)
+    private OrderTypeEnum type;
+
+    @ApiModelProperty(value = "实际金额",required = true)
+    private BigDecimal actualAmount;
+
+    private Date createTime;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public OrderTypeEnum getType() {
+        return type;
+    }
+
+    public void setType(OrderTypeEnum type) {
+        this.type = type;
+    }
+
+    public BigDecimal getActualAmount() {
+        return actualAmount;
+    }
+
+    public void setActualAmount(BigDecimal actualAmount) {
+        this.actualAmount = actualAmount;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -1,77 +1,104 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ym.mec.biz.dal.enums.CourseStatusEnum;
-import com.ym.mec.biz.dal.enums.TeachModeEnum;
-
 import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
+import com.ym.mec.biz.dal.enums.TeachModeEnum;
+import com.ym.mec.common.enums.BaseEnum;
+
 /**
  * 对应数据库表(course_schedule):
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class CourseSchedule {
 
+	public enum CourseScheduleType implements BaseEnum<String, CourseScheduleType> {
+
+		SINGLE("SINGLE", "单技课"), MIX("MIX", "合奏课"), HIGH("HIGH", "小班课"), VIP("VIP", "vip课"), DEMO("demo", "试听课"), COMPREHENSIVE("comprehensive", "综合课"), PRACTICE(
+				"PRACTICE", "练习课"), ENLIGHTENMENT("ENLIGHTENMENT", "启蒙课"), TRAINING("TRAINING", "集训课");
+
+		private String code;
+
+		private String msg;
+
+		CourseScheduleType(String code, String msg) {
+			this.code = code;
+			this.msg = msg;
+		}
+
+		@Override
+		public String getCode() {
+			return code;
+		}
+
+		public String getMsg() {
+			return msg;
+		}
+	}
+
 	/**  */
 	private Long id;
-	
+
 	/** 班级编号 */
-	@ApiModelProperty(value = "班级编号",required = false)
+	@ApiModelProperty(value = "班级编号", required = false)
 	private Integer classGroupId;
-	
+
 	/** 课程状态 */
-	@ApiModelProperty(value = "课程状态  NOT_START未开始，SIGN_IN已签到，SIGN_OUT已签退",required = false)
+	@ApiModelProperty(value = "课程状态  NOT_START未开始，SIGN_IN已签到，SIGN_OUT已签退", required = false)
 	private CourseStatusEnum status;
-	
+
 	/** 补贴 */
-	@ApiModelProperty(value = "补贴",required = false)
+	@ApiModelProperty(value = "补贴", required = false)
 	private long subsidy;
-	
+
 	/** 上课日期 */
-	@ApiModelProperty(value = "上课日期",required = false)
+	@ApiModelProperty(value = "上课日期", required = false)
 	private java.util.Date classDate;
-	
+
 	/** 上课时间 */
-	@ApiModelProperty(value = "上课时间",required = false)
+	@ApiModelProperty(value = "上课时间", required = false)
 	private java.util.Date startClassTime;
-	
+
 	/** 结束时间 */
-	@ApiModelProperty(value = "结束时间",required = false)
+	@ApiModelProperty(value = "结束时间", required = false)
 	private java.util.Date endClassTime;
-	
+
 	/** 上课教师 */
-	@ApiModelProperty(value = "上课教师",required = false)
+	@ApiModelProperty(value = "上课教师", required = false)
 	private Long teacherId;
-	
+
 	/** 实际上课教师 */
-	@ApiModelProperty(value = "实际上课教师",required = false)
+	@ApiModelProperty(value = "实际上课教师", required = false)
 	private Long actualTeacherId;
-	
+
 	/**  */
 	private java.util.Date createTime;
-	
+
 	/**  */
 	private java.util.Date updateTime;
 
 	private TeachModeEnum teachMode;
 
 	private boolean complaintStatus;
+	
+	private CourseScheduleType type;
 
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
-	public Long getId(){
+
+	public Long getId() {
 		return this.id;
 	}
-			
-	public void setClassGroupId(Integer classGroupId){
+
+	public void setClassGroupId(Integer classGroupId) {
 		this.classGroupId = classGroupId;
 	}
-	
-	public Integer getClassGroupId(){
+
+	public Integer getClassGroupId() {
 		return this.classGroupId;
 	}
 
@@ -83,35 +110,35 @@ public class CourseSchedule {
 		this.status = status;
 	}
 
-	public void setSubsidy(long subsidy){
+	public void setSubsidy(long subsidy) {
 		this.subsidy = subsidy;
 	}
-	
-	public long getSubsidy(){
+
+	public long getSubsidy() {
 		return this.subsidy;
 	}
-			
-	public void setClassDate(java.util.Date classDate){
+
+	public void setClassDate(java.util.Date classDate) {
 		this.classDate = classDate;
 	}
-	
-	public java.util.Date getClassDate(){
+
+	public java.util.Date getClassDate() {
 		return this.classDate;
 	}
-			
-	public void setStartClassTime(java.util.Date startClassTime){
+
+	public void setStartClassTime(java.util.Date startClassTime) {
 		this.startClassTime = startClassTime;
 	}
-	
-	public java.util.Date getStartClassTime(){
+
+	public java.util.Date getStartClassTime() {
 		return this.startClassTime;
 	}
-			
-	public void setEndClassTime(java.util.Date endClassTime){
+
+	public void setEndClassTime(java.util.Date endClassTime) {
 		this.endClassTime = endClassTime;
 	}
-	
-	public java.util.Date getEndClassTime(){
+
+	public java.util.Date getEndClassTime() {
 		return this.endClassTime;
 	}
 
@@ -131,19 +158,19 @@ public class CourseSchedule {
 		this.actualTeacherId = actualTeacherId;
 	}
 
-	public void setCreateTime(java.util.Date createTime){
+	public void setCreateTime(java.util.Date createTime) {
 		this.createTime = createTime;
 	}
-	
-	public java.util.Date getCreateTime(){
+
+	public java.util.Date getCreateTime() {
 		return this.createTime;
 	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
+
+	public void setUpdateTime(java.util.Date updateTime) {
 		this.updateTime = updateTime;
 	}
-	
-	public java.util.Date getUpdateTime(){
+
+	public java.util.Date getUpdateTime() {
 		return this.updateTime;
 	}
 
@@ -163,6 +190,14 @@ public class CourseSchedule {
 		this.complaintStatus = complaintStatus;
 	}
 
+	public CourseScheduleType getType() {
+		return type;
+	}
+
+	public void setType(CourseScheduleType type) {
+		this.type = type;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRegistration.java

@@ -12,262 +12,315 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
  */
 public class StudentRegistration {
 
-	/**  */
-	private Long id;
+    /**
+     *
+     */
+    @ApiModelProperty(value = "报名id", hidden = true)
+    private Long id;
+
+    /**
+     *
+     */
+    @ApiModelProperty(value = "机构id", hidden = true)
+    private Integer organId;
+    /**
+     *
+     */
+    @ApiModelProperty(value = "学生编号", hidden = true)
+    private Integer userId;
+
+    @ApiModelProperty(value = "学生姓名", required = true)
+    private String name;
+
+    @ApiModelProperty(value = "性别（0，女  1，男", required = true)
+    private Integer gender;
+
+    @ApiModelProperty(value = "身份证号", required = true)
+    private String idCardNo;
+
+    /**
+     * 所属乐团（对应 music_group 表id）
+     */
+    @ApiModelProperty(value = "所属乐团（对应 music_group 表id）", required = true)
+    private Integer musicGroupId;
+
+    /**
+     * 当前所在年级
+     */
+    @ApiModelProperty(value = "当前所在年级", required = true)
+    private String currentGrade;
+
+    /**
+     * 当前所在班级
+     */
+    @ApiModelProperty(value = "当前所在班级", required = true)
+    private String currentClass;
+
+    /**
+     * 报名科目
+     */
+    @ApiModelProperty(value = "报名科目", required = true)
+    private Integer subjectId;
+
+    /**
+     * 报名科目
+     */
+    @ApiModelProperty(value = "实际科目", hidden = true)
+    private Integer actualSubjectId;
+
+    /**
+     * 是否允许调剂
+     */
+    @ApiModelProperty(value = "是否允许调剂", required = true)
+    private YesOrNoEnum isAllowAdjust;
+
+    /**
+     * 器材购买方式（团购、自备）
+     */
+    @ApiModelProperty(value = "器材购买方式（GROUP:团购,OWNED:自备）", required = true)
+    private KitPurchaseMethodEnum kitPurchaseMethod;
+
+    /**
+     *
+     */
+    @ApiModelProperty(value = "备注", hidden = false)
+    private String remark;
+
+    /**
+     *
+     */
+    @ApiModelProperty(value = "添加时间", hidden = true)
+    private java.util.Date createTime;
+
+    /**
+     *
+     */
+    @ApiModelProperty(value = "更新时间", hidden = true)
+    private java.util.Date updateTime;
+
+    /**
+     * 家长姓名
+     */
+    @ApiModelProperty(value = "家长姓名", required = true)
+    private String parentsName;
+
+    /**
+     * 家长姓名
+     */
+    @ApiModelProperty(value = "家长电话", required = true)
+    private String parentsPhone;
+
+    /**
+     * 家长单位
+     */
+    @ApiModelProperty(value = "家长单位", required = false)
+    private String parentsCompany;
+
+    /**
+     * 缴费状态（1-已缴费 0-未交费）
+     */
+    @ApiModelProperty(value = "缴费状态（1-已缴费 0-未交费）", hidden = true)
+    private YesOrNoEnum paymentStatus;
+
+    @ApiModelProperty(value = "班级id", hidden = true)
+    private Integer ClassGroupId;
+
+    /**
+     * 最后缴费日期
+     */
+    @ApiModelProperty(value = "最后缴费日期", hidden = true)
+    private java.util.Date lastPaymentDate;
+
+    /**
+     * 预计下次缴费日期
+     */
+    @ApiModelProperty(value = "预计下次缴费日期", hidden = true)
+    private java.util.Date nextPaymentDate;
+
+    public Integer getActualSubjectId() {
+        return actualSubjectId;
+    }
+
+    public void setActualSubjectId(Integer actualSubjectId) {
+        this.actualSubjectId = actualSubjectId;
+    }
+
+    public String getParentsPhone() {
+        return parentsPhone;
+    }
+
+    public void setParentsPhone(String parentsPhone) {
+        this.parentsPhone = parentsPhone;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Integer getUserId() {
+        return this.userId;
+    }
+
+    public void setMusicGroupId(Integer musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
+    public Integer getMusicGroupId() {
+        return this.musicGroupId;
+    }
+
+    public void setCurrentGrade(String currentGrade) {
+        this.currentGrade = currentGrade;
+    }
+
+    public String getCurrentGrade() {
+        return this.currentGrade;
+    }
+
+    public void setCurrentClass(String currentClass) {
+        this.currentClass = currentClass;
+    }
+
+    public String getCurrentClass() {
+        return this.currentClass;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Integer getSubjectId() {
+        return this.subjectId;
+    }
+
+    public YesOrNoEnum getIsAllowAdjust() {
+        return isAllowAdjust;
+    }
+
+    public void setIsAllowAdjust(YesOrNoEnum isAllowAdjust) {
+        this.isAllowAdjust = isAllowAdjust;
+    }
+
+    public void setPaymentStatus(YesOrNoEnum paymentStatus) {
+        this.paymentStatus = paymentStatus;
+    }
+
+    public KitPurchaseMethodEnum getKitPurchaseMethod() {
+        return kitPurchaseMethod;
+    }
+
+    public void setKitPurchaseMethod(KitPurchaseMethodEnum kitPurchaseMethod) {
+        this.kitPurchaseMethod = kitPurchaseMethod;
+    }
 
-	/**  */
-	@ApiModelProperty(value = "学生编号",required = false)
-	private Integer userId;
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
-	@ApiModelProperty(value = "学生姓名",required = true)
-	private String name;
+    public String getRemark() {
+        return this.remark;
+    }
 
-	@ApiModelProperty(value = "性别（0，女  1，男",required = true)
-	private String gender;
+    public void setCreateTime(java.util.Date createTime) {
+        this.createTime = createTime;
+    }
 
-	@ApiModelProperty(value = "身份证号",required = true)
-	private String idCardNo;
+    public java.util.Date getCreateTime() {
+        return this.createTime;
+    }
 
-	/** 所属乐团（对应 music_group 表id） */
-	@ApiModelProperty(value = "所属乐团（对应 music_group 表id）",required = false)
-	private Integer musicGroupId;
+    public void setUpdateTime(java.util.Date updateTime) {
+        this.updateTime = updateTime;
+    }
 
-	/** 当前所在年级 */
-	@ApiModelProperty(value = "当前所在年级",required = false)
-	private String currentGrade;
+    public java.util.Date getUpdateTime() {
+        return this.updateTime;
+    }
 
-	/** 当前所在班级 */
-	@ApiModelProperty(value = "当前所在班级",required = false)
-	private String currentClass;
+    public void setParentsName(String parentsName) {
+        this.parentsName = parentsName;
+    }
 
-	/** 报名科目 */
-	@ApiModelProperty(value = "报名科目",required = true)
-	private Integer subjectId;
+    public String getParentsName() {
+        return this.parentsName;
+    }
 
-	/** 报名科目 */
-	@ApiModelProperty(value = "实际科目",hidden = true)
-	private Integer actualSubjectId;
+    public void setParentsCompany(String parentsCompany) {
+        this.parentsCompany = parentsCompany;
+    }
 
-	/** 是否允许调剂 */
-	@ApiModelProperty(value = "是否允许调剂",required = false)
-	private YesOrNoEnum isAllowAdjust;
+    public String getParentsCompany() {
+        return this.parentsCompany;
+    }
 
-	/** 器材购买方式（团购、自备） */
-	@ApiModelProperty(value = "器材购买方式（团购、自备）",required = false)
-	private KitPurchaseMethodEnum kitPurchaseMethod;
+    public YesOrNoEnum getPaymentStatus() {
+        return paymentStatus;
+    }
 
-	/**  */
-	@ApiModelProperty(value = "备注",required = false)
-	private String remark;
+    public void setLastPaymentDate(java.util.Date lastPaymentDate) {
+        this.lastPaymentDate = lastPaymentDate;
+    }
 
-	/**  */
-	private java.util.Date createTime;
+    public java.util.Date getLastPaymentDate() {
+        return this.lastPaymentDate;
+    }
 
-	/**  */
-	private java.util.Date updateTime;
+    public void setNextPaymentDate(java.util.Date nextPaymentDate) {
+        this.nextPaymentDate = nextPaymentDate;
+    }
 
-	/** 家长姓名 */
-	@ApiModelProperty(value = "家长姓名",required = false)
-	private String parentsName;
+    public java.util.Date getNextPaymentDate() {
+        return this.nextPaymentDate;
+    }
 
-	/** 家长姓名 */
-	@ApiModelProperty(value = "家长电话",required = false)
-	private String parentsPhone;
+    public Integer getClassGroupId() {
+        return ClassGroupId;
+    }
 
-	/** 家长单位 */
-	@ApiModelProperty(value = "家长单位",required = false)
-	private String parentsCompany;
+    public void setClassGroupId(Integer classGroupId) {
+        ClassGroupId = classGroupId;
+    }
 
-	/** 缴费状态（1-已缴费 0-未交费） */
-	@ApiModelProperty(value = "缴费状态（1-已缴费 0-未交费）",required = false)
-	private YesOrNoEnum paymentStatus;
+    public String getName() {
+        return name;
+    }
 
-	@ApiModelProperty(value = "班级id",hidden = true)
-	private Integer ClassGroupId;
+    public void setName(String name) {
+        this.name = name;
+    }
 
-	/** 最后缴费日期 */
-	@ApiModelProperty(value = "最后缴费日期",required = false)
-	private java.util.Date lastPaymentDate;
+    public String getIdCardNo() {
+        return idCardNo;
+    }
 
-	/** 预计下次缴费日期 */
-	@ApiModelProperty(value = "预计下次缴费日期",required = false)
-	private java.util.Date nextPaymentDate;
+    public void setIdCardNo(String idCardNo) {
+        this.idCardNo = idCardNo;
+    }
 
-	public Integer getActualSubjectId() {
-		return actualSubjectId;
-	}
-
-	public void setActualSubjectId(Integer actualSubjectId) {
-		this.actualSubjectId = actualSubjectId;
-	}
-
-	public String getParentsPhone() {
-		return parentsPhone;
-	}
-
-	public void setParentsPhone(String parentsPhone) {
-		this.parentsPhone = parentsPhone;
-	}
-
-	public void setId(Long id){
-		this.id = id;
-	}
-
-	public Long getId(){
-		return this.id;
-	}
-
-	public void setUserId(Integer userId){
-		this.userId = userId;
-	}
-
-	public Integer getUserId(){
-		return this.userId;
-	}
-
-	public void setMusicGroupId(Integer musicGroupId){
-		this.musicGroupId = musicGroupId;
-	}
-
-	public Integer getMusicGroupId(){
-		return this.musicGroupId;
-	}
-
-	public void setCurrentGrade(String currentGrade){
-		this.currentGrade = currentGrade;
-	}
+    public Integer getGender() {
+        return gender;
+    }
 
-	public String getCurrentGrade(){
-		return this.currentGrade;
-	}
-
-	public void setCurrentClass(String currentClass){
-		this.currentClass = currentClass;
-	}
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
 
-	public String getCurrentClass(){
-		return this.currentClass;
-	}
-
-	public void setSubjectId(Integer subjectId){
-		this.subjectId = subjectId;
-	}
 
-	public Integer getSubjectId(){
-		return this.subjectId;
-	}
-
-	public YesOrNoEnum getIsAllowAdjust() {
-		return isAllowAdjust;
-	}
-
-	public void setIsAllowAdjust(YesOrNoEnum isAllowAdjust) {
-		this.isAllowAdjust = isAllowAdjust;
-	}
-
-	public void setPaymentStatus(YesOrNoEnum paymentStatus) {
-		this.paymentStatus = paymentStatus;
-	}
-
-	public KitPurchaseMethodEnum getKitPurchaseMethod() {
-		return kitPurchaseMethod;
-	}
-
-	public void setKitPurchaseMethod(KitPurchaseMethodEnum kitPurchaseMethod) {
-		this.kitPurchaseMethod = kitPurchaseMethod;
-	}
-
-	public void setRemark(String remark){
-		this.remark = remark;
-	}
-
-	public String getRemark(){
-		return this.remark;
-	}
+    public Integer getOrganId() {
+        return organId;
+    }
 
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-
-	public void setParentsName(String parentsName){
-		this.parentsName = parentsName;
-	}
-
-	public String getParentsName(){
-		return this.parentsName;
-	}
-
-	public void setParentsCompany(String parentsCompany){
-		this.parentsCompany = parentsCompany;
-	}
-
-	public String getParentsCompany(){
-		return this.parentsCompany;
-	}
-
-	public YesOrNoEnum getPaymentStatus() {
-		return paymentStatus;
-	}
-
-	public void setLastPaymentDate(java.util.Date lastPaymentDate){
-		this.lastPaymentDate = lastPaymentDate;
-	}
-
-	public java.util.Date getLastPaymentDate(){
-		return this.lastPaymentDate;
-	}
-
-	public void setNextPaymentDate(java.util.Date nextPaymentDate){
-		this.nextPaymentDate = nextPaymentDate;
-	}
-
-	public java.util.Date getNextPaymentDate(){
-		return this.nextPaymentDate;
-	}
-
-	public Integer getClassGroupId() {
-		return ClassGroupId;
-	}
-
-	public void setClassGroupId(Integer classGroupId) {
-		ClassGroupId = classGroupId;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getIdCardNo() {
-		return idCardNo;
-	}
-
-	public void setIdCardNo(String idCardNo) {
-		this.idCardNo = idCardNo;
-	}
-
-	public String getGender() {
-		return gender;
-	}
-
-	public void setGender(String gender) {
-		this.gender = gender;
-	}
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
 
 	@Override
 	public String toString() {

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysUserBankCard.java

@@ -66,7 +66,40 @@ public class SysUserBankCard {
 	/**  */
 	@ApiModelProperty(value = "联系方式",required = false)
 	private String transNo;
-	
+
+	@ApiModelProperty(value = "真实姓名",required = false)
+	private String realName;
+
+	@ApiModelProperty(value = "身份证号",required = false)
+	private String idCardNo;
+
+	@ApiModelProperty(value = "验证码",required = false)
+	private String smsCode;
+
+	public String getSmsCode() {
+		return smsCode;
+	}
+
+	public void setSmsCode(String smsCode) {
+		this.smsCode = smsCode;
+	}
+
+	public String getRealName() {
+		return realName;
+	}
+
+	public void setRealName(String realName) {
+		this.realName = realName;
+	}
+
+	public String getIdCardNo() {
+		return idCardNo;
+	}
+
+	public void setIdCardNo(String idCardNo) {
+		this.idCardNo = idCardNo;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherDefaultMusicGroupSalary.java

@@ -1,13 +1,13 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import java.math.BigDecimal;
+import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 
 /**
  * 对应数据库表(teacher_default_music_group_salary):
@@ -21,9 +21,9 @@ public class TeacherDefaultMusicGroupSalary {
 	@ApiModelProperty(value = "教师编号",required = false)
 	private Integer userId;
 	
-	/** 班级类型（参照 class_group表的type_字段） */
-	@ApiModelProperty(value = "班级类型",required = false)
-	private ClassGroupTypeEnum classGroupType;
+	/** 班级类型（参照 course_schedule表的type_字段） */
+	@ApiModelProperty(value = "课程类型",required = false)
+	private CourseScheduleType courseScheduleType;
 	
 	/**  */
 	@ApiModelProperty(value = "专业技能",required = false)
@@ -70,12 +70,12 @@ public class TeacherDefaultMusicGroupSalary {
 		return this.userId;
 	}
 
-	public ClassGroupTypeEnum getClassGroupType() {
-		return classGroupType;
+	public CourseScheduleType getCourseScheduleType() {
+		return courseScheduleType;
 	}
 
-	public void setClassGroupType(ClassGroupTypeEnum classGroupType) {
-		this.classGroupType = classGroupType;
+	public void setCourseScheduleType(CourseScheduleType courseScheduleType) {
+		this.courseScheduleType = courseScheduleType;
 	}
 
 	public void setSubjectId(Integer subjectId){

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

@@ -0,0 +1,29 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.biz.dal.enums.OrderTypeEnum;
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+public class StudentPayLogQueryInfo extends QueryInfo {
+
+    @ApiModelProperty(value = "订单类型",required = true)
+    private OrderTypeEnum type;
+
+    private Integer userId;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public OrderTypeEnum getType() {
+        return type;
+    }
+
+    public void setType(OrderTypeEnum type) {
+        this.type = type;
+    }
+}

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

@@ -4,13 +4,12 @@ import java.util.List;
 
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.ClassGroup;
-import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
+import com.ym.mec.biz.dal.page.StudentPayLogQueryInfo;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
-import org.apache.ibatis.annotations.Param;
 
 public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
@@ -138,4 +137,11 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @return
      */
     List<ImUserModel> findGroupUsers(String groupId);
+
+    /**
+     * 分页查询学生购买记录
+     * @param studentPayLogQueryInfo
+     * @return
+     */
+    PageInfo<StudentPayInfoDto> queryStudentPayLog(StudentPayLogQueryInfo studentPayLogQueryInfo);
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dto.MusicGroupRegResp;
 import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfo;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 import com.ym.mec.common.service.BaseService;
@@ -36,4 +37,11 @@ public interface MusicGroupSubjectPlanService extends BaseService<Integer, Music
      */
     MusicGroupSubjectGoodsAndInfo getSubjectGoodsAndInfo(Integer musicGroupId, Integer subjectId);
 
+    /**
+     * 乐团报名基本信息
+     * @param musicGroupId
+     * @return
+     */
+    MusicGroupRegResp getMusicGroupRegInfo(Integer musicGroupId);
+
 }

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

@@ -68,4 +68,11 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
      */
     Integer updateByUserIdAndMusicGroupId(StudentRegistration studentRegistration);
 
+    /**
+     * 添加学生报名信息
+     * @param studentRegistration
+     * @return
+     */
+    StudentRegistration addStudent(StudentRegistration studentRegistration);
+
 }

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

@@ -5,4 +5,10 @@ import com.ym.mec.common.service.BaseService;
 
 public interface SysUserBankCardService extends BaseService<Long, SysUserBankCard> {
 
+    /**
+     * 新增银行卡
+     * @param sysUserBankCard
+     * @return
+     */
+    boolean add(SysUserBankCard sysUserBankCard);
 }

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

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.dao.TeacherDao;
 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.StudentPayLogQueryInfo;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
@@ -375,4 +376,23 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         return classGroupDao.findGroupUsers(groupId.substring(2));
     }
+
+    @Override
+    public PageInfo<StudentPayInfoDto> queryStudentPayLog(StudentPayLogQueryInfo queryInfo) {
+        PageInfo<StudentPayInfoDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, queryInfo);
+        List<StudentPayInfoDto> dataList = null;
+        int count = classGroupDao.countStudentPayLog(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = classGroupDao.queryStudentPayLog(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
 }

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

@@ -2,17 +2,15 @@ package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.ym.mec.biz.dal.dao.MusicGroupDao;
+import com.ym.mec.biz.dal.dto.MusicGroupRegResp;
 import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfo;
-import com.ym.mec.biz.dal.entity.MusicGroup;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.GoodsType;
 import com.ym.mec.biz.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.ym.mec.biz.dal.dao.MusicGroupSubjectPlanDao;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
@@ -38,6 +36,9 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     @Autowired
     private MusicGroupService musicGroupService;
 
+    @Autowired
+    private SubjectService subjectService;
+
     @Override
     public BaseDAO<Integer, MusicGroupSubjectPlan> getDAO() {
         return musicGroupSubjectPlanDao;
@@ -83,4 +84,18 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectGoodsGroupList(goodsGroups);
         return musicGroupSubjectGoodsAndInfo;
     }
+
+    @Override
+    public MusicGroupRegResp getMusicGroupRegInfo(Integer musicGroupId) {
+        MusicGroupRegResp musicGroupRegResp = new MusicGroupRegResp();
+
+        //乐团信息
+        MusicGroup musicGroup = musicGroupService.get(musicGroupId.toString());
+        musicGroupRegResp.setMusicGroupName(musicGroup.getName());
+        //声部信息
+        List<Subject> subjectList = subjectService.findSubByMusicGroupId(musicGroupId);
+        musicGroupRegResp.setSubjectList(subjectList);
+
+        return musicGroupRegResp;
+    }
 }

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

@@ -1,5 +1,10 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.auth.api.enums.SysUserType;
+import com.ym.mec.auth.api.enums.UserLockFlag;
+import com.ym.mec.auth.service.SysUserService;
+import com.ym.mec.biz.dal.dao.StudentRechargeDao;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
 import com.ym.mec.biz.dal.dto.StudentFeeDto;
@@ -14,14 +19,18 @@ import com.ym.mec.util.collection.MapUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 @Service
 public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, StudentRegistration> implements StudentRegistrationService {
 
-    @Autowired
+    @Resource
     private StudentRegistrationDao studentRegistrationDao;
+    @Autowired
+    private SysUserService sysUserService;
 
     @Override
     public BaseDAO<Long, StudentRegistration> getDAO() {
@@ -77,11 +86,35 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     public Integer getNoClassStuCountBySubjectId(Integer musicGroupId, Integer actualSubjectId) {
-        return studentRegistrationDao.getNoClassStuCountBySubjectId(musicGroupId,actualSubjectId);
+        return studentRegistrationDao.getNoClassStuCountBySubjectId(musicGroupId, actualSubjectId);
     }
 
     @Override
     public Integer updateByUserIdAndMusicGroupId(StudentRegistration studentRegistration) {
         return studentRegistrationDao.updateByUserIdAndMusicGroupId(studentRegistration);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public StudentRegistration addStudent(StudentRegistration studentRegistration) {
+        Date date = new Date();
+        SysUser sysUser = sysUserService.queryByPhone(studentRegistration.getParentsPhone());
+        if (sysUser == null) {
+            sysUser = new SysUser();
+            sysUser.setPhone(studentRegistration.getParentsPhone());
+            sysUser.setCreateTime(date);
+            sysUser.setUpdateTime(date);
+            sysUser.setLockFlag(UserLockFlag.NOACTIVATED);
+            sysUser.setDelFlag(com.ym.mec.auth.api.enums.YesOrNoEnum.NO);
+            sysUser.setUserType(SysUserType.STUDENT);
+            sysUser.setGender(studentRegistration.getGender());
+            sysUser.setOrganId(studentRegistration.getOrganId());
+            sysUser.setRealName(studentRegistration.getName());
+            sysUser.setIdCardNo(studentRegistration.getIdCardNo());
+            sysUserService.add(sysUser);
+        }
+        studentRegistration.setUserId(sysUser.getId());
+        studentRegistrationDao.insert(studentRegistration);
+        return studentRegistration;
+    }
 }

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.service.SysUserBankCardService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -13,10 +14,26 @@ public class SysUserBankCardServiceImpl extends BaseServiceImpl<Long, SysUserBan
 	
 	@Autowired
 	private SysUserBankCardDao sysUserBankCardDao;
+	@Autowired
+	private RedisTemplate<String,String> redisTemplate;
+	private final String loginVerifyCodeKey = "loginVerifyCode:";
 
 	@Override
 	public BaseDAO<Long, SysUserBankCard> getDAO() {
 		return sysUserBankCardDao;
 	}
-	
+
+	@Override
+	public boolean add(SysUserBankCard sysUserBankCard) {
+		/*if(StringUtils.isEmpty(sysUserBankCard.getSmsCode()) || StringUtils.isEmpty(sysUserBankCard.getMobilePhone())){
+			return false;
+		}
+		String verifyCode = redisTemplate.opsForValue().get(loginVerifyCodeKey + sysUserBankCard.getMobilePhone());
+		if(StringUtils.isNotEmpty(verifyCode) && StringUtils.equalsIgnoreCase(verifyCode,sysUserBankCard.getSmsCode())){
+			sysUserBankCardDao.insert(sysUserBankCard);
+			return true;
+		}*/
+		sysUserBankCardDao.insert(sysUserBankCard);
+		return false;
+	}
 }

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

@@ -315,4 +315,43 @@
         LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
         WHERE cgsm.class_group_id_ = #{musicGroupId} GROUP BY su.id_
     </select>
+    <select id="countStudentPayLog" resultType="java.lang.Integer">
+        SELECT COUNT(spo.id_)
+        FROM student_payment_order spo
+        LEFT JOIN class_group cg ON cg.id_ = spo.class_group_id_
+        <where>
+            <if test="search != null and search != ''">
+                AND cg.name_ LIKE CONCAT('%',#{search},'%')
+            </if>
+            <if test="userId != null">
+                AND spo.user_id_ = #{userId}
+            </if>
+            <if test="type != null">
+                AND spo.type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
+        </where>
+    </select>
+    <resultMap id="StudentPayInfoDto" type="com.ym.mec.biz.dal.dto.StudentPayInfoDto">
+        <result column="actual_amount_" property="actualAmount"/>
+        <result column="name_" property="name"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+    </resultMap>
+    <select id="queryStudentPayLog" resultMap="StudentPayInfoDto">
+        SELECT spo.actual_amount_,spo.status_,spo.type_,cg.name_,spo.create_time_
+        FROM student_payment_order spo
+        LEFT JOIN class_group cg ON cg.id_ = spo.class_group_id_
+        <where>
+            <if test="search != null and search != ''">
+                AND cg.name_ LIKE CONCAT('%',#{search},'%')
+            </if>
+            <if test="userId != null">
+                AND spo.user_id_ = #{userId}
+            </if>
+            <if test="type != null">
+                AND spo.type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
+        </where>
+        <include refid="global.limit"/>
+    </select>
 </mapper>

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

@@ -19,6 +19,7 @@
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="teach_mode_" property="teachMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="complaint_status_" property="complaintStatus"/>
     </resultMap>
 
@@ -50,16 +51,16 @@
         </selectKey>
         -->
         INSERT INTO course_schedule
-        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_)
-        VALUES(#{id},#{classGroupId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},now(),now())
+        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,type_)
+        VALUES(#{id},#{classGroupId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},now(),now(),#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
 
     <insert id="batchAddCourseSchedules" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
         INSERT INTO course_schedule
-        (class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_)
+        (class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,type_)
         VALUE
         <foreach collection="list" item="course" separator=",">
-            (#{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},#{course.actualTeacherId},now(),now())
+            (#{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},#{course.actualTeacherId},now(),now(),#{course.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
         </foreach>
     </insert>
 
@@ -76,6 +77,9 @@
             <if test="status != null">
                 status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
+            <if test="type != null">
+                type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
             <if test="actualTeacherId != null">
                 actual_teacher_id_ = #{actualTeacherId},
             </if>

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

@@ -22,6 +22,8 @@
         <result column="is_quick_" property="isQuick" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="mobile_phone_" property="mobilePhone"/>
         <result column="trans_no_" property="transNo"/>
+        <result column="id_card_no_" property="idCardNo"/>
+        <result column="real_name_" property="realName"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -43,8 +45,9 @@
         </selectKey>
         -->
         INSERT INTO sys_user_bank_card
-        (id_,user_id_,is_default_,bank_name_,bank_code_,card_no_,province_,city_,address,create_on_,modify_on_,is_quick_,mobile_phone_,trans_no_)
-        VALUES(#{id},#{userId},#{isDefault,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{bankName},#{bankCode},#{cardNo},#{province},#{city},#{address},now(),now(),#{isQuick,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{mobilePhone},#{transNo})
+        (id_,user_id_,is_default_,bank_name_,bank_code_,card_no_,province_,city_,address,create_on_,modify_on_,is_quick_,mobile_phone_,trans_no_,real_name_,id_card_no_)
+        VALUES(#{id},#{userId},#{isDefault,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{bankName},#{bankCode},#{cardNo},#{province},
+        #{city},#{address},now(),now(),#{isQuick,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{mobilePhone},#{transNo},#{realName},#{idCardNo})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -90,6 +93,12 @@
             <if test="transNo != null">
                 trans_no_ = #{transNo},
             </if>
+            <if test="idCardNo != null">
+                id_card_no_ = #{idCardNo},
+            </if>
+            <if test="realName != null">
+                real_name_ = #{realName},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -7,7 +7,7 @@
 		id="TeacherDefaultMusicGroupSalary">
 		<result column="id_" property="id" />
 		<result column="user_id_" property="userId" />
-		<result column="class_group_type_" property="classGroupType" />
+		<result column="course_schedule_type_" property="courseScheduleType" />
 		<result column="subject_id_" property="subjectId" />
 		<result column="main_teacher_salary_" property="mainTeacherSalary" />
 		<result column="assistant_teacher_salary_" property="assistantTeacherSalary" />
@@ -33,8 +33,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO teacher_default_music_group_salary
-		(id_,user_id_,class_group_type_,subject_id_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{classGroupType},#{subjectId},#{mainTeacherSalary},#{assistantTeacherSalary},now(),now())
+		(id_,user_id_,course_schedule_type_,subject_id_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_)
+		VALUES(#{id},#{userId},#{courseScheduleType},#{subjectId},#{mainTeacherSalary},#{assistantTeacherSalary},now(),now())
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -51,8 +51,8 @@
 			<if test="updateTime != null">
 				update_time_ = #{updateTime},
 			</if>
-			<if test="classGroupType != null">
-				class_group_type_ = #{classGroupType},
+			<if test="courseScheduleType != null">
+				course_schedule_type_ = #{courseScheduleType},
 			</if>
 			<if test="mainTeacherSalary != null">
 				main_teacher_salary_ = #{mainTeacherSalary},
@@ -85,6 +85,6 @@
 
 	<!-- 根据user_id 获取老师的默认薪酬 -->
 	<select id="getTeacherSalaryByUserIdAndType" resultMap="TeacherDefaultMusicGroupSalary">
-		SELECT * FROM teacher_default_music_group_salary WHERE user_id_=#{userId} AND class_group_type_ = #{classGroupType}
+		SELECT * FROM teacher_default_music_group_salary WHERE user_id_=#{userId} AND course_schedule_type_ = #{courseScheduleType}
 	</select>
 </mapper>

mec-education/src/main/java/com/ym/mec/education/base/BaseResponse.java

@@ -38,10 +38,24 @@ public class BaseResponse<T> extends Response implements Serializable {
         return baseResponse;
     }
 
+    public static BaseResponse failParams() {
+        BaseResponse baseResponse = new BaseResponse<>();
+        baseResponse.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
+        baseResponse.setMessage(ReturnCodeEnum.CODE_206.getValue());
+        return baseResponse;
+    }
+
+
     public static BaseResponse errorParam(){
         BaseResponse baseResponse = new BaseResponse();
         baseResponse.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
         baseResponse.setMessage(ReturnCodeEnum.CODE_206.getValue());
         return baseResponse;
     }
+    public static BaseResponse noDataExists() {
+        BaseResponse baseResponse = new BaseResponse<>();
+        baseResponse.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
+        baseResponse.setMessage(ReturnCodeEnum.CODE_206.getValue());
+        return baseResponse;
+    }
 }

mec-education/src/main/java/com/ym/mec/education/controller/CourseScheduleController.java

@@ -40,7 +40,7 @@ public class CourseScheduleController {
     }
 
     @PostMapping("/info")
-    @ApiOperation("课程计划详情")
+    @ApiOperation("点名详情-头信息")
     public BaseResponse<CourseScheduleResp> getInfo(@RequestBody CourseScheduleReq courseScheduleReq) {
         return courseScheduleService.getInfo(courseScheduleReq);
     }

mec-education/src/main/java/com/ym/mec/education/controller/HomeWorkController.java

@@ -8,6 +8,8 @@ import com.ym.mec.education.base.BaseResponse;
 import com.ym.mec.education.base.PageResponse;
 import com.ym.mec.education.entity.StudentCourseHomework;
 import com.ym.mec.education.entity.SysUser;
+import com.ym.mec.education.enums.ReturnCodeEnum;
+import com.ym.mec.education.req.HomeWorkDetailReq;
 import com.ym.mec.education.req.HomeWorkReq;
 import com.ym.mec.education.req.MusicGroupReq;
 import com.ym.mec.education.resp.HomeWrokResp;
@@ -17,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,8 +46,6 @@ public class HomeWorkController {
     @Autowired
     private IStudentCourseHomeworkService studentCourseHomeworkService;
 
-    @Autowired
-    private ISysUserService sysUserService;
     /**
      * 服务降级处理
      *
@@ -57,6 +58,7 @@ public class HomeWorkController {
         return response;
     }
 
+
     /**
      *
      * @param req
@@ -67,4 +69,21 @@ public class HomeWorkController {
 
         return studentCourseHomeworkService.workList(req);
     }
+
+
+    /**
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping(value = "/workDetail")
+    public BaseResponse workDetail(@RequestBody HomeWorkDetailReq req) {
+        BaseResponse baseResponse = new BaseResponse();
+        if(req == null || req.getMusicGroupId() == null || req.getClassGroupId() == null || req.getWorkId() == null){
+            baseResponse.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
+            baseResponse.setMessage(ReturnCodeEnum.CODE_206.getValue());
+            return baseResponse;
+        }
+        return studentCourseHomeworkService.getHomeWorkDetail(req);
+    }
 }

mec-education/src/main/java/com/ym/mec/education/controller/StudentAttendanceController.java

@@ -35,13 +35,13 @@ public class StudentAttendanceController {
     }
 
     @PostMapping("/listByCourse")
-    @ApiOperation("根据课程计划查询考勤列表")
+    @ApiOperation("点名详情-考勤列表")
     public PageResponse listByCourse(@RequestBody CourseScheduleReq courseScheduleReq) {
         return studentAttendanceService.getPageByCourse(courseScheduleReq);
     }
 
     @PostMapping("/statisticsList")
-    @ApiOperation("根据课程计划查询考勤统计列表")
+    @ApiOperation("历史考勤统计-考勤列表")
     public PageResponse statisticsList(@RequestBody CourseScheduleReq courseScheduleReq) {
         return studentAttendanceService.statisticsList(courseScheduleReq);
     }

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

@@ -0,0 +1,56 @@
+package com.ym.mec.education.controller;
+
+import com.ym.mec.education.base.BaseResponse;
+import com.ym.mec.education.base.PageResponse;
+import com.ym.mec.education.req.HomeWorkReq;
+import com.ym.mec.education.req.TeacherReq;
+import com.ym.mec.education.service.ITeacherService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import net.bytebuddy.asm.Advice;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * @author : chengp
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月29日 9:54
+ */
+
+@RestController
+@RequestMapping("api/teacher")
+@Api(tags = "老师列表")
+@Slf4j
+public class TeacherController {
+
+    @Autowired
+    private ITeacherService teacherService;
+
+    /**
+     * 服务降级处理
+     *
+     * @return
+     */
+    private BaseResponse defaultFallback() {
+        BaseResponse response = new BaseResponse();
+        response.setReturnCode(500);
+        response.setMessage("太拥挤了, 请稍后再试!");
+        return response;
+    }
+
+
+    /**
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping(value = "/workList")
+    public PageResponse workList(@RequestBody TeacherReq req) {
+
+        return teacherService.teacherList(req);
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupQuit.java

@@ -0,0 +1,124 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+
+/**
+ * @program: mec
+ * @description: 退团
+ * @author: xw
+ * @create: 2019-09-29 12:52
+ */
+public class MusicGroupQuit extends Model<MusicGroupQuit> {
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 学生id
+     */
+    @TableField("user_id_")
+    private Integer userId;
+
+    /**
+     * 乐团编号
+     */
+    @TableField("music_group_id_")
+    private Integer musicGroupId;
+
+    /**
+     * 加入时间
+     */
+    @TableField("join_date_")
+    private Date joinDate;
+
+    /**
+     * 退出时间
+     */
+    @TableField("quit_date_")
+    private Date quitDate;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time_")
+    private Date createTime;
+
+    /**
+     * 原因
+     */
+    @TableField("reason_")
+    private String reason;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Integer getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(Integer musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
+    public Date getJoinDate() {
+        return joinDate;
+    }
+
+    public void setJoinDate(Date joinDate) {
+        this.joinDate = joinDate;
+    }
+
+    public Date getQuitDate() {
+        return quitDate;
+    }
+
+    public void setQuitDate(Date quitDate) {
+        this.quitDate = quitDate;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    @Override
+    public String toString() {
+        return "MusicGroupQuit{" +
+                "id=" + id +
+                ", userId=" + userId +
+                ", musicGroupId=" + musicGroupId +
+                ", joinDate=" + joinDate +
+                ", quitDate=" + quitDate +
+                ", createTime=" + createTime +
+                ", reason='" + reason + '\'' +
+                '}';
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupStudentFee.java

@@ -37,7 +37,21 @@ public class MusicGroupStudentFee extends Model<MusicGroupStudentFee> {
     private Date createTime;
     @TableField("update_time_")
     private Date updateTime;
-
+    /**
+     * 下次缴费日期
+     */
+    @TableField("next_payment_date_")
+    private Date nextPaymentDate;
+    /**
+     * 最近已缴费时间
+     */
+    @TableField("latest_paid_time_")
+    private Date latestPaidTime;
+    /**
+     * 连续旷课次数
+     */
+    @TableField("continuous_absenteeism_times_")
+    private Integer continuousAbsenteeismTimes;
 
     public Long getId() {
         return id;
@@ -93,6 +107,30 @@ public class MusicGroupStudentFee extends Model<MusicGroupStudentFee> {
         return this;
     }
 
+    public Date getNextPaymentDate() {
+        return nextPaymentDate;
+    }
+
+    public void setNextPaymentDate(Date nextPaymentDate) {
+        this.nextPaymentDate = nextPaymentDate;
+    }
+
+    public Date getLatestPaidTime() {
+        return latestPaidTime;
+    }
+
+    public void setLatestPaidTime(Date latestPaidTime) {
+        this.latestPaidTime = latestPaidTime;
+    }
+
+    public Integer getContinuousAbsenteeismTimes() {
+        return continuousAbsenteeismTimes;
+    }
+
+    public void setContinuousAbsenteeismTimes(Integer continuousAbsenteeismTimes) {
+        this.continuousAbsenteeismTimes = continuousAbsenteeismTimes;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -101,12 +139,15 @@ public class MusicGroupStudentFee extends Model<MusicGroupStudentFee> {
     @Override
     public String toString() {
         return "MusicGroupStudentFee{" +
-        ", id=" + id +
-        ", musicGroupId=" + musicGroupId +
-        ", userId=" + userId +
-        ", courseFee=" + courseFee +
-        ", createTime=" + createTime +
-        ", updateTime=" + updateTime +
-        "}";
+                "id=" + id +
+                ", musicGroupId=" + musicGroupId +
+                ", userId=" + userId +
+                ", courseFee=" + courseFee +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", nextPaymentDate=" + nextPaymentDate +
+                ", latestPaidTime=" + latestPaidTime +
+                ", continuousAbsenteeismTimes=" + continuousAbsenteeismTimes +
+                '}';
     }
 }

mec-education/src/main/java/com/ym/mec/education/entity/VipGroup.java

@@ -75,8 +75,8 @@ public class VipGroup extends Model<VipGroup> {
     /**
      * 价格
      */
-    @TableField("price_")
-    private BigDecimal price;
+    @TableField("unit_price_")
+    private BigDecimal unitPrice;
     /**
      * 审核状态
      */
@@ -206,12 +206,12 @@ public class VipGroup extends Model<VipGroup> {
         return this;
     }
 
-    public BigDecimal getPrice() {
-        return price;
+    public BigDecimal getUnitPrice() {
+        return unitPrice;
     }
 
-    public VipGroup setPrice(BigDecimal price) {
-        this.price = price;
+    public VipGroup setUnitPrice(BigDecimal unitPrice) {
+        this.unitPrice = unitPrice;
         return this;
     }
 
@@ -254,7 +254,7 @@ public class VipGroup extends Model<VipGroup> {
         ", registrationStartTime=" + registrationStartTime +
         ", name=" + name +
         ", vipGroupCategoryId=" + vipGroupCategoryId +
-        ", price=" + price +
+        ", unitPrice=" + unitPrice +
         ", auditStatus=" + auditStatus +
         ", organIdList=" + organIdList +
         "}";

mec-education/src/main/java/com/ym/mec/education/mapper/MusicGroupQuitMapper.java

@@ -0,0 +1,13 @@
+package com.ym.mec.education.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ym.mec.education.entity.MusicGroupQuit;
+
+/**
+ * @program: mec
+ * @description: 退团mapper
+ * @author: xw
+ * @create: 2019-09-29 13:02
+ */
+public interface MusicGroupQuitMapper extends BaseMapper<MusicGroupQuit> {
+}

mec-education/src/main/java/com/ym/mec/education/mapper/MusicGroupStudentFeeMapper.java

@@ -1,8 +1,7 @@
 package com.ym.mec.education.mapper;
 
 import com.ym.mec.education.entity.MusicGroupStudentFee;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * <p>
  * 乐团学生费用表 Mapper 接口

mec-education/src/main/java/com/ym/mec/education/mapper/StudentCourseHomeworkReplyMapper.java

@@ -1,7 +1,7 @@
 package com.ym.mec.education.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.education.entity.StudentCourseHomeworkReply;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/mapper/xml/MusicGroupStudentFeeMapper.xml

@@ -10,11 +10,14 @@
         <result column="course_fee_" property="courseFee" />
         <result column="create_time_" property="createTime" />
         <result column="update_time_" property="updateTime" />
+        <result column="next_payment_date_" property="nextPaymentDate" />
+        <result column="latest_paid_time_" property="latestPaidTime" />
+        <result column="continuous_absenteeism_times_" property="continuousAbsenteeismTimes" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id_, music_group_id_, user_id_, course_fee_, create_time_, update_time_
+        id_, music_group_id_, user_id_, course_fee_, create_time_, update_time_, next_payment_date_, latest_paid_time_, continuous_absenteeism_times_
     </sql>
 
 </mapper>

mec-education/src/main/java/com/ym/mec/education/req/HomeWorkDetailReq.java

@@ -0,0 +1,21 @@
+package com.ym.mec.education.req;
+
+import com.ym.mec.education.base.BaseQuery;
+import lombok.Data;
+
+/**
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月25日 20:59
+ */
+@Data
+public class HomeWorkDetailReq extends BaseQuery {
+
+
+    private Integer workId;
+    private String  classGroupId;
+
+    private String musicGroupId;
+
+    private String userId;
+}

mec-education/src/main/java/com/ym/mec/education/req/HomeWorkReq.java

@@ -12,4 +12,8 @@ import lombok.Data;
 public class HomeWorkReq extends BaseQuery {
 
     private String name;
+
+    private String  classGroupId;
+
+    private String musicGroupId;
 }

mec-education/src/main/java/com/ym/mec/education/req/TeacherReq.java

@@ -0,0 +1,17 @@
+package com.ym.mec.education.req;
+
+import com.ym.mec.education.base.BaseQuery;
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月29日 10:02
+ */
+@Data
+@ToString
+public class TeacherReq extends BaseQuery {
+
+    private String name;
+}

mec-education/src/main/java/com/ym/mec/education/resp/CourseScheduleResp.java

@@ -5,9 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,8 +33,7 @@ public class CourseScheduleResp implements Serializable {
     private String teacher;
 
     @ApiModelProperty(value = "最后提交时间")
-    @DateTimeFormat(pattern = "MM-dd HH:mm")
-    private Date lastCommitDate;
+    private String lastCommitDate;
 
     @ApiModelProperty(value = "到课比")
     private String attendanceRate;

mec-education/src/main/java/com/ym/mec/education/resp/HomeWrokDetailResp.java

@@ -0,0 +1,45 @@
+package com.ym.mec.education.resp;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月26日 17:44
+ */
+
+@Data
+@ToString
+public class HomeWrokDetailResp implements Serializable {
+
+    private String name;
+
+    /**
+     * 图像
+     */
+    private String avatar;
+
+    private Integer userId;
+
+    private Integer classGroupId;
+
+    private String isReplied;
+
+    private String status;
+
+    private String remark;
+
+    private Integer score;
+
+    private String attachments;
+
+    private String groupName;
+
+    private String className;
+
+    private List<HomeworkReplyResp> HomeworkReplyList;
+}

mec-education/src/main/java/com/ym/mec/education/resp/HomeWrokResp.java

@@ -36,4 +36,5 @@ public class HomeWrokResp implements Serializable {
     private Integer score;
 
     private String attachments;
+
 }

mec-education/src/main/java/com/ym/mec/education/resp/HomeworkReplyResp.java

@@ -0,0 +1,43 @@
+package com.ym.mec.education.resp;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author : chengp
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月28日 14:11
+ */
+@Data
+@ToString
+public class HomeworkReplyResp implements Serializable {
+
+
+    private Long id;
+    /**
+     * 作业编号
+     */
+    private Long studentCourseHomeworkId;
+    /**
+     * 留言人编号
+     */
+    private Integer userId;
+    /**
+     * 留言内容
+     */
+    private String content;
+
+
+    private Date createTime;
+    /**
+     * 父级编号
+     */
+    private Long parentId;
+
+    private String name;
+    private String avatar;
+}

mec-education/src/main/java/com/ym/mec/education/resp/StudentAttendanceStatisticsResp.java

@@ -22,7 +22,7 @@ public class StudentAttendanceStatisticsResp implements Serializable {
     private String studentName;
 
     @ApiModelProperty(value = "是否连续旷课")
-    private boolean isTruant;
+    private boolean isTruant = false;
 
     @ApiModelProperty(value = "声部名称")
     private List<String> subjectName;

mec-education/src/main/java/com/ym/mec/education/resp/StudentListResp.java

@@ -20,6 +20,6 @@ public class StudentListResp implements Serializable {
     @ApiModelProperty(value = "学员名称",required = true)
     private String studentName;
 
-    @ApiModelProperty(value = "学员迟到情况",required = true)
+    @ApiModelProperty(value = "学员连续迟到情况",required = true)
     private String studentAttendance;
 }

mec-education/src/main/java/com/ym/mec/education/resp/TeacherResp.java

@@ -0,0 +1,24 @@
+package com.ym.mec.education.resp;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月29日 13:45
+ */
+@Data
+@ToString
+public class TeacherResp {
+
+    private String userId;
+
+    private String name;
+
+    private List<String> subjectName;
+
+    private List<String> className;
+}

mec-education/src/main/java/com/ym/mec/education/service/IMusicGroupQuitService.java

@@ -0,0 +1,14 @@
+package com.ym.mec.education.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.education.entity.MusicGroupQuit;
+
+/**
+ * @program: mec
+ * @description: 退团
+ * @author: xw
+ * @create: 2019-09-29 12:52
+ */
+public interface IMusicGroupQuitService extends IService<MusicGroupQuit> {
+
+}

mec-education/src/main/java/com/ym/mec/education/service/IMusicGroupStudentFeeService.java

@@ -1,7 +1,7 @@
 package com.ym.mec.education.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.education.entity.MusicGroupStudentFee;
-import com.baomidou.mybatisplus.service.IService;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/service/IStudentCourseHomeworkReplyService.java

@@ -1,7 +1,7 @@
 package com.ym.mec.education.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.education.entity.StudentCourseHomeworkReply;
-import com.baomidou.mybatisplus.service.IService;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/service/IStudentCourseHomeworkService.java

@@ -1,8 +1,10 @@
 package com.ym.mec.education.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.education.base.BaseResponse;
 import com.ym.mec.education.base.PageResponse;
 import com.ym.mec.education.entity.StudentCourseHomework;
+import com.ym.mec.education.req.HomeWorkDetailReq;
 import com.ym.mec.education.req.HomeWorkReq;
 
 /**
@@ -16,4 +18,6 @@ import com.ym.mec.education.req.HomeWorkReq;
 public interface IStudentCourseHomeworkService extends IService<StudentCourseHomework> {
 
     PageResponse workList(HomeWorkReq req);
+
+    BaseResponse getHomeWorkDetail(HomeWorkDetailReq req);
 }

mec-education/src/main/java/com/ym/mec/education/service/ITeacherService.java

@@ -1,7 +1,9 @@
 package com.ym.mec.education.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.education.base.PageResponse;
 import com.ym.mec.education.entity.Teacher;
+import com.ym.mec.education.req.TeacherReq;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.ym.mec.education.entity.Teacher;
  */
 public interface ITeacherService extends IService<Teacher> {
 
+    PageResponse teacherList(TeacherReq req);
 }

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

@@ -6,22 +6,24 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.ym.mec.education.base.PageResponse;
+import com.ym.mec.education.entity.ClassGroup;
 import com.ym.mec.education.entity.ClassGroupStudentMapper;
-import com.ym.mec.education.entity.StudentAttendance;
+import com.ym.mec.education.entity.MusicGroupStudentFee;
 import com.ym.mec.education.entity.SysUser;
-import com.ym.mec.education.enums.StudentAttendanceStatusEnum;
 import com.ym.mec.education.mapper.ClassGroupStudentMapperMapper;
 import com.ym.mec.education.req.ClassGroupReq;
 import com.ym.mec.education.resp.ClassStudentResp;
 import com.ym.mec.education.resp.StudentListResp;
+import com.ym.mec.education.service.IClassGroupService;
 import com.ym.mec.education.service.IClassGroupStudentMapperService;
-import com.ym.mec.education.service.IStudentAttendanceService;
+import com.ym.mec.education.service.IMusicGroupStudentFeeService;
 import com.ym.mec.education.service.ISysUserService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * <p>
@@ -35,9 +37,11 @@ import java.util.Objects;
 public class ClassGroupStudentMapperServiceImpl extends ServiceImpl<ClassGroupStudentMapperMapper, ClassGroupStudentMapper> implements IClassGroupStudentMapperService {
 
     @Autowired
-    private IStudentAttendanceService studentAttendanceService;
-    @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private IClassGroupService classGroupService;
+    @Autowired
+    private IMusicGroupStudentFeeService musicGroupStudentFeeService;
 
 
     @Override
@@ -45,6 +49,7 @@ public class ClassGroupStudentMapperServiceImpl extends ServiceImpl<ClassGroupSt
         if (Objects.isNull(classGroupReq.getGroupId())) {
             return PageResponse.errorParam();
         }
+        ClassGroup classGroup = classGroupService.getById(classGroupReq.getGroupId());
         Page<ClassGroupStudentMapper> classGroupStudentMapperPage = new Page<ClassGroupStudentMapper>(classGroupReq.getPageNo(), classGroupReq.getPageSize());
         QueryWrapper<ClassGroupStudentMapper> classGroupStudentMapperQueryWrapper = new QueryWrapper<>();
         classGroupStudentMapperQueryWrapper.lambda().eq(true, ClassGroupStudentMapper::getClassGroupId, classGroupReq.getGroupId());
@@ -53,15 +58,17 @@ public class ClassGroupStudentMapperServiceImpl extends ServiceImpl<ClassGroupSt
         BeanUtils.copyProperties(page, studentListRespPage);
         List<StudentListResp> list = Lists.newArrayList();
         page.getRecords().forEach(item -> {
-            QueryWrapper<StudentAttendance> queryWrapper = new QueryWrapper<>();
-            //请假 旷课正常上课次数
-            queryWrapper.lambda().eq(true, StudentAttendance::getUserId, item.getUserId())
-                    .in(true, StudentAttendance::getStatus, StudentAttendanceStatusEnum.TRUANT.getCode(),
-                            StudentAttendanceStatusEnum.LEAVE.getCode());
-            int count = studentAttendanceService.count(queryWrapper);
             SysUser sysUser = sysUserService.getById(item.getUserId());
             StudentListResp studentRegistrationResp = new StudentListResp()
-                    .setStudentName(sysUser.getRealName()).setStudentAttendance("连续缺到" + count + "次");
+                    .setStudentName(sysUser.getRealName());
+            if (Objects.nonNull(classGroup) && Objects.nonNull(classGroup.getMusicGroupId())) {
+                QueryWrapper<MusicGroupStudentFee> musicGroupStudentFeeQueryWrapper = new QueryWrapper<MusicGroupStudentFee>();
+                musicGroupStudentFeeQueryWrapper.lambda().eq(true, MusicGroupStudentFee::getMusicGroupId, classGroup.getMusicGroupId())
+                        .eq(true, MusicGroupStudentFee::getUserId, item.getUserId());
+                MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeService.getOne(musicGroupStudentFeeQueryWrapper);
+                Optional.of(musicGroupStudentFee).ifPresent(groupStudentFee -> studentRegistrationResp.
+                        setStudentAttendance("连续缺到" + groupStudentFee.getContinuousAbsenteeismTimes() + "次"));
+            }
             list.add(studentRegistrationResp);
         });
         studentListRespPage.setRecords(list);

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

@@ -46,6 +46,8 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
     private ISubjectService subjectService;
     @Autowired
     private IStudentAttendanceService studentAttendanceService;
+    @Autowired
+    private IMusicGroupQuitService musicGroupQuitService;
 
     @Override
     public PageResponse getPage(ClassGroupReq classGroupReq) {
@@ -119,7 +121,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
             List<StudentAttendance> studentAttendanceList = studentAttendanceService.list(studentAttendanceQueryWrapper);
             if (!CollectionUtils.isEmpty(studentAttendanceList)) {
                 studentAttendanceList.stream().findFirst().ifPresent(studentAttendance ->
-                        courseScheduleResp.setLastCommitDate(studentAttendance.getCreateTime()));
+                        courseScheduleResp.setLastCommitDate(DateUtil.date2String(studentAttendance.getCreateTime(), DateUtil.DATE_FORMAT_HOUR)));
             }
             QueryWrapper<StudentAttendance> leaveWrapper = new QueryWrapper<>();
             QueryWrapper<StudentAttendance> normalWrapper = new QueryWrapper<>();
@@ -158,7 +160,11 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
                     courseScheduleResp.setStudentNum(classGroup.getStudentNum());
                 }
             }
-            //TODO 暂缺退团人数
+            //退团人数
+            QueryWrapper<MusicGroupQuit> musicGroupQuitQueryWrapper = new QueryWrapper<>();
+            musicGroupQuitQueryWrapper.lambda().eq(true, MusicGroupQuit::getMusicGroupId, classGroup.getMusicGroupId());
+            int leagueNum = musicGroupQuitService.count(musicGroupQuitQueryWrapper);
+            courseScheduleResp.setLeagueNum(leagueNum);
         }
         return BaseResponse.success(courseScheduleResp);
     }

mec-education/src/main/java/com/ym/mec/education/service/impl/MusicGroupQuitServiceImpl.java

@@ -0,0 +1,18 @@
+package com.ym.mec.education.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.education.entity.MusicGroupQuit;
+import com.ym.mec.education.mapper.MusicGroupQuitMapper;
+import com.ym.mec.education.service.IMusicGroupQuitService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @program: mec
+ * @description: 退团实现类
+ * @author: xw
+ * @create: 2019-09-29 12:52
+ */
+@Service("IMusicGroupQuitService")
+public class MusicGroupQuitServiceImpl extends ServiceImpl<MusicGroupQuitMapper, MusicGroupQuit> implements IMusicGroupQuitService {
+
+}

mec-education/src/main/java/com/ym/mec/education/service/impl/MusicGroupStudentFeeServiceImpl.java

@@ -1,9 +1,9 @@
 package com.ym.mec.education.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.education.entity.MusicGroupStudentFee;
 import com.ym.mec.education.mapper.MusicGroupStudentFeeMapper;
 import com.ym.mec.education.service.IMusicGroupStudentFeeService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentAttendanceServiceImpl.java

@@ -21,8 +21,10 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * <p>
@@ -45,10 +47,12 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceM
     private ISysUserService userService;
     @Autowired
     private IClassGroupStudentMapperService classGroupStudentMapperService;
+    @Autowired
+    private IMusicGroupStudentFeeService musicGroupStudentFeeService;
 
     @Override
     public PageResponse getPage(ClassGroupReq classGroupReq) {
-        if (Objects.isNull(classGroupReq.getGroupId())){
+        if (Objects.isNull(classGroupReq.getGroupId())) {
             return PageResponse.errorParam();
         }
         Page<StudentAttendance> pageParam = new Page(classGroupReq.getPageNo(), classGroupReq.getPageSize());
@@ -153,7 +157,16 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceM
                             resp.setStudentName(user.getRealName());
                         }
                         resp.setSubjectName(subjectNameList);
-                        //TODO 暂时缺少是否连续旷课
+                        //是否连续旷课
+                        QueryWrapper<MusicGroupStudentFee> musicGroupStudentFeeQueryWrapper = new QueryWrapper<MusicGroupStudentFee>();
+                        musicGroupStudentFeeQueryWrapper.lambda().eq(true, MusicGroupStudentFee::getMusicGroupId, classGroup.getMusicGroupId())
+                                .eq(true, MusicGroupStudentFee::getUserId, item.getUserId());
+                        MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeService.getOne(musicGroupStudentFeeQueryWrapper);
+                        if (Objects.nonNull(musicGroupStudentFee) && Objects.nonNull(musicGroupStudentFee.getContinuousAbsenteeismTimes())) {
+                            if (musicGroupStudentFee.getContinuousAbsenteeismTimes() > 1) {
+                                resp.setTruant(true);
+                            }
+                        }
                         //到课天数
                         QueryWrapper<StudentAttendance> normalWrapper = new QueryWrapper<>();
                         normalWrapper.lambda().eq(true, StudentAttendance::getCourseScheduleId, courseScheduleReq.getCourseScheduleId())

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentCourseHomeworkReplyServiceImpl.java

@@ -1,9 +1,9 @@
 package com.ym.mec.education.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.education.entity.StudentCourseHomeworkReply;
 import com.ym.mec.education.mapper.StudentCourseHomeworkReplyMapper;
 import com.ym.mec.education.service.IStudentCourseHomeworkReplyService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentCourseHomeworkServiceImpl.java

@@ -4,15 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.education.base.BaseResponse;
 import com.ym.mec.education.base.PageResponse;
-import com.ym.mec.education.entity.StudentCourseHomework;
-import com.ym.mec.education.entity.SysUser;
+import com.ym.mec.education.entity.*;
 import com.ym.mec.education.enums.ReturnCodeEnum;
 import com.ym.mec.education.mapper.StudentCourseHomeworkMapper;
+import com.ym.mec.education.req.HomeWorkDetailReq;
 import com.ym.mec.education.req.HomeWorkReq;
+import com.ym.mec.education.resp.HomeWrokDetailResp;
 import com.ym.mec.education.resp.HomeWrokResp;
-import com.ym.mec.education.service.IStudentCourseHomeworkService;
-import com.ym.mec.education.service.ISysUserService;
+import com.ym.mec.education.resp.HomeworkReplyResp;
+import com.ym.mec.education.service.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,7 +40,14 @@ public class StudentCourseHomeworkServiceImpl extends ServiceImpl<StudentCourseH
     @Autowired
     private ISysUserService sysUserService;
 
+    @Autowired
+    private IClassGroupService classGroupService;
+
+    @Autowired
+    private IMusicGroupService musicGroupService;
 
+    @Autowired
+    private IStudentCourseHomeworkReplyService studentCourseHomeworkReplyService;
 
     @Override
     public PageResponse workList(HomeWorkReq req) {
@@ -87,4 +96,50 @@ public class StudentCourseHomeworkServiceImpl extends ServiceImpl<StudentCourseH
         response.setTotal(Math.toIntExact(homeworkIPage.getTotal()));
         return response;
     }
+
+    /**
+     * 查询作业详情
+     * @param req
+     * @return
+     */
+    @Override
+    public BaseResponse getHomeWorkDetail(HomeWorkDetailReq req) {
+
+        HomeWrokDetailResp resp = new HomeWrokDetailResp();
+        MusicGroup musicGroup = musicGroupService.getById(req.getMusicGroupId());
+        if(musicGroup == null){
+            return  BaseResponse.noDataExists();
+        }
+        ClassGroup classGroup =  classGroupService.getById(req.getClassGroupId());
+        if(classGroup == null){
+            return  BaseResponse.noDataExists();
+        }
+        StudentCourseHomework homework = this.getById(req.getWorkId());
+        if(homework == null){
+            return  BaseResponse.noDataExists();
+        }
+        BeanUtils.copyProperties(homework,resp);
+        resp.setGroupName(musicGroup.getName());
+        resp.setClassName(classGroup.getName());
+
+        //回复留言
+        QueryWrapper<StudentCourseHomeworkReply> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("student_course_homework_id_",req.getWorkId());
+        List<StudentCourseHomeworkReply> replyList = studentCourseHomeworkReplyService.list(queryWrapper);
+        List<HomeworkReplyResp> replyResps = new ArrayList<>();
+        if(!CollectionUtils.isEmpty(replyList)){
+            replyList.forEach(r ->{
+                HomeworkReplyResp replyResp = new HomeworkReplyResp();
+                BeanUtils.copyProperties(r,replyResp);
+                SysUser sysUser = sysUserService.getById(r.getUserId());
+                if(sysUser != null){
+                    replyResp.setName(sysUser.getRealName());
+                    replyResp.setAvatar(sysUser.getAvatar());
+                }
+                replyResps.add(replyResp);
+            });
+            resp.setHomeworkReplyList(replyResps);
+        }
+        return BaseResponse.success(resp);
+    }
 }

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

@@ -1,10 +1,28 @@
 package com.ym.mec.education.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.education.base.PageResponse;
+import com.ym.mec.education.entity.Subject;
+import com.ym.mec.education.entity.SysUser;
 import com.ym.mec.education.entity.Teacher;
 import com.ym.mec.education.mapper.TeacherMapper;
+import com.ym.mec.education.req.TeacherReq;
+import com.ym.mec.education.resp.TeacherResp;
+import com.ym.mec.education.service.ISubjectService;
+import com.ym.mec.education.service.ISysUserService;
 import com.ym.mec.education.service.ITeacherService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -17,4 +35,50 @@ import org.springframework.stereotype.Service;
 @Service("ITeacherService")
 public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> implements ITeacherService {
 
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private ISubjectService subjectService;
+
+    @Override
+    public PageResponse teacherList(TeacherReq req) {
+        PageResponse response = new PageResponse();
+        QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
+        List<SysUser> userList = null;
+        if(req != null && StringUtils.isEmpty(req.getName())){
+            userQueryWrapper.like("real_name_",req.getName());
+            userList = sysUserService.list(userQueryWrapper);
+        }
+        QueryWrapper<Teacher> queryWrapper = new QueryWrapper<>();
+        List<Integer> userIds = null;
+        if(!CollectionUtils.isEmpty(userList)){
+            userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
+            queryWrapper.in("id_",userIds);
+        }
+
+
+        IPage<Teacher> page = new Page(req.getPageNo() == null ? 1 : req.getPageNo(),req.getPageSize() == null ? 10 : req.getPageSize());
+        IPage<Teacher> teacherIPage = this.page(page,queryWrapper);
+
+        List<Teacher> teacherList = teacherIPage.getRecords();
+        List<TeacherResp> teacherRespList = new ArrayList<>();
+        if(!CollectionUtils.isEmpty(teacherList)){
+            teacherList.forEach(e ->{
+                TeacherResp teacherResp = new TeacherResp();
+                String ids[] = e.getSubjectId().split(",");
+                List<String> stringB = Arrays.asList(ids);
+                QueryWrapper<Subject> queryWrapperSub = new QueryWrapper<>();
+                queryWrapperSub.in("id_", stringB);
+                List<Subject> subjectList = subjectService.list(queryWrapperSub);
+                if (!CollectionUtils.isEmpty(subjectList)) {
+                    List<String> subName = subjectList.stream().map(Subject::getName).collect(Collectors.toList());
+                }
+
+            });
+
+        }
+
+        return null;
+    }
 }

mec-education/src/main/java/com/ym/mec/education/utils/DateUtil.java

@@ -19,14 +19,12 @@ public class DateUtil {
     private static final String DATE_FORMAT_CHINESE = "MM月dd日";
     private static final String TIME_FORMAT = "HH:mm";
     public static final String DATE_FORMAT = "MM-dd";
+    public static final String DATE_FORMAT_HOUR = "MM-dd HH:mm";
     private static ThreadLocal<DateFormat> threadLocal = new ThreadLocal<DateFormat>();
 
     public static DateFormat getDateFormat(String dateFormat) {
-        DateFormat df = threadLocal.get();
-        if (df == null) {
-            df = new SimpleDateFormat(dateFormat);
-            threadLocal.set(df);
-        }
+        DateFormat df = new SimpleDateFormat(dateFormat);
+        threadLocal.set(df);
         return df;
     }
 

mec-student/pom.xml

@@ -50,7 +50,13 @@
 			<groupId>com.ym</groupId>
 			<artifactId>mec-biz</artifactId>
 		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>com.ym</groupId>
+            <artifactId>mec-auth-server</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 	<build>
 		<plugins>
 			<plugin>

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

@@ -2,14 +2,17 @@ package com.ym.mec.student.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.page.StudentPayLogQueryInfo;
 import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.security.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -56,4 +59,15 @@ public class CourseController extends BaseController {
         }
         return succeed(classGroupService.get(Integer.parseInt(groupId.substring(2))));
     }
+
+    @ApiOperation(value = "分页获取学员购买记录")
+    @PostMapping("/queryStudentPayLog")
+    public Object queryStudentPayLog(StudentPayLogQueryInfo studentPayLogQueryInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null || sysUser.getId() == null){
+            return failed("获取用户失败");
+        }
+        studentPayLogQueryInfo.setUserId(sysUser.getId());
+        return succeed(classGroupService.queryStudentPayLog(studentPayLogQueryInfo));
+    }
 }

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

@@ -2,16 +2,15 @@ package com.ym.mec.student.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.auth.service.SysUserService;
 import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfo;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
-import com.ym.mec.biz.dal.entity.Subject;
-import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
+import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
 import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.biz.service.SubjectService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -20,7 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 @RequestMapping("register")
 @Api(tags = "乐团注册")
@@ -35,30 +36,49 @@ public class RegisterController extends BaseController {
     private MusicGroupSubjectPlanService musicGroupSubjectPlanService;
     @Resource
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private MusicGroupService musicGroupService;
 
 
     @ApiOperation(value = "新增学生报名信息")
     @PostMapping("/add")
     public Object add(StudentRegistration studentRegistration) {
-        studentRegistrationService.insert(studentRegistration);
-        return succeed(studentRegistration);
+        MusicGroup musicGroup = musicGroupService.get(studentRegistration.getMusicGroupId().toString());
+        studentRegistration.setOrganId(musicGroup.getOrganId());
+        return succeed(studentRegistrationService.addStudent(studentRegistration));
     }
 
-    @ApiOperation(value = "通过乐团编号获取声部列表")
-    @GetMapping("/findSubByMusicGroupId")
+    @ApiOperation(value = "获取乐团报名所需信息")
+    @GetMapping("/getMusicGroupRegInfo")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object findSubByMusicGroupId(Integer musicGroupId) {
-        return succeed(subjectService.findSubByMusicGroupId(musicGroupId));
+    public HttpResponseResult getMusicGroupRegInfo(Integer musicGroupId) {
+        return succeed(musicGroupSubjectPlanService.getMusicGroupRegInfo(musicGroupId));
     }
 
 
-    @ApiOperation(value = "获取乐团声部的乐器和辅件")
+    @ApiOperation(value = "获取乐团声部费用信息及乐器和辅件")
     @GetMapping("/findGoodsGroups")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object findGoodsGroups(Integer musicGroupId) {
+    public HttpResponseResult findGoodsGroups(Integer musicGroupId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         MusicGroupSubjectGoodsAndInfo subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, 1);
         return succeed(subjectGoodsAndInfo);
     }
 
+    @ApiOperation(value = "乐团报名支付")
+    @GetMapping("/pay")
+    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
+    public HttpResponseResult Pay(StudentPaymentOrder studentPaymentOrder) {
+        Map<String, Object> rqMap = new LinkedHashMap<String, Object>();
+        rqMap.put("merNo", "07654478");
+        rqMap.put("version", "v1");
+        rqMap.put("notifyUrl", "https://notify.cpm");
+        rqMap.put("timestamp", new Date().getTime());
+        rqMap.put("apiContent", "ap");
+        rqMap.put("signType", "signType");
+        rqMap.put("sign", "sign");
+        rqMap.put("payUrl", "http://pay.url");
+        return succeed(rqMap);
+    }
+
 }

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

@@ -23,19 +23,21 @@ public class SysUserBankCardController extends BaseController {
     @ApiOperation(value = "新增银行卡信息")
     @PostMapping("/add")
     public Object add(SysUserBankCard sysUserBankCard) {
-        sysUserBankCardService.insert(sysUserBankCard);
-        return succeed();
+        if(sysUserBankCard == null){
+            return failed("参数校验异常");
+        }
+        return sysUserBankCardService.add(sysUserBankCard)?succeed():failed();
     }
 
     @ApiOperation(value = "删除银行卡信息")
-    @PostMapping("/del/{id}")
+    @PostMapping("/del")
     public Object del(@ApiParam(value = "银行卡信息编号", required = true) @PathVariable("id") Long id) {
         sysUserBankCardService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改银行卡信息")
-    @PutMapping("/update")
+    @PostMapping("/update")
     public Object update(SysUserBankCard sysUserBankCard) {
         sysUserBankCard.setModifyOn(new Date());
         sysUserBankCardService.update(sysUserBankCard);

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

@@ -1,20 +1,16 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.biz.dal.entity.ChargeType;
-import com.ym.mec.biz.dal.entity.SysUserCashAccount;
-import com.ym.mec.biz.service.ChargeTypeService;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.service.SysUserCashAccountService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
-import com.ym.mec.common.security.AuthUser;
-import com.ym.mec.common.security.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RequestMapping("userCashAccount")
 @Api(tags = "用户账户服务")
@@ -23,39 +19,19 @@ public class SysUserCashAccountController extends BaseController {
 
     @Autowired
     private SysUserCashAccountService sysUserCashAccountService;
-
-//    @ApiOperation(value = "新增用户账户")
-//    @PostMapping("/add")
-//    public Object add(SysUserCashAccount sysUserCashAccount) {
-//        sysUserCashAccountService.insert(sysUserCashAccount);
-//        return succeed();
-//    }
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "获取用户账户信息")
     @GetMapping("/get")
     public Object add() {
-        AuthUser user = SecurityUtils.getUser();
-        if(user == null){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
             return failed("请重新登录");
         }
-        return succeed(sysUserCashAccountService.get(user.getUserId()));
+        return succeed(sysUserCashAccountService.get(sysUser.getId()));
     }
 
-//    @ApiOperation(value = "删除收费类型")
-//    @PostMapping("/del/{id}")
-//    public Object del(@ApiParam(value = "收费类型编号", required = true) @PathVariable("id") Integer id) {
-//        sysUserCashAccountService.delete(id);
-//        return succeed();
-//    }
-//
-//    @ApiOperation(value = "修改收费类型")
-//    @PostMapping("/update")
-//    public Object update(SysUserCashAccount sysUserCashAccount) {
-//        sysUserCashAccount.setUpdateTime(new Date());
-//        sysUserCashAccountService.update(sysUserCashAccount);
-//        return succeed();
-//    }
-
     @ApiOperation(value = "分页查询收费类型列表")
     @GetMapping("/queryPage")
     public Object queryPage(QueryInfo queryInfo) {