add 查询6.1活动费用信息

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

@@ -0,0 +1,18 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.DegreeLevelFee;
+import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface DegreeLevelFeeDao extends BaseDAO<Long, DegreeLevelFee> {
+
+    /**
+     * 获取所有等级的报名费用
+     *
+     * @return
+     */
+    List<DegreeLevelFee> getAll();
+
+}

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

@@ -0,0 +1,17 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.OrganizationDegreeCourseFee;
+import com.ym.mec.common.dal.BaseDAO;
+
+import java.util.List;
+
+public interface OrganizationDegreeCourseFeeDao extends BaseDAO<Long, OrganizationDegreeCourseFee> {
+
+    /**
+     * 获取考级的课程费用
+     *
+     * @param organId
+     * @return
+     */
+    OrganizationDegreeCourseFee getByOrganId(Integer organId);
+}

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

@@ -0,0 +1,32 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.DegreeLevelFee;
+import com.ym.mec.biz.dal.entity.OrganizationDegreeCourseFee;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+public class DegreeFeeDto {
+
+    @ApiModelProperty(value = "考级费用")
+    private List<DegreeLevelFee> degreeLevelFee;
+
+    @ApiModelProperty(value = "考级教程费用")
+    private OrganizationDegreeCourseFee organizationDegreeCourseFee;
+
+    public OrganizationDegreeCourseFee getOrganizationDegreeCourseFee() {
+        return organizationDegreeCourseFee;
+    }
+
+    public void setOrganizationDegreeCourseFee(OrganizationDegreeCourseFee organizationDegreeCourseFee) {
+        this.organizationDegreeCourseFee = organizationDegreeCourseFee;
+    }
+
+    public List<DegreeLevelFee> getDegreeLevelFee() {
+        return degreeLevelFee;
+    }
+
+    public void setDegreeLevelFee(List<DegreeLevelFee> degreeLevelFee) {
+        this.degreeLevelFee = degreeLevelFee;
+    }
+}

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

@@ -0,0 +1,106 @@
+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-domain-DegreeLevelFee")
+public class DegreeLevelFee {
+    @ApiModelProperty(value="")
+    private Integer id;
+
+    /**
+    * 等级
+    */
+    @ApiModelProperty(value="等级")
+    private Integer level;
+
+    /**
+    * 乐器考级费用
+    */
+    @ApiModelProperty(value="乐器考级费用")
+    private BigDecimal grade;
+
+    /**
+    * 乐理费用
+    */
+    @ApiModelProperty(value="乐理费用")
+    private BigDecimal theory;
+
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty(value="修改时间")
+    private Date updateTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    public BigDecimal getGrade() {
+        return grade;
+    }
+
+    public void setGrade(BigDecimal grade) {
+        this.grade = grade;
+    }
+
+    public BigDecimal getTheory() {
+        return theory;
+    }
+
+    public void setTheory(BigDecimal theory) {
+        this.theory = theory;
+    }
+
+    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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", level=").append(level);
+        sb.append(", grade=").append(grade);
+        sb.append(", theory=").append(theory);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,106 @@
+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-domain-OrganizationDegreeCourseFee")
+public class OrganizationDegreeCourseFee {
+    @ApiModelProperty(value="")
+    private Integer id;
+
+    /**
+    * 分部id
+    */
+    @ApiModelProperty(value="分部id")
+    private Integer organId;
+
+    /**
+    * vip课价格
+    */
+    @ApiModelProperty(value="vip课价格")
+    private BigDecimal vip;
+
+    /**
+    * 乐理课价格
+    */
+    @ApiModelProperty(value="乐理课价格")
+    private BigDecimal theory;
+
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty(value="修改时间")
+    private Date updateTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+    public BigDecimal getVip() {
+        return vip;
+    }
+
+    public void setVip(BigDecimal vip) {
+        this.vip = vip;
+    }
+
+    public BigDecimal getTheory() {
+        return theory;
+    }
+
+    public void setTheory(BigDecimal theory) {
+        this.theory = theory;
+    }
+
+    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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", organId=").append(organId);
+        sb.append(", vip=").append(vip);
+        sb.append(", theory=").append(theory);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service;
 
 
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.DegreeFeeDto;
 import com.ym.mec.biz.dal.entity.ChildrenDayReserve;
 import com.ym.mec.common.service.BaseService;
 
