add 增加查询缴费用户的信息

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

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.SubjectChange;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface SubjectChangeDao extends BaseDAO<Integer, SubjectChange> {
+
+}

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

@@ -0,0 +1,230 @@
+package com.ym.mec.biz.dal.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="com-ym-SubjectChange")
+public class SubjectChange {
+    @ApiModelProperty(value="")
+    private Integer id;
+
+    /**
+    * 原始课程费用
+    */
+    @ApiModelProperty(value="原始课程费用")
+    private BigDecimal originalCourseFee;
+
+    /**
+    * 原始乐器编号
+    */
+    @ApiModelProperty(value="原始乐器编号")
+    private Integer originalMusical;
+
+    /**
+    * 原始乐器价格
+    */
+    @ApiModelProperty(value="原始乐器价格")
+    private BigDecimal originalMusicalPrice;
+
+    /**
+    * 辅件ids
+    */
+    @ApiModelProperty(value="辅件ids")
+    private String originalAccessories;
+
+    /**
+    * 辅件价格
+    */
+    @ApiModelProperty(value="辅件价格")
+    private BigDecimal originalAccessoriesPrice;
+
+    /**
+    * 替换课程价格
+    */
+    @ApiModelProperty(value="替换课程价格")
+    private BigDecimal changeCourseFee;
+
+    /**
+    * 替换乐器
+    */
+    @ApiModelProperty(value="替换乐器")
+    private Integer changeMusical;
+
+    /**
+    * 替换乐器价格
+    */
+    @ApiModelProperty(value="替换乐器价格")
+    private Long changeMusicalPrice;
+
+    /**
+    * 替换辅件
+    */
+    @ApiModelProperty(value="替换辅件")
+    private String changeAccessories;
+
+    /**
+    * 替换辅件价格
+    */
+    @ApiModelProperty(value="替换辅件价格")
+    private BigDecimal changeAccessoriesPrice;
+
+    /**
+    * 乐器辅件差额
+    */
+    @ApiModelProperty(value="乐器辅件差额")
+    private BigDecimal goodsMargin;
+
+    /**
+    * 课程差额
+    */
+    @ApiModelProperty(value="课程差额")
+    private BigDecimal courseMargin;
+
+    /**
+    * 状态
+    */
+    @ApiModelProperty(value="状态")
+    private Integer status;
+
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty(value="修改时间")
+    private Date updateTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public BigDecimal getOriginalCourseFee() {
+        return originalCourseFee;
+    }
+
+    public void setOriginalCourseFee(BigDecimal originalCourseFee) {
+        this.originalCourseFee = originalCourseFee;
+    }
+
+    public Integer getOriginalMusical() {
+        return originalMusical;
+    }
+
+    public void setOriginalMusical(Integer originalMusical) {
+        this.originalMusical = originalMusical;
+    }
+
+    public BigDecimal getOriginalMusicalPrice() {
+        return originalMusicalPrice;
+    }
+
+    public void setOriginalMusicalPrice(BigDecimal originalMusicalPrice) {
+        this.originalMusicalPrice = originalMusicalPrice;
+    }
+
+    public String getOriginalAccessories() {
+        return originalAccessories;
+    }
+
+    public void setOriginalAccessories(String originalAccessories) {
+        this.originalAccessories = originalAccessories;
+    }
+
+    public BigDecimal getOriginalAccessoriesPrice() {
+        return originalAccessoriesPrice;
+    }
+
+    public void setOriginalAccessoriesPrice(BigDecimal originalAccessoriesPrice) {
+        this.originalAccessoriesPrice = originalAccessoriesPrice;
+    }
+
+    public BigDecimal getChangeCourseFee() {
+        return changeCourseFee;
+    }
+
+    public void setChangeCourseFee(BigDecimal changeCourseFee) {
+        this.changeCourseFee = changeCourseFee;
+    }
+
+    public Integer getChangeMusical() {
+        return changeMusical;
+    }
+
+    public void setChangeMusical(Integer changeMusical) {
+        this.changeMusical = changeMusical;
+    }
+
+    public Long getChangeMusicalPrice() {
+        return changeMusicalPrice;
+    }
+
+    public void setChangeMusicalPrice(Long changeMusicalPrice) {
+        this.changeMusicalPrice = changeMusicalPrice;
+    }
+
+    public String getChangeAccessories() {
+        return changeAccessories;
+    }
+
+    public void setChangeAccessories(String changeAccessories) {
+        this.changeAccessories = changeAccessories;
+    }
+
+    public BigDecimal getChangeAccessoriesPrice() {
+        return changeAccessoriesPrice;
+    }
+
+    public void setChangeAccessoriesPrice(BigDecimal changeAccessoriesPrice) {
+        this.changeAccessoriesPrice = changeAccessoriesPrice;
+    }
+
+    public BigDecimal getGoodsMargin() {
+        return goodsMargin;
+    }
+
+    public void setGoodsMargin(BigDecimal goodsMargin) {
+        this.goodsMargin = goodsMargin;
+    }
+
+    public BigDecimal getCourseMargin() {
+        return courseMargin;
+    }
+
+    public void setCourseMargin(BigDecimal courseMargin) {
+        this.courseMargin = courseMargin;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    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;
+    }
+}

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

