Merge branch 'active_course_2021-09-26～29' of http://git.dayaedu.com/yonge/mec

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

@@ -34,6 +34,7 @@
         <result column="course_num_" property="allCourseNum"/>
         <result column="total_price_" property="totalPrice"/>
         <result column="activity_user_mapper_id_" property="activityUserMapperId"/>
+        <result column="vip_group_activity_id_" property="vipGroupActivityId"/>
     </resultMap>
 
     <resultMap id="PracticeCourseDto" type="com.ym.mec.biz.dal.dto.PracticeCourseDto" extends="PracticeGroup">
@@ -72,6 +73,9 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.PracticeGroup">
         UPDATE practice_group
         <set>
+            <if test="vipGroupActivityId != null">
+                vip_group_activity_id_ = #{vipGroupActivityId},
+            </if>
             <if test="activityUserMapperId != null">
                 activity_user_mapper_id_ = #{activityUserMapperId},
             </if>
@@ -164,12 +168,14 @@
         (name_,type_,subject_id_,user_id_,student_id_,single_class_minutes_,
          organ_id_,courses_start_date_,courses_expire_date_,create_time_,update_time_,
          memo_,buy_months_,drill_times_on_week_,drill_times_json_,group_status_,
-         be_renew_group_id_,educational_teacher_id_,payment_expire_date_,registration_start_time_,course_num_,total_price_,activity_user_mapper_id_)
+         be_renew_group_id_,educational_teacher_id_,payment_expire_date_,registration_start_time_,
+         course_num_,total_price_,activity_user_mapper_id_,vip_group_activity_id_)
         VALUES(#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                #{subjectId},#{userId},#{studentId},#{singleClassMinutes},#{organId},#{coursesStartDate},
                #{coursesExpireDate},NOW(),NOW(),#{memo},#{buyMonths},#{drillTimesOnWeek},#{drillTimesJson},
                #{groupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{beRenewGroupId},
-               #{educationalTeacherId},#{paymentExpireDate},#{registrationStartTime},#{allCourseNum},#{totalPrice},#{activityUserMapperId})
+               #{educationalTeacherId},#{paymentExpireDate},#{registrationStartTime},#{allCourseNum},
+               #{totalPrice},#{activityUserMapperId},#{vipGroupActivityId})
     </insert>
 
     <select id="getUserFreePracticeGroup" resultMap="PracticeGroup">
@@ -799,7 +805,7 @@
     </select>
     <select id="findPracticeGroups" resultMap="com.ym.mec.biz.dal.dao.VipGroupDao.studentVipGroup">
         SELECT pg.id_,pg.name_,pg.single_class_minutes_,pg.payment_expire_date_,pg.courses_expire_date_,
-        pg.courses_start_date_,pg.course_num_ online_classes_num_,pg.total_price_,cg.expect_student_num_,
+        pg.courses_start_date_ courses_start_date,pg.course_num_ online_classes_num_,pg.total_price_,cg.expect_student_num_,
         cg.student_num_,su.real_name_ teacher_name_,su.avatar_,pg.create_time_,'PRACTICE' group_type_
         FROM practice_group pg
         LEFT JOIN class_group cg ON pg.id_ = cg.music_group_id_ AND cg.group_type_ = 'PRACTICE'