Merge remote-tracking branch 'origin/saas' into saas

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

@@ -156,6 +156,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 				MusicGroupSchoolTermStudentCourseDetail studentCourseDetail = new MusicGroupSchoolTermStudentCourseDetail();
 				studentCourseDetail.setMusicGroupSchoolTermCourseDetailId(courseDetail.getId());
 				studentCourseDetail.setMemberCourseMinutes(courseDetail.getTotalCourseTime());
+				studentCourseDetail.setTenantId(musicGroup.getTenantId());
 				//获取乐团所有在读学员
 				List<Integer> studentIds = studentRegistrationDao.queryNormalUserList(musicGroupId);
 				if(studentIds == null || studentIds.size() == 0){

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

@@ -417,7 +417,7 @@
 				#{item}
 			</foreach>
 		</if>
-		GROUP BY mgpcd.user_id_  HAVING mgpc.current_total_amount_ > 0
+		GROUP BY mgpcd.user_id_
 	</select>
 
 	<resultMap id="MusicArrearageStudentDto" type="com.ym.mec.biz.dal.dto.MusicArrearageStudentDto">

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

@@ -41,7 +41,7 @@
 		(music_group_school_term_course_detail_id_,user_id_,member_course_minutes_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="studentIds" item="userId" separator=",">
-			(#{studentCourseDetail.musicGroupSchoolTermCourseDetailId},#{userId},#{studentCourseDetail.memberCourseMinutes},NOW(),NOW(),#{tenantId})
+			(#{studentCourseDetail.musicGroupSchoolTermCourseDetailId},#{userId},#{studentCourseDetail.memberCourseMinutes},NOW(),NOW(),#{studentCourseDetail.tenantId})
 		</foreach>
 	</insert>
 

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

@@ -45,15 +45,23 @@
 		useGeneratedKeys="true" keyColumn="organ_id_" keyProperty="organId">
 		INSERT INTO practice_group_sell_price
 		(`organ_id_`, `once_original_price`, `once_activity_price`, `twice_original_price`,
-		 `twice_activity_price`, `create_time_`, `update_time_`,single_class_minutes_price_,tenant_id_)
+		 `twice_activity_price`, `create_time_`, `update_time_`,
+		 tenant_id_,care_package_price,come_on_package_price,single_class_minutes_price_)
 		VALUES(#{organId},#{onceOriginalPrice},#{onceActivityPrice},#{twiceOriginalPrice},
-		       #{twiceActivityPrice},NOW(),NOW(),#{singleClassMinutesPrice},#{tenantId})
+		       #{twiceActivityPrice},NOW(),NOW(),#{tenantId},
+		       #{carePackagePrice},#{comeOnPackagePrice},#{singleClassMinutesPrice})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.PracticeGroupSellPrice">
 		UPDATE practice_group_sell_price
 		<set>
+			<if test="carePackagePrice != null">
+				care_package_price = #{carePackagePrice},
+			</if>
+			<if test="comeOnPackagePrice != null">
+				come_on_package_price = #{comeOnPackagePrice},
+			</if>
 			<if test="singleClassMinutesPrice != null">
 				single_class_minutes_price_ = #{singleClassMinutesPrice},
 			</if>