@@ -258,4 +258,12 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
 	 * @return
 	 */
 	List<StudentPaymentOrderDetail> getStudentApplyDetail(Integer studentId,String musicGroupId);
+
+	/**
+	 * 获取乐团声部费用信息及乐器和辅件
+	 * @param musicGroupId
+	 * @param subjectId
+	 * @return
+	 */
+	MusicGroupSubjectGoodsAndInfoDto getSubjectGoodsAndInfo(String musicGroupId, Integer subjectId);
 }

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

@@ -2097,12 +2097,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 boolean isTeacherRepeat = false;
                 boolean isStudentRepeat = false;
                 //检测老师冲突
-                if (courseScheduleTeacherMap.containsKey(existCourseSchedule.getId().intValue())) {
-                    existCourseSchedule.setTeachingTeacherIdList(courseScheduleTeacherMap.get(existCourseSchedule.getId().intValue()).getIds());
+                if (courseScheduleTeacherMap.containsKey(existCourseSchedule.getId())) {
+                    existCourseSchedule.setTeachingTeacherIdList(courseScheduleTeacherMap.get(existCourseSchedule.getId()).getIds());
                 } else {
-                    existCourseSchedule.setTeachingTeacherIdList(classGroupTeachingTeacherMap.get(existCourseSchedule.getClassGroupId()).getIds());
+                    existCourseSchedule.setTeachingTeacherIdList(classGroupTeachingTeacherMap.get(existCourseSchedule.getClassGroupId().longValue()).getIds());
                 }
-                newCourseSchedule.setTeachingTeacherIdList(classGroupTeachingTeacherMap.get(newCourseSchedule.getClassGroupId()).getIds());
+                newCourseSchedule.setTeachingTeacherIdList(classGroupTeachingTeacherMap.get(newCourseSchedule.getClassGroupId().longValue()).getIds());
 
                 if (!CollectionUtils.isEmpty(newCourseSchedule.getTeachingTeacherIdList())
                         && !CollectionUtils.isEmpty(existCourseSchedule.getTeachingTeacherIdList())) {

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

@@ -1120,4 +1120,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     public List<StudentPaymentOrderDetail> getStudentApplyDetail(Integer studentId, String musicGroupId) {
         return studentPaymentOrderDetailDao.getStudentApplyDetail(studentId, musicGroupId);
     }
+
+    @Override
+    public MusicGroupSubjectGoodsAndInfoDto getSubjectGoodsAndInfo(String musicGroupId, Integer subjectId) {
+        MusicGroupSubjectGoodsAndInfoDto subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, subjectId);
+        return null;
+    }
 }

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

