Merge remote-tracking branch 'origin/master'

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

@@ -1,15 +1,17 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.enums.JobNatureEnum;
-import com.ym.mec.biz.dal.enums.JobTypeEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
 import java.util.List;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.enums.JobNatureEnum;
+import com.ym.mec.biz.dal.enums.JobTypeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+
 /**
  * 对应数据库表(teacher):
  */
@@ -95,6 +97,9 @@ public class Teacher extends SysUser {
 	
 	@ApiModelProperty(value = "是否支持课程奖励规则活动", required = false)
 	private Boolean isSupportCourseScheduleRewardsRules;
+	
+	@ApiModelProperty(value = "是否支持额外的陪练课", required = false)
+	private Boolean isSupportExtraPracticeLesson;
 
 	private List<School> teacherSchools;
 
@@ -282,6 +287,14 @@ public class Teacher extends SysUser {
 		this.isSupportCourseScheduleRewardsRules = isSupportCourseScheduleRewardsRules;
 	}
 
+	public Boolean getIsSupportExtraPracticeLesson() {
+		return isSupportExtraPracticeLesson;
+	}
+
+	public void setIsSupportExtraPracticeLesson(Boolean isSupportExtraPracticeLesson) {
+		this.isSupportExtraPracticeLesson = isSupportExtraPracticeLesson;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -9,7 +9,8 @@ public enum SporadicChargeTypeEnum implements BaseEnum<Integer, SporadicChargeTy
     PARTS_SELL(4,"配件销售"),
     SERVICE_FEE(5,"维修费"),
     LUCKY_BAG_ACTIVE(6,"福袋活动"),
-    VISITING_FEE(7,"上门费");
+    VISITING_FEE(7,"上门费"),
+    VIP_BUY(8,"VIP课购买");
 
     private Integer code;
 

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

@@ -70,7 +70,7 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
         map.put(userId, userId.toString());
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
             //活动，增加课程余额
-            if (info.getChargeType().equals("6")) {
+            if (info.getChargeType().getCode() == 6 || info.getChargeType().getCode() == 8) {
                 sysUserCashAccountService.appendCourseBalance(userId, studentPaymentOrder.getActualAmount());
             }
 

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

@@ -26,6 +26,7 @@
         <result column="certificate_num_" property="certificateNum"/>
         <result column="flow_organ_range_" property="flowOrganRange"/>
         <result column="introduction_" property="introduction"/>
+        <result column="is_support_extra_practice_lesson_" property="isSupportExtraPracticeLesson"/>
         <result column="is_support_course_schedule_rewards_rules_" property="isSupportCourseScheduleRewardsRules"/>
         <result column="update_time_" property="updateTime"/>
         <result column="create_time_" property="createTime"/>
@@ -73,8 +74,8 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Teacher" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO teacher
-        (id_,organ_id_,job_type_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,demission_date_,certificate_type_,certificate_num_,flow_organ_range_,introduction_,update_time_,create_time_,is_support_course_schedule_rewards_rules_)
-        VALUES(#{id},#{organId},#{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{demissionDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now(),#{isSupportCourseScheduleRewardsRules})
+        (id_,organ_id_,job_type_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,demission_date_,certificate_type_,certificate_num_,flow_organ_range_,introduction_,update_time_,create_time_,is_support_extra_practice_lesson_,is_support_course_schedule_rewards_rules_)
+        VALUES(#{id},#{organId},#{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{demissionDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now(),#{isSupportExtraPracticeLesson},#{isSupportCourseScheduleRewardsRules})
     </insert>
 
     <insert id="addSysUser" parameterType="com.ym.mec.auth.api.entity.SysUser" useGeneratedKeys="true" keyColumn="id"
@@ -140,6 +141,9 @@
             <if test="isSupportCourseScheduleRewardsRules != null">
                 is_support_course_schedule_rewards_rules_ = #{isSupportCourseScheduleRewardsRules},
             </if>
+            <if test="isSupportExtraPracticeLesson != null">
+                is_support_extra_practice_lesson_ = #{isSupportExtraPracticeLesson},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>