Merge branch '230322' into master_saas

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

@@ -261,14 +261,13 @@
     </resultMap>
     <select id="queryCloudTeacherActiveDetail" resultMap="CloudTeacherActiveTargetDetailDto">
         SELECT su.username_,cto.remark_,cto.amount_,cto.student_id_,GROUP_CONCAT(DISTINCT co.name_) cooperation_name_,
-        GROUP_CONCAT(DISTINCT mg.name_) music_group_name_,GROUP_CONCAT(DISTINCT ct.name_) charge_type_name_,
+        GROUP_CONCAT(DISTINCT mg.name_) music_group_name_,GROUP_CONCAT(DISTINCT case when mg.course_view_type_ = 2 then '会员收费' when mg.course_view_type_ = 3 then '免费' else '课程收费' end) charge_type_name_,
         sj.name_ subject_name_,st.current_grade_num_,cto.create_time_
         FROM cloud_teacher_order cto
         LEFT JOIN sys_user su ON su.id_ = cto.student_id_
         LEFT JOIN student_registration sr ON sr.user_id_ = cto.student_id_ AND sr.music_group_status_ = 'NORMAL'
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_ AND mg.status_ = 'PROGRESS'
         LEFT JOIN cooperation_organ co ON co.id_ = mg.cooperation_organ_id_
-        LEFT JOIN charge_type ct ON ct.id_ = mg.charge_type_id_
         LEFT JOIN student st ON st.user_id_ = cto.student_id_
         LEFT JOIN `subject` sj ON sj.id_ = st.subject_id_list_
         <include refid="queryCloudTeacherActiveDetailSql"/>
@@ -458,9 +457,6 @@
             <if test="search != null and search != ''">
                 AND (su.id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%') OR mg.id_ LIKE CONCAT('%',#{search},'%'))
             </if>
-            <if test="chargeType != null">
-                AND mg.charge_type_id_ = #{chargeType}
-            </if>
             <if test="subjectId != null">
                 AND st.subject_id_list_ = #{subjectId}
             </if>

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

@@ -12,7 +12,6 @@
         <result column="team_teacher_id_" property="teamTeacherId"/>
         <result column="educational_teacher_id_" property="educationalTeacherId"/>
         <result column="transaction_teacher_id_" property="transactionTeacherId"/>
-        <result column="charge_type_id_" property="chargeTypeId"/>
         <result column="course_form_" property="courseForm"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -114,7 +113,7 @@
         INSERT INTO music_group
                 (id_, name_, organ_id_, school_id_, apply_expire_date_, pre_apply_expire_date_, team_teacher_id_,
                  educational_teacher_id_,
-                 charge_type_id_, course_form_, create_time_, update_time_, status_,
+                 course_form_, create_time_, update_time_, status_,
                  bill_start_date_, improvent_classes_num_, enroll_classes_, payment_expire_date_, is_extra_class_,
                  settlement_type_, cooperation_organ_id_, enlightenment_course_time_,
                  parent_meeting_time_, img_, director_user_id_, is_classroom_lessons_, memo_, expect_start_group_date_,
@@ -123,7 +122,7 @@
                  music_group_plan_making_id_,first_recruit_grade_,default_charge_standard_,single_train_minutes_,course_plan_,sale_activity_desc_,graduate_grade_,basic_student_num_,payment_user_type_,charge_mode_)
         VALUES (#{id}, #{name}, #{organId}, #{schoolId}, #{applyExpireDate}, #{preApplyExpireDate}, #{teamTeacherId},
                 #{educationalTeacherId},
-                #{chargeTypeId}, #{courseForm}, now(), now(),
+                #{courseForm}, now(), now(),
                 #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{billStartDate},
                 #{improventClassesNum}, #{enrollClasses}, #{paymentExpireDate},
                 #{isExtraClass, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
@@ -171,9 +170,6 @@
             <if test="courseForm != null">
                 course_form_ = #{courseForm},
             </if>
-            <if test="chargeTypeId != null">
-                charge_type_id_ = #{chargeTypeId},
-            </if>
             <if test="educationalTeacherId != null">
                 educational_teacher_id_ = #{educationalTeacherId},
             </if>
@@ -326,9 +322,6 @@
                 AND (mg.name_ LIKE CONCAT('%',#{search},'%') OR mg.id_ LIKE CONCAT('%',#{search},'%')
                  OR mg.cooperation_organ_id_ = #{search} OR co.name_ LIKE CONCAT('%',#{search},'%'))
             </if>
-            <if test="chargeTypeId != null">
-                AND mg.charge_type_id_ = #{chargeTypeId}
-            </if>
             <if test="musicGroupStatus != null">
                 AND FIND_IN_SET(mg.status_,#{musicGroupStatus})
             </if>