Merge branch 'maintenance_feature' into test

# Conflicts:
#	mec-common/audit-log/pom.xml

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

@@ -111,6 +111,17 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
         studentPaymentOrder.setCreateTime(date);
         studentPaymentOrder.setUpdateTime(date);
         studentPaymentOrderService.insert(studentPaymentOrder);
+
+        StudentPaymentOrderDetail maintenanceOrderDetail = new StudentPaymentOrderDetail();
+        maintenanceOrderDetail.setType(OrderDetailTypeEnum.MAINTENANCE);
+        maintenanceOrderDetail.setPrice(orderAmount);
+        maintenanceOrderDetail.setRemitFee(BigDecimal.ZERO);
+        maintenanceOrderDetail.setCreateTime(date);
+        maintenanceOrderDetail.setUpdateTime(date);
+        maintenanceOrderDetail.setPaymentOrderId(studentPaymentOrder.getId());
+        maintenanceOrderDetail.setStudentInstrumentId(maintenancePayDto.getId());
+        studentPaymentOrderDetailDao.insert(maintenanceOrderDetail);
+
         studentPaymentOrder.setVersion(0);
 
         if (amount.compareTo(BigDecimal.ZERO) == 0) {

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

@@ -65,7 +65,7 @@
         <if test="operatingTag != null">
             operating_tag_,
         </if>
-        teacher_id_,care_package_,come_on_package_,create_time_,update_time_,service_tag_update_time_)
+        teacher_id_,create_time_,update_time_,service_tag_update_time_)
         VALUES
         (#{userId},#{subjectIdList},
         <if test="serviceTag != null">
@@ -74,7 +74,7 @@
         <if test="operatingTag != null">
             #{operatingTag},
         </if>
-        #{teacherId},#{carePackage},#{comeOnPackage},NOW(),NOW(),NOW())
+        #{teacherId},NOW(),NOW(),NOW())
     </insert>
 
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Student">

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

@@ -138,8 +138,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_,formal_staff_date_,certificate_type_,certificate_num_,flow_organ_range_,introduction_,update_time_,create_time_,is_support_extra_practice_lesson_,is_support_course_schedule_rewards_rules_,idcard_front_img_,idcard_back_img_,idcard_hand_img_,memo_)
-        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},#{formalStaffDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now(),#{isSupportExtraPracticeLesson},#{isSupportCourseScheduleRewardsRules},#{idcardFrontImg},#{idcardBackImg},#{idcardHandImg},#{memo})
+        (id_,organ_id_,job_type_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,demission_date_,formal_staff_date_,certificate_type_,certificate_num_,flow_organ_range_,introduction_,update_time_,create_time_,is_support_course_schedule_rewards_rules_,idcard_front_img_,idcard_back_img_,idcard_hand_img_,memo_)
+        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},#{formalStaffDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now(),#{isSupportCourseScheduleRewardsRules},#{idcardFrontImg},#{idcardBackImg},#{idcardHandImg},#{memo})
     </insert>
 
     <insert id="addSysUser" parameterType="com.ym.mec.auth.api.entity.SysUser" useGeneratedKeys="true" keyColumn="id"