Merge branch 'zx_saas_2023_03' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -31,6 +31,9 @@ public class MusicGroupPaymentCalenderCourseSettings extends BaseEntity {
 
 	@ApiModelProperty(value = "课程现价", required = false)
 	private java.math.BigDecimal courseCurrentPrice;
+
+	@ApiModelProperty(value = "乐器、云教练溢出课程费用", required = false)
+	private java.math.BigDecimal overflowCoursePrice;
 	
 	@ApiModelProperty(value = "是否学生可选", required = false)
 	private boolean isStudentOptional = true;

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

@@ -409,8 +409,11 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 //获取云教练溢出费用
                 BigDecimal courseIncome = memberFeeSettingService.getAmount(musicGroup.getOrganId(), 1, calenderMember.getPeriod(),
                         calenderMember.getNum(), MemberFeeSettingServiceImpl::getIncome);
+                //获取云教练溢出费用
+                BigDecimal currentFee = memberFeeSettingService.getAmount(musicGroup.getOrganId(), 1, calenderMember.getPeriod(),
+                        calenderMember.getNum(), MemberFeeSettingServiceImpl::getCurrentFee);
                 //平摊金额
-                distributeTotalAmount(courseSettingsList,courseIncome);
+                distributeTotalAmount(courseSettingsList,currentFee.subtract(courseIncome));
             }
             musicGroupPaymentCalender.setMusicGroupPaymentCalenderCourseSettingsList(courseSettingsList);
             musicGroupPaymentCalenderCourseSettingsService.batchInsert(musicGroupPaymentCalender);

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

@@ -14,6 +14,7 @@
 		<result column="unit_price_" property="unitPrice" />
 		<result column="course_original_price_" property="courseOriginalPrice" />
 		<result column="course_current_price_" property="courseCurrentPrice" />
+		<result column="overflow_course_price_" property="overflowCoursePrice" />
 		<result column="is_student_optional_" property="isStudentOptional" />
 		<result column="name_" property="name" />
 		<result column="create_time_" property="createTime" />
@@ -37,21 +38,21 @@
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_payment_calender_course_settings
 		(music_group_payment_calender_id_,course_type_,course_total_minuties_,unit_price_,course_original_price_,
-		course_current_price_,is_student_optional_,name_,tenant_id_)
+		course_current_price_,is_student_optional_,name_,tenant_id_,overflow_course_price_)
 		VALUES(#{musicGroupPaymentCalenderId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{courseTotalMinuties},
-		#{unitPrice},#{courseOriginalPrice},#{courseCurrentPrice},#{isStudentOptional},#{name},#{tenantId})
+		#{unitPrice},#{courseOriginalPrice},#{courseCurrentPrice},#{isStudentOptional},#{name},#{tenantId},#{overflowCoursePrice})
 	</insert>
 	
 	<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
 		INSERT INTO music_group_payment_calender_course_settings
 		(music_group_payment_calender_id_,course_type_,course_total_minuties_,unit_price_,course_original_price_,
-		course_current_price_,is_student_optional_,name_,tenant_id_)
+		course_current_price_,is_student_optional_,name_,tenant_id_,overflow_course_price_)
 		VALUES
 		<foreach collection="list" item="item" separator=",">
 		(#{item.musicGroupPaymentCalenderId},#{item.courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		#{item.courseTotalMinuties},#{item.unitPrice},#{item.courseOriginalPrice},#{item.courseCurrentPrice},
-		#{item.isStudentOptional},#{item.name},#{item.tenantId})
+		#{item.isStudentOptional},#{item.name},#{item.tenantId},#{item.overflowCoursePrice})
 		</foreach>
 	</insert>
 
@@ -60,6 +61,9 @@
 		parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings">
 		UPDATE music_group_payment_calender_course_settings
 		<set>
+			<if test="overflowCoursePrice != null and overflowCoursePrice != ''">
+				overflow_course_price_ = #{overflowCoursePrice},
+			</if>
 			<if test="name != null and name != ''">
 				name_ = #{name},
 			</if>