@@ -24,4 +25,12 @@ public interface ChildrenDayReserveService extends BaseService<Integer, Children
      */
     ChildrenDayReserve getUserReserve(Integer userId);
 
+
+    /**
+     * 获取活动的费用信息
+     * @param organId
+     * @return
+     */
+    DegreeFeeDto getFeeInfo(Integer organId);
+
 }

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

@@ -2,9 +2,14 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ChildrenDayReserveDao;
+import com.ym.mec.biz.dal.dao.DegreeLevelFeeDao;
 import com.ym.mec.biz.dal.dao.MusicGroupDao;
+import com.ym.mec.biz.dal.dao.OrganizationDegreeCourseFeeDao;
+import com.ym.mec.biz.dal.dto.DegreeFeeDto;
 import com.ym.mec.biz.dal.entity.ChildrenDayReserve;
+import com.ym.mec.biz.dal.entity.DegreeLevelFee;
 import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.OrganizationDegreeCourseFee;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.service.ChildrenDayReserveService;
 import com.ym.mec.common.dal.BaseDAO;
@@ -13,6 +18,8 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class ChildrenDayReserveServiceImpl extends BaseServiceImpl<Integer, ChildrenDayReserve> implements ChildrenDayReserveService {
 
@@ -20,6 +27,10 @@ public class ChildrenDayReserveServiceImpl extends BaseServiceImpl<Integer, Chil
     private ChildrenDayReserveDao childrenDayReserveDao;
     @Autowired
     private MusicGroupDao musicGroupDao;
+    @Autowired
+    private DegreeLevelFeeDao degreeLevelFeeDao;
+    @Autowired
+    private OrganizationDegreeCourseFeeDao organizationDegreeCourseFeeDao;
 
     @Override
     public BaseDAO<Integer, ChildrenDayReserve> getDAO() {
@@ -50,5 +61,15 @@ public class ChildrenDayReserveServiceImpl extends BaseServiceImpl<Integer, Chil
         return childrenDayReserveDao.getByUserId(userId);
     }
 
+    @Override
+    public DegreeFeeDto getFeeInfo(Integer organId) {
+        List<DegreeLevelFee> degreeLevelFee = degreeLevelFeeDao.getAll();
+        OrganizationDegreeCourseFee courseFee = organizationDegreeCourseFeeDao.getByOrganId(organId);
+        DegreeFeeDto degreeFeeDto = new DegreeFeeDto();
+        degreeFeeDto.setDegreeLevelFee(degreeLevelFee);
+        degreeFeeDto.setOrganizationDegreeCourseFee(courseFee);
+        return degreeFeeDto;
+    }
+
 
 }

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

