yonge 5 年之前
父节点
当前提交
2933b563f1

+ 40 - 29
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupStudentFee.java

@@ -13,30 +13,33 @@ public class MusicGroupStudentFee {
 
 	/**  */
 	private Long id;
-	
+
 	/**  */
-	@ApiModelProperty(value = "乐团编号",required = false)
+	@ApiModelProperty(value = "乐团编号", required = false)
 	private Integer musicGroupId;
-	
+
 	/**  */
-	@ApiModelProperty(value = "用户编号",required = false)
+	@ApiModelProperty(value = "用户编号", required = false)
 	private Integer userId;
-	
+
 	/** 课程费用 */
-	@ApiModelProperty(value = "课程费用",required = false)
+	@ApiModelProperty(value = "课程费用", required = false)
 	private BigDecimal courseFee;
 
 	/** 课程费用 */
-	@ApiModelProperty(value = "下次缴费日期",required = false)
+	@ApiModelProperty(value = "下次缴费日期", required = false)
 	private Date nextPaymentDate;
 
 	/** 课程费用 */
-	@ApiModelProperty(value = "最近缴费时间",required = false)
+	@ApiModelProperty(value = "最近缴费时间", required = false)
 	private Date latestPaidTime;
-	
+
+	@ApiModelProperty(value = "连续旷到次数", required = false)
+	private Integer continuousAbsenteeismTimes;
+
 	/**  */
 	private java.util.Date createTime;
-	
+
 	/**  */
 	private java.util.Date updateTime;
 
@@ -56,27 +59,27 @@ public class MusicGroupStudentFee {
 		this.latestPaidTime = latestPaidTime;
 	}
 
-	public void setId(Long id){
+	public void setId(Long id) {
 		this.id = id;
 	}
-	
-	public Long getId(){
+
+	public Long getId() {
 		return this.id;
 	}
-			
-	public void setMusicGroupId(Integer musicGroupId){
+
+	public void setMusicGroupId(Integer musicGroupId) {
 		this.musicGroupId = musicGroupId;
 	}
-	
-	public Integer getMusicGroupId(){
+
+	public Integer getMusicGroupId() {
 		return this.musicGroupId;
 	}
-			
-	public void setUserId(Integer userId){
+
+	public void setUserId(Integer userId) {
 		this.userId = userId;
 	}
-	
-	public Integer getUserId(){
+
+	public Integer getUserId() {
 		return this.userId;
 	}
 
@@ -88,22 +91,30 @@ public class MusicGroupStudentFee {
 		this.courseFee = courseFee;
 	}
 
-	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;
 	}
-			
+
+	public Integer getContinuousAbsenteeismTimes() {
+		return continuousAbsenteeismTimes;
+	}
+
+	public void setContinuousAbsenteeismTimes(Integer continuousAbsenteeismTimes) {
+		this.continuousAbsenteeismTimes = continuousAbsenteeismTimes;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

+ 5 - 5
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroup.java

@@ -58,7 +58,7 @@ public class VipGroup {
 	private Integer offlineClassesNum;
 
 	@ApiModelProperty(value = "学生购买价格",required = false)
-	private BigDecimal price;
+	private BigDecimal unitPrice;
 
 	@ApiModelProperty(value = "审批状态",required = false)
 	private AuditStatusEnum auditStatus;
@@ -82,12 +82,12 @@ public class VipGroup {
 		this.vipGroupCategoryId = vipGroupCategoryId;
 	}
 
-	public BigDecimal getPrice() {
-		return price;
+	public BigDecimal getUnitPrice() {
+		return unitPrice;
 	}
 
-	public void setPrice(BigDecimal price) {
-		this.price = price;
+	public void setUnitPrice(BigDecimal unitPrice) {
+		this.unitPrice = unitPrice;
 	}
 
 	public String getName() {

+ 6 - 2
mec-biz/src/main/resources/config/mybatis/MusicGroupStudentFeeMapper.xml

@@ -13,6 +13,7 @@
         <result column="course_fee_" property="courseFee"/>
         <result column="next_payment_date_" property="nextPaymentDate"/>
         <result column="latest_paid_time_" property="latestPaidTime"/>
+        <result column="continuous_absenteeism_times_" property="continuousAbsenteeismTimes"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
     </resultMap>
@@ -30,8 +31,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentFee" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_student_fee_ (id_,music_group_id_,user_id_,course_fee_,create_time_,update_time_,next_payment_date_,latest_paid_time_)
-		VALUES(#{id},#{musicGroupId},#{userId},#{courseFee},now(),now(),#{nextPaymentDate},#{latestPaidTime})
+		INSERT INTO music_group_student_fee_ (id_,music_group_id_,user_id_,course_fee_,create_time_,update_time_,next_payment_date_,latest_paid_time_,continuous_absenteeism_times_)
+		VALUES(#{id},#{musicGroupId},#{userId},#{courseFee},now(),now(),#{nextPaymentDate},#{latestPaidTime},#{continuousAbsenteeismTimes})
 	</insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -56,6 +57,9 @@
             <if test="latestPaidTime != null">
                 latest_paid_time_ = #{latestPaidTime},
             </if>
+            <if test="continuousAbsenteeismTimes != null">
+                continuous_absenteeism_times_ = #{continuousAbsenteeismTimes},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

+ 7 - 7
mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -19,7 +19,7 @@
         <result column="online_classes_num_" property="onlineClassesNum"/>
         <result column="offline_classes_num_" property="offlineClassesNum"/>
         <result column="audit_status_" property="auditStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="price_" property="price"/>
+        <result column="unit_price_" property="unitPrice"/>
     </resultMap>
 
     <resultMap id="studentManageVipGroup" type="com.ym.mec.biz.dal.dto.StudentManageVipGroupDto" extends="VipGroup">
@@ -46,7 +46,7 @@
         <result column="payment_expire_date_" property="paymentExpireDate"/>
         <result column="online_classes_num_" property="onlineClassesNum"/>
         <result column="offline_classes_num_" property="offlineClassesNum"/>
-        <result column="price_" property="price"/>
+        <result column="unit_price_" property="unitPrice"/>
         <result column="expect_student_num_" property="expectStudentNum"/>
         <result column="student_num_" property="studentNum"/>
         <result column="teacher_name_" property="teacherName"/>
@@ -85,8 +85,8 @@
         </selectKey>
         -->
         INSERT INTO vip_group
-        (id_,user_id_,single_class_minutes_,payment_expire_date_,courses_expire_date_,create_time_,update_time_,teacher_school_id_,online_classes_num_,offline_classes_num_,registration_start_time_,price_)
-        VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},#{onlineClassesNum},#{offlineClassesNum},#{registrationStartTime},#{price})
+        (id_,user_id_,single_class_minutes_,payment_expire_date_,courses_expire_date_,create_time_,update_time_,teacher_school_id_,online_classes_num_,offline_classes_num_,registration_start_time_,unit_price_)
+        VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},#{onlineClassesNum},#{offlineClassesNum},#{registrationStartTime},#{unitPrice})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -120,8 +120,8 @@
             <if test="registrationStartTime != null">
                 registration_start_time_ = #{registrationStartTime},
             </if>
-            <if test="price!=null">
-                price_=#{price}
+            <if test="unitPrice!=null">
+                unit_price_=#{unitPrice}
             </if>
             <if test="auditStatus != null">
                 audit_status_ = #{auditStatus,typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"},
@@ -169,7 +169,7 @@
             vg.courses_expire_date_,
             vg.online_classes_num_,
             vg.offline_classes_num_,
-            vg.price_,
+            vg.unit_price_,
             cg.expect_student_num_,
             cg.student_num_,
             su.username_ teacher_name_,