@@ -0,0 +1,108 @@
+<?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.SubjectChangeDao">
+    <resultMap id="SubjectChange" type="com.ym.mec.biz.dal.entity.SubjectChange">
+        <!--@mbg.generated-->
+        <!--@Table subject_change-->
+        <id column="id_" property="id"/>
+        <result column="original_course_fee_" property="originalCourseFee"/>
+        <result column="original_musical_" property="originalMusical"/>
+        <result column="original_musical_price_" property="originalMusicalPrice"/>
+        <result column="original_accessories_" property="originalAccessories"/>
+        <result column="original_accessories_price_" property="originalAccessoriesPrice"/>
+        <result column="change_course_fee_" property="changeCourseFee"/>
+        <result column="change_musical_" property="changeMusical"/>
+        <result column="change_musical_price_" property="changeMusicalPrice"/>
+        <result column="change_accessories_" property="changeAccessories"/>
+        <result column="change_accessories_price_" property="changeAccessoriesPrice"/>
+        <result column="goods_margin_" property="goodsMargin"/>
+        <result column="course_margin_" property="courseMargin"/>
+        <result column="status_" property="status"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        id_, original_course_fee_, original_musical_, original_musical_price_, original_accessories_,
+        original_accessories_price_, change_course_fee_, change_musical_, change_musical_price_,
+        change_accessories_, change_accessories_price_, goods_margin_, course_margin_, status_,
+        create_time_, update_time
+    </sql>
+    <select id="get" parameterType="java.lang.Integer" resultMap="SubjectChange">
+        <!--@mbg.generated-->
+        select
+        <include refid="Base_Column_List"/>
+        from subject_change
+        where id_ = #{id}
+    </select>
+    <delete id="delete" parameterType="java.lang.Integer">
+        <!--@mbg.generated-->
+        delete from subject_change
+        where id_ = #{id}
+    </delete>
+    <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.SubjectChange"
+            useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into subject_change (original_course_fee_, original_musical_, original_musical_price_,
+        original_accessories_,
+        original_accessories_price_, change_course_fee_, change_musical_, change_musical_price_,
+        change_accessories_, change_accessories_price_, goods_margin_, course_margin_,
+        status_, create_time_, update_time)
+        values (#{originalCourseFee}, #{originalMusical}, #{originalMusicalPrice}, #{originalAccessories},
+        #{originalAccessoriesPrice}, #{changeCourseFee}, #{changeMusical}, #{changeMusicalPrice},
+        #{changeAccessories}, #{changeAccessoriesPrice}, #{goodsMargin}, #{courseMargin},
+        #{status}, #{createTime}, #{updateTime})
+    </insert>
+    <update id="update" parameterType="com.ym.mec.biz.dal.entity.SubjectChange">
+        <!--@mbg.generated-->
+        update subject_change
+        <set>
+            <if test="originalCourseFee != null">
+                original_course_fee_ = #{originalCourseFee},
+            </if>
+            <if test="originalMusical != null">
+                original_musical_ = #{originalMusical},
+            </if>
+            <if test="originalMusicalPrice != null">
+                original_musical_price_ = #{originalMusicalPrice},
+            </if>
+            <if test="originalAccessories != null">
+                original_accessories_ = #{originalAccessories},
+            </if>
+            <if test="originalAccessoriesPrice != null">
+                original_accessories_price_ = #{originalAccessoriesPrice},
+            </if>
+            <if test="changeCourseFee != null">
+                change_course_fee_ = #{changeCourseFee},
+            </if>
+            <if test="changeMusical != null">
+                change_musical_ = #{changeMusical},
+            </if>
+            <if test="changeMusicalPrice != null">
+                change_musical_price_ = #{changeMusicalPrice},
+            </if>
+            <if test="changeAccessories != null">
+                change_accessories_ = #{changeAccessories},
+            </if>
+            <if test="changeAccessoriesPrice != null">
+                change_accessories_price_ = #{changeAccessoriesPrice},
+            </if>
+            <if test="goodsMargin != null">
+                goods_margin_ = #{goodsMargin},
+            </if>
+            <if test="courseMargin != null">
+                course_margin_ = #{courseMargin},
+            </if>
+            <if test="status != null">
+                status_ = #{status},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime},
+            </if>
+        </set>
+        where id_ = #{id}
+    </update>
+</mapper>