Merge remote-tracking branch 'origin/master'

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

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface MusicGroupPaymentCalenderDetailDao extends BaseDAO<Long, MusicGroupPaymentCalenderDetail> {
 
@@ -113,4 +114,17 @@ public interface MusicGroupPaymentCalenderDetailDao extends BaseDAO<Long, MusicG
 	 * @param musicGroupId
 	 */
 	void deleteByUserIdAndMusicGroupId(@Param("userId") Integer userId, @Param("musicGroupId") String musicGroupId);
+
+	/**
+	 * 根据缴费记录删除缴费详情
+	 * @param id
+	 */
+    void deleteByCalenderId(@Param("id") Long id);
+
+	/**
+	 * 获取缴费详情学员列表
+	 * @param calenderId
+	 * @return
+	 */
+	Set<Integer> queryStudentIds(Long calenderId);
 }

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

@@ -62,6 +62,13 @@ public class DegreeRegistration {
     @ApiModelProperty(value = "乐理级别",required = true)
     private String theoryLevel;
 
+
+    /**
+     * 乐理级别证书
+     */
+    @ApiModelProperty(value = "乐理级别证书",required = true)
+    private String theoryCert;
+
     /**
      * 家长联系电话
      */
@@ -250,4 +257,12 @@ public class DegreeRegistration {
     public void setTheoryMoney(BigDecimal theoryMoney) {
         this.theoryMoney = theoryMoney;
     }
+
+    public String getTheoryCert() {
+        return theoryCert;
+    }
+
+    public void setTheoryCert(String theoryCert) {
+        this.theoryCert = theoryCert;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/PaymentStatusEnum.java

@@ -11,7 +11,7 @@ public enum PaymentStatusEnum implements BaseEnum<Integer, PaymentStatusEnum> {
 
 	private String desc;
 
-	private PaymentStatusEnum(Integer code, String desc) {
+	PaymentStatusEnum(Integer code, String desc) {
 		this.code = code;
 		this.desc = desc;
 	}

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

@@ -0,0 +1,258 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DegreeQueryInfo extends QueryInfo {
+
+    private Integer id;
+
+    /**
+     * 零星支付id
+     */
+    @ApiModelProperty(value = "零星支付id", required = true)
+    private Integer sporadicId;
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty(value = "名字", required = true)
+    private String name;
+
+    /**
+     * 性别
+     */
+    @ApiModelProperty(value = "性别", required = true)
+    private String gender;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(value = "身份证号", required = true)
+    private String idcard;
+
+    /**
+     * 城市
+     */
+    @ApiModelProperty(value = "城市", required = true)
+    private String city;
+
+    /**
+     * 学校
+     */
+    @ApiModelProperty(value = "学校", required = true)
+    private String school;
+
+    /**
+     * 乐器
+     */
+    @ApiModelProperty(value = "乐器", required = true)
+    private String subject;
+
+    /**
+     * 考试级别
+     */
+    @ApiModelProperty(value = "考试级别", required = true)
+    private String level;
+
+    /**
+     * 乐理级别
+     */
+    @ApiModelProperty(value = "乐理级别", required = true)
+    private String theoryLevel;
+
+
+    /**
+     * 乐理级别证书
+     */
+    @ApiModelProperty(value = "乐理级别证书", required = true)
+    private String theoryCert;
+
+    /**
+     * 家长联系电话
+     */
+    @ApiModelProperty(value = "家长联系电话", required = true)
+    private String mobile;
+
+    /**
+     * 考级费用
+     */
+    @ApiModelProperty(value = "收费标准", required = false)
+    private BigDecimal money;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", required = false)
+    private String memo;
+
+    /**
+     * 乐理费用
+     */
+    @ApiModelProperty(value = "乐理费用", required = true)
+    private BigDecimal theoryMoney;
+
+    /**
+     * 报名时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 0-未支付 1-支付中 2-支付中
+     */
+    private Integer status;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getSporadicId() {
+        return sporadicId;
+    }
+
+    public void setSporadicId(Integer sporadicId) {
+        this.sporadicId = sporadicId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getIdcard() {
+        return idcard;
+    }
+
+    public void setIdcard(String idcard) {
+        this.idcard = idcard;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getSchool() {
+        return school;
+    }
+
+    public void setSchool(String school) {
+        this.school = school;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getTheoryLevel() {
+        return theoryLevel;
+    }
+
+    public void setTheoryLevel(String theoryLevel) {
+        this.theoryLevel = theoryLevel;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public BigDecimal getMoney() {
+        return money;
+    }
+
+    public void setMoney(BigDecimal money) {
+        this.money = money;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public BigDecimal getTheoryMoney() {
+        return theoryMoney;
+    }
+
+    public void setTheoryMoney(BigDecimal theoryMoney) {
+        this.theoryMoney = theoryMoney;
+    }
+
+    public String getTheoryCert() {
+        return theoryCert;
+    }
+
+    public void setTheoryCert(String theoryCert) {
+        this.theoryCert = theoryCert;
+    }
+}

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

@@ -58,6 +58,9 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         if (chargeInfo == null) {
             throw new BizException("你选的考试级别不存在");
         }
+        if(chargeInfo.getTitle().equals("二级") && StringUtils.isBlank(degreeRegistration.getTheoryCert())){
+            throw new BizException(chargeInfo.getTitle()+"考试必须上传证书");
+        }
         degreeRegistration.setLevel(chargeInfo.getTitle());
         BigDecimal theoryMoney = BigDecimal.ZERO;
         if(degreeRegistration.getTheoryLevel().equals("一级")){

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

@@ -182,8 +182,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		List<MusicGroupPaymentCalenderDetail> updateMusicGroupPaymentCalenderDetailList = new ArrayList<MusicGroupPaymentCalenderDetail>();
 
 		for (MusicGroupPaymentCalender mgpc : musicGroupPaymentCalenderList) {
-
-			List<MusicGroupStudentFee> musicGroupStudentFeeList = musicGroupStudentFeeDao.queryByMusicGroupId(mgpc.getMusicGroupId(),null);
+			Set<Integer> studentIds = musicGroupPaymentCalenderDetailDao.queryStudentIds(mgpc.getId());
+			List<MusicGroupStudentFee> musicGroupStudentFeeList = musicGroupStudentFeeDao.queryByMusicGroupId(mgpc.getMusicGroupId(),StringUtils.join(studentIds,","));
 			Map<Integer, MusicGroupStudentFee> feeMap = musicGroupStudentFeeList.stream()
 					.collect(Collectors.toMap(MusicGroupStudentFee::getUserId, fee -> fee));
 
@@ -220,7 +220,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				updateMusicGroupPaymentCalenderList.add(mgpc);
 
 				// 学生状态更新进行中
-				Set<Integer> studentIds = new HashSet<Integer>();
+//				Set<Integer> studentIds = new HashSet<Integer>();
 				// 创建缴费明细
 				/*for (MusicGroupStudentFee mgsf : musicGroupStudentFeeList) {
 					if (mgsf.getPaymentStatus() != PaymentStatus.PAID_COMPLETED) {
@@ -369,6 +369,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			throw new BizException("删除失败,缴费状态不匹配");
 		}
 		musicGroupPaymentCalenderDao.delete(id);
+		musicGroupPaymentCalenderDetailDao.deleteByCalenderId(id);
 	}
 
 	@Override

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

@@ -1,126 +1,188 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ym.mec.biz.dal.dao.DegreeRegistrationDao">
-  <resultMap id="DegreeRegistration" type="com.ym.mec.biz.dal.entity.DegreeRegistration">
-    <!--@mbg.generated-->
-    <!--@Table degree_registration-->
-    <id column="id_" jdbcType="INTEGER" property="id" />
-    <result column="sporadic_id_" jdbcType="INTEGER" property="sporadicId" />
-    <result column="name_" jdbcType="VARCHAR" property="name" />
-    <result column="gender_" jdbcType="VARCHAR" property="gender" />
-    <result column="idcard_" jdbcType="VARCHAR" property="idcard" />
-    <result column="city_" jdbcType="VARCHAR" property="city" />
-    <result column="school_" jdbcType="VARCHAR" property="school" />
-    <result column="subject_" jdbcType="VARCHAR" property="subject" />
-    <result column="level_" jdbcType="VARCHAR" property="level" />
-    <result column="theory_level_" jdbcType="VARCHAR" property="theoryLevel" />
-    <result column="theory_money_" jdbcType="DECIMAL" property="theoryMoney" />
-    <result column="mobile_" jdbcType="VARCHAR" property="mobile" />
-    <result column="money_" jdbcType="DECIMAL" property="money" />
-    <result column="memo_" jdbcType="VARCHAR" property="memo" />
-    <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="status_" jdbcType="TINYINT" property="status" />
-  </resultMap>
+    <resultMap id="DegreeRegistration" type="com.ym.mec.biz.dal.entity.DegreeRegistration">
+        <!--@mbg.generated-->
+        <!--@Table degree_registration-->
+        <id column="id_" jdbcType="INTEGER" property="id"/>
+        <result column="sporadic_id_" jdbcType="INTEGER" property="sporadicId"/>
+        <result column="name_" jdbcType="VARCHAR" property="name"/>
+        <result column="gender_" jdbcType="VARCHAR" property="gender"/>
+        <result column="idcard_" jdbcType="VARCHAR" property="idcard"/>
+        <result column="city_" jdbcType="VARCHAR" property="city"/>
+        <result column="school_" jdbcType="VARCHAR" property="school"/>
+        <result column="subject_" jdbcType="VARCHAR" property="subject"/>
+        <result column="level_" jdbcType="VARCHAR" property="level"/>
+        <result column="theory_level_" jdbcType="VARCHAR" property="theoryLevel"/>
+        <result column="theory_money_" jdbcType="DECIMAL" property="theoryMoney"/>
+        <result column="theory_cert_" jdbcType="VARCHAR" property="theoryCert"/>
+        <result column="mobile_" jdbcType="VARCHAR" property="mobile"/>
+        <result column="money_" jdbcType="DECIMAL" property="money"/>
+        <result column="memo_" jdbcType="VARCHAR" property="memo"/>
+        <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="status_" jdbcType="TINYINT" property="status"/>
+    </resultMap>
 
-  <select id="get" parameterType="java.lang.Integer" resultMap="DegreeRegistration">
-    select * from degree_registration where id_ = #{id,jdbcType=INTEGER}
-  </select>
+    <select id="get" parameterType="java.lang.Integer" resultMap="DegreeRegistration">
+        select *
+        from degree_registration
+        where id_ = #{id,jdbcType=INTEGER}
+    </select>
 
-  <!-- 全查询 -->
-  <select id="findAll" resultMap="DegreeRegistration">
-    SELECT *
-    FROM degree_registration
-    ORDER BY id_
-  </select>
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="DegreeRegistration">
+        SELECT *
+        FROM degree_registration
+        ORDER BY id_
+    </select>
 
-  <!-- 分页查询 -->
-  <select id="queryPage" resultMap="DegreeRegistration" parameterType="map">
-    SELECT * FROM degree_registration ORDER BY id_ <include refid="global.limit"/>
-  </select>
+    <sql id="queryPageSql">
+        <where>
+            <if test="status != null">
+                AND status_= #{status}
+            </if>
+            <if test="id != null">
+                AND id_ = #{id}
+            </if>
+            <if test="search != null and search != ''">
+                AND (id_ = #{search} OR name_ LIKE CONCAT('%',#{search},'%') )
+            </if>
+            <if test="name != null">
+                AND name_ = #{name}
+            </if>
+            <if test="idcard != null">
+                AND idcard_ = #{idcard}
+            </if>
+            <if test="school != null">
+                AND school_ LIKE CONCAT('%', #{school},'%')
+            </if>
+            <if test="city != null">
+                AND city_ LIKE CONCAT('%', #{city},'%')
+            </if>
+            <if test="subject != null">
+                AND subject_= #{subject}
+            </if>
+            <if test="subject != null">
+                AND subject_= #{subject}
+            </if>
+            <if test="mobile != null">
+                AND mobile_= #{mobile}
+            </if>
+            <if test="level != null">
+                AND level_= #{level}
+            </if>
+            <if test="level != null">
+                AND level_= #{level}
+            </if>
+        </where>
+    </sql>
 
-  <!-- 查询当前表的总记录数 -->
-  <select id="queryCount" resultType="int">
-    SELECT COUNT(*) FROM degree_registration
-  </select>
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="DegreeRegistration" parameterType="map">
+        SELECT * FROM degree_registration
+        <include refid="queryPageSql"/>
+        <include refid="global.limit"/>
+    </select>
 
-  <delete id="delete" parameterType="java.lang.Integer">
-    delete from degree_registration
-    where id_ = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.DegreeRegistration" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into degree_registration (sporadic_id_, name_, gender_, 
-      idcard_, city_, school_, 
-      subject_,level_, theory_level_,theory_money_, mobile_,
-      money_, memo_, create_time_, 
-      update_time_, status_)
-    values (#{sporadicId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{gender,jdbcType=VARCHAR}, 
-      #{idcard,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{school,jdbcType=VARCHAR}, 
-      #{subject,jdbcType=VARCHAR},#{level,jdbcType=VARCHAR}, #{theoryLevel,jdbcType=VARCHAR},#{theoryMoney,jdbcType=DECIMAL}, #{mobile,jdbcType=VARCHAR},
-      #{money,jdbcType=DECIMAL}, #{memo,jdbcType=VARCHAR}, #{createTime},
-      #{updateTime}, #{status,jdbcType=TINYINT})
-  </insert>
-  <update id="update" parameterType="com.ym.mec.biz.dal.entity.DegreeRegistration">
-    <!--@mbg.generated-->
-    update degree_registration
-    <set>
-      <if test="sporadicId != null">
-        sporadic_id_ = #{sporadicId,jdbcType=INTEGER},
-      </if>
-      <if test="name != null">
-        name_ = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="gender != null">
-        gender_ = #{gender,jdbcType=VARCHAR},
-      </if>
-      <if test="idcard != null">
-        idcard_ = #{idcard,jdbcType=VARCHAR},
-      </if>
-      <if test="city != null">
-        city_ = #{city,jdbcType=VARCHAR},
-      </if>
-      <if test="school != null">
-        school_ = #{school,jdbcType=VARCHAR},
-      </if>
-      <if test="subject != null">
-        subject_ = #{subject,jdbcType=VARCHAR},
-      </if>
-      <if test="level != null">
-        level_ = #{level,jdbcType=VARCHAR},
-      </if>
-      <if test="theoryLevel != null">
-        theory_level_ = #{theoryLevel,jdbcType=VARCHAR},
-      </if>
-      <if test="theoryLevel != null">
-        theory_money_ = #{theoryMoney,jdbcType=DECIMAL},
-      </if>
-      <if test="mobile != null">
-        mobile_ = #{mobile,jdbcType=VARCHAR},
-      </if>
-      <if test="money != null">
-        money_ = #{money,jdbcType=DECIMAL},
-      </if>
-      <if test="memo != null">
-        memo_ = #{memo,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time_ = #{createTime},
-      </if>
-      <if test="updateTime != null">
-        update_time_ = #{updateTime},
-      </if>
-      <if test="status != null">
-        status_ = #{status,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id_ = #{id,jdbcType=INTEGER}
-  </update>
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
+        SELECT COUNT(*)
+        FROM degree_registration
+        <include refid="queryPageSql"/>
+    </select>
 
-  <select id="findByMobileAndSporadicId" resultMap="DegreeRegistration">
-    SELECT * FROM degree_registration WHERE mobile_ = #{mobile} AND sporadic_id_ = #{sporadicId} FOR UPDATE
-  </select>
-  <select id="getLock" resultMap="DegreeRegistration">
-    SELECT * FROM degree_registration WHERE id_ = #{id} FOR UPDATE
-  </select>
+    <delete id="delete" parameterType="java.lang.Integer">
+        delete
+        from degree_registration
+        where id_ = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.DegreeRegistration"
+            useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into degree_registration (sporadic_id_, name_, gender_,
+        idcard_, city_, school_,
+        subject_,level_, theory_level_,theory_money_, theory_cert_,mobile_,
+        money_, memo_, create_time_,
+        update_time_, status_)
+        values (#{sporadicId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{gender,jdbcType=VARCHAR},
+        #{idcard,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{school,jdbcType=VARCHAR},
+        #{subject,jdbcType=VARCHAR},#{level,jdbcType=VARCHAR},
+        #{theoryLevel,jdbcType=VARCHAR},#{theoryMoney,jdbcType=DECIMAL},
+        #{theoryLevel,jdbcType=VARCHAR}#{mobile,jdbcType=VARCHAR},#{money,jdbcType=DECIMAL}, #{memo,jdbcType=VARCHAR},
+        #{createTime},
+        #{updateTime}, #{status,jdbcType=TINYINT})
+    </insert>
+    <update id="update" parameterType="com.ym.mec.biz.dal.entity.DegreeRegistration">
+        <!--@mbg.generated-->
+        update degree_registration
+        <set>
+            <if test="sporadicId != null">
+                sporadic_id_ = #{sporadicId,jdbcType=INTEGER},
+            </if>
+            <if test="name != null">
+                name_ = #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="gender != null">
+                gender_ = #{gender,jdbcType=VARCHAR},
+            </if>
+            <if test="idcard != null">
+                idcard_ = #{idcard,jdbcType=VARCHAR},
+            </if>
+            <if test="city != null">
+                city_ = #{city,jdbcType=VARCHAR},
+            </if>
+            <if test="school != null">
+                school_ = #{school,jdbcType=VARCHAR},
+            </if>
+            <if test="subject != null">
+                subject_ = #{subject,jdbcType=VARCHAR},
+            </if>
+            <if test="level != null">
+                level_ = #{level,jdbcType=VARCHAR},
+            </if>
+            <if test="theoryLevel != null">
+                theory_level_ = #{theoryLevel,jdbcType=VARCHAR},
+            </if>
+            <if test="theoryLevel != null">
+                theory_money_ = #{theoryMoney,jdbcType=DECIMAL},
+            </if>
+            <if test="theoryLevel != null">
+                theory_cert_ = #{theoryCert,jdbcType=VARCHAR},
+            </if>
+            <if test="mobile != null">
+                mobile_ = #{mobile,jdbcType=VARCHAR},
+            </if>
+            <if test="money != null">
+                money_ = #{money,jdbcType=DECIMAL},
+            </if>
+            <if test="memo != null">
+                memo_ = #{memo,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="status != null">
+                status_ = #{status,jdbcType=INTEGER},
+            </if>
+        </set>
+        where id_ = #{id,jdbcType=INTEGER}
+    </update>
+
+    <select id="findByMobileAndSporadicId" resultMap="DegreeRegistration">
+        SELECT *
+        FROM degree_registration
+        WHERE mobile_ = #{mobile}
+          AND sporadic_id_ = #{sporadicId} FOR
+        UPDATE
+    </select>
+    <select id="getLock" resultMap="DegreeRegistration">
+        SELECT *
+        FROM degree_registration
+        WHERE id_ = #{id} FOR
+        UPDATE
+    </select>
 </mapper>

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

@@ -163,8 +163,12 @@
 		WHERE mgpc.music_group_id_ = #{musicGroupId} AND mgpc.payment_status_ != 2)
 		AND user_id_ = #{userId} AND payment_status_ = 'NON_PAYMENT'
 	</delete>
+    <delete id="deleteByCalenderId">
+		DELETE FROM music_group_payment_calender_detail
+		WHERE music_group_payment_calender_id_ = #{id} AND payment_status_ = 'NON_PAYMENT'
+	</delete>
 
-	<!-- 分页查询 -->
+    <!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentCalenderDetail"
 		parameterType="map">
 		SELECT mgpcd.*,su.username_,su.phone_,st.name_ subject_names_,sr.music_group_status_
@@ -283,4 +287,7 @@
 		LEFT JOIN music_group_payment_calender_detail mgpcd ON mgpc.id_ = mgpcd.music_group_payment_calender_id_
 		WHERE DATE_FORMAT(mgpc.create_time_,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d') AND mgpc.payment_status_ = 1 AND mgpcd.payment_status_ = 'NON_PAYMENT'
 	</select>
+	<select id="queryStudentIds" resultType="java.lang.Integer">
+		SELECT user_id_ FROM music_group_payment_calender_detail WHERE music_group_payment_calender_id_ = #{calenderId}
+	</select>
 </mapper>

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

@@ -421,8 +421,8 @@
         <result property="currentGrade" column="current_grade_"/>
         <result property="currentClass" column="current_class_"/>
         <result property="subjectName" column="subject_name_"/>
-        <result property="studentStatus" column="music_group_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="paymentStatus" column="payment_status_"/>
+        <result property="studentStatus" column="student_status_"/>
+        <result property="paymentStatus" column="payment_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="musicGroupId" column="music_group_id_"/>
         <result property="isNewStudent" column="is_new_student_"/>
         <result property="courseFee" column="course_fee_"/>
@@ -433,7 +433,7 @@
     </resultMap>
     <select id="queryMusicGroupStudent" resultMap="MusicGroupStudentsDto">
         SELECT sr.user_id_,su.username_ real_name_,su.gender_,su.phone_ parents_phone_,sr.current_grade_,
-        sr.current_class_,sr.music_group_status_,sr.payment_status_,
+        sr.current_class_,sr.music_group_status_ student_status_,sr.payment_status_,
         s.name_ subject_name_,sr.music_group_id_,case when su.password_ is null then 0 else 1 end isActive_,
         IF(DATE_FORMAT(sr.create_time_,'%Y-%m-%d') > DATE_FORMAT(mg.payment_expire_date_,'%Y-%m-%d'),1,0) is_new_student_
         FROM student_registration sr

mec-im/src/main/java/com/ym/mec/im/IMHelper.java

@@ -288,7 +288,7 @@ public class IMHelper {
         sb.append("&content=").append(URLEncoder.encode(msgStr, UTF8));
 
         if (pushContent != null) {
-            sb.append("&pushContent=").append(URLEncoder.encode(pushContent.toString(), UTF8));
+            sb.append("&pushContent=").append(URLEncoder.encode(pushContent, UTF8));
         }
 
         if (pushData != null) {

mec-im/src/main/java/com/ym/mec/im/message/MetronomeMessageMessage.java

@@ -28,6 +28,7 @@ public class MetronomeMessageMessage extends BaseMessage {
         return "{\"enable\":" + content.getEnable() +
                 ", \"customType\":" + content.getCustomType() +
                 ", \"rate\":" + content.getRate() +
+                ", \"playVolume\":" + content.getPlayVolume() +
                 ", \"userId\":" + (StringUtils.isEmpty(content.getUserId())?"\"\"":"\"" + content.getUserId() + "\"") +
                 '}';
     }

mec-im/src/main/java/com/ym/pojo/CustomMessage.java

@@ -7,8 +7,17 @@ public class CustomMessage extends BaseMessage {
     private Boolean enable;
     private int customType;
     private int rate;
+    private int playVolume;
     private String userId;
 
+    public int getPlayVolume() {
+        return playVolume;
+    }
+
+    public void setPlayVolume(int playVolume) {
+        this.playVolume = playVolume;
+    }
+
     public Boolean getEnable() {
         return enable;
     }
@@ -51,6 +60,7 @@ public class CustomMessage extends BaseMessage {
         return "{\"enable\":" + enable +
                 ", \"customType\":" + customType +
                 ", \"rate\":" + rate +
+                ", \"playVolume\":" + playVolume +
                 ", \"userId\":" + (StringUtils.isEmpty(userId)?"\"\"":"\"" + userId + "\"") +
                 '}';
     }

mec-web/src/main/java/com/ym/mec/web/controller/education/DegreeController.java

@@ -0,0 +1,60 @@
+package com.ym.mec.web.controller.education;
+
+
+import com.ym.mec.biz.dal.dao.DegreeRegistrationDao;
+import com.ym.mec.biz.dal.dao.SporadicChargeInfoDao;
+import com.ym.mec.biz.dal.entity.DegreeRegistration;
+import com.ym.mec.biz.dal.entity.SporadicChargeInfo;
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
+import com.ym.mec.biz.dal.page.DegreeQueryInfo;
+import com.ym.mec.biz.dal.page.SporadicChargeInfoQueryInfo;
+import com.ym.mec.biz.service.DegreeRegistrationService;
+import com.ym.mec.biz.service.SporadicChargeInfoService;
+import com.ym.mec.biz.service.StudentPaymentOrderService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.util.idcard.IdcardValidator;
+import com.ym.mec.util.validator.CommonValidator;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+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;
+
+import java.util.Map;
+
+@RequestMapping("degree")
+@Api(tags = "级报名服务")
+@RestController
+public class DegreeController extends BaseController {
+
+    @Autowired
+    private StudentPaymentOrderService studentPaymentOrderService;
+
+    @Autowired
+    private DegreeRegistrationDao degreeRegistrationDao;
+
+    @Autowired
+    private DegreeRegistrationService degreeRegistrationService;
+
+    @Autowired
+    private SporadicChargeInfoDao sporadicChargeInfoDao;
+
+    @Autowired
+    private SporadicChargeInfoService sporadicChargeInfoService;
+
+
+    @ApiOperation(value = "查询收费列表")
+    @GetMapping("/queryPage")
+    public HttpResponseResult queryPage(DegreeQueryInfo queryInfo) {
+        queryInfo.setStatus(2);
+        return succeed(degreeRegistrationService.queryPage(queryInfo));
+    }
+
+}