@@ -0,0 +1,60 @@
+<?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.DegreeLevelFeeDao">
+    <resultMap id="DegreeLevelFee" type="com.ym.mec.biz.dal.entity.DegreeLevelFee">
+        <!--@mbg.generated-->
+        <!--@Table degree_level_fee-->
+        <id column="id_" property="id"/>
+        <result column="level_" property="level"/>
+        <result column="grade_" property="grade"/>
+        <result column="theory_" property="theory"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+    <select id="get" parameterType="java.lang.Integer" resultMap="DegreeLevelFee">
+        <!--@mbg.generated-->
+        select *
+        from degree_level_fee
+        where id_ = #{id}
+    </select>
+    <delete id="delete" parameterType="java.lang.Integer">
+        <!--@mbg.generated-->
+        delete from degree_level_fee
+        where id_ = #{id}
+    </delete>
+    <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.DegreeLevelFee"
+            useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into degree_level_fee (level_, grade_, theory_, create_time_, update_time_)
+        values (#{level}, #{grade}, #{theory}, #{createTime}, #{updateTime})
+    </insert>
+    <update id="update" parameterType="com.ym.mec.biz.dal.entity.DegreeLevelFee">
+        <!--@mbg.generated-->
+        update degree_level_fee
+        <set>
+            <if test="level != null">
+                level_ = #{level},
+            </if>
+            <if test="grade != null">
+                grade_ = #{grade},
+            </if>
+            <if test="theory != null">
+                theory_ = #{theory},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+        </set>
+        where id_ = #{id}
+    </update>
+
+    <!-- 全查询 -->
+    <select id="getAll" resultMap="DegreeLevelFee">
+        SELECT *
+        FROM degree_level_fee
+        ORDER BY level_ ASC
+    </select>
+</mapper>

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

@@ -0,0 +1,59 @@
+<?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.OrganizationDegreeCourseFeeDao">
+    <resultMap id="OrganizationDegreeCourseFee" type="com.ym.mec.biz.dal.entity.OrganizationDegreeCourseFee">
+        <!--@mbg.generated-->
+        <!--@Table organization_degree_course_fee-->
+        <id column="id_" property="id"/>
+        <result column="organ_id_" property="organId"/>
+        <result column="vip_" property="vip"/>
+        <result column="theory_" property="theory"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+    <select id="get" parameterType="java.lang.Integer" resultMap="OrganizationDegreeCourseFee">
+        <!--@mbg.generated-->
+        select *
+        from organization_degree_course_fee
+        where id_ = #{id}
+    </select>
+    <delete id="delete" parameterType="java.lang.Integer">
+        <!--@mbg.generated-->
+        delete from organization_degree_course_fee
+        where id_ = #{id}
+    </delete>
+    <insert id="insert" keyColumn="id_" keyProperty="id"
+            parameterType="com.ym.mec.biz.dal.entity.OrganizationDegreeCourseFee" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into organization_degree_course_fee (organ_id_, vip_, theory_, create_time_, update_time_)
+        values (#{organId}, #{vip}, #{theory}, #{createTime}, #{updateTime})
+    </insert>
+    <update id="update" parameterType="com.ym.mec.biz.dal.entity.OrganizationDegreeCourseFee">
+        <!--@mbg.generated-->
+        update organization_degree_course_fee
+        <set>
+            <if test="organId != null">
+                organ_id_ = #{organId},
+            </if>
+            <if test="vip != null">
+                vip_ = #{vip},
+            </if>
+            <if test="theory != null">
+                theory_ = #{theory},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+        </set>
+        where id_ = #{id}
+    </update>
+
+    <select id="getByOrganId" resultMap="OrganizationDegreeCourseFee">
+        SELECT *
+        FROM organization_degree_course_fee
+        WHERE organ_id_ = #{organId}
+    </select>
+</mapper>

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

@@ -2,6 +2,7 @@ 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.dto.DegreeFeeDto;
 import com.ym.mec.biz.dal.dto.DegreeRegistrationActivityDto;
 import com.ym.mec.biz.dal.entity.ChildrenDayReserve;
 import com.ym.mec.biz.dal.entity.SporadicChargeInfo;
@@ -15,10 +16,7 @@ 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.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
 
@@ -43,7 +41,7 @@ public class ChildrenDayController extends BaseController {
     }
 
     @ApiOperation(value = "获取占位信息")
-    @PostMapping("/getReserve")
+    @GetMapping("/getReserve")
     public HttpResponseResult<ChildrenDayReserve> getReserve() {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (Objects.isNull(user)) {
@@ -51,4 +49,16 @@ public class ChildrenDayController extends BaseController {
         }
         return succeed(childrenDayReserveService.getUserReserve(user.getId()));
     }
+
+
+    @ApiOperation(value = "获取考级相关的价格")
+    @GetMapping("/getFeeInfo")
+    public HttpResponseResult<DegreeFeeDto> getFeeInfo() {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (Objects.isNull(user)) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(childrenDayReserveService.getFeeInfo(user.getOrganId()));
+    }
+
 }