乐团缴费项目改造

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

@@ -51,9 +51,11 @@ public class CooperationShareProfitServiceImpl extends BaseServiceImpl<Integer,
 			params.put("offset", pageInfo.getOffset());
 			dataList = cooperationShareProfitDao.queryDtoPage(params);
 			List<Integer> eduUserIds = dataList.stream().map(e -> e.getEducationUserId()).distinct().collect(Collectors.toList());
+			List<String> groupIds = dataList.stream().map(e -> e.getMusicGroupId()).distinct().collect(Collectors.toList());
+			List<Integer> organIds = dataList.stream().map(e -> e.getOrganId()).distinct().collect(Collectors.toList());
 			Map<Integer, String> eduNameMap = MapUtil.convertMybatisMap(teacherDao.queryNameByIdList(eduUserIds));
-			Map<Integer, String> organNameMap = getMap("organization", "id_", "name_", true,queryInfo.getTenantId(), Integer.class, String.class);
-			Map<Integer, String> groupNameMap = getMap("music_group", "id_", "name_", true,queryInfo.getTenantId(), Integer.class, String.class);
+			Map<Integer, String> organNameMap = getMap("organization", "id_", "name_", organIds,queryInfo.getTenantId(), Integer.class, String.class);
+			Map<String, String> groupNameMap = getMap("music_group", "id_", "name_", groupIds,queryInfo.getTenantId(), String.class, String.class);
 			for (CooperationShareProfitDto dto : dataList) {
 				dto.setEducationUserName(eduNameMap.get(dto.getEducationUserId()));
 				dto.setOrganName(organNameMap.get(dto.getOrganId()));

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

@@ -304,16 +304,16 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
             }
 
             //根据学校缴费项id，确定缴费状态
-            BigDecimal amount = studentPaymentRouteOrderDao.sumAmountByCalenderId(studentPaymentRouteOrder.getCalenderId());
+//            BigDecimal amount = studentPaymentRouteOrderDao.sumAmountByCalenderId(studentPaymentRouteOrder.getCalenderId());
             //修改学员缴费回款周期
-            Boolean aBoolean = musicGroupCalenderRefundPeriodService.calcRefundAmount(studentPaymentRouteOrder.getCalenderId(),studentPaymentRouteOrder.getOrderNo(), amount);
+            Boolean aBoolean = musicGroupCalenderRefundPeriodService.calcRefundAmount(studentPaymentRouteOrder.getCalenderId(),studentPaymentRouteOrder.getOrderNo(), studentPaymentRouteOrder.getRouteAmount());
 
             //是否已完成回款
             if(aBoolean){
                 List<MusicGroupPaymentCalenderDetail> calenderDetails = musicGroupPaymentCalenderDetailDao.getCalenderDetailWithCalender(studentPaymentRouteOrder.getCalenderId());
                 MusicGroupPaymentCalender musicGroupPaymentCalender = musicGroupPaymentCalenderDao.get(studentPaymentRouteOrder.getCalenderId());
 
-                if (amount.compareTo(musicGroupPaymentCalender.getCurrentTotalAmount()) >= 0) {
+                if (studentPaymentRouteOrder.getRouteAmount().compareTo(musicGroupPaymentCalender.getCurrentTotalAmount()) >= 0) {
                     musicGroupPaymentCalender.setActualNum(musicGroupPaymentCalender.getExpectNum());
                     musicGroupPaymentCalender.setStatus(MusicGroupPaymentCalender.PaymentCalenderStatusEnum.PAID);
                     musicGroupPaymentCalenderDao.update(musicGroupPaymentCalender);

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

@@ -38,7 +38,7 @@
 	</insert>
 	<insert id="batchInsert">
 		INSERT INTO cooperation_share_profit (organ_id_,cooperation_id_,music_group_id_,musical_num_,total_amount_,
-		                                      payment_status_,payment_no_,memo_,create_time_,update_time_)
+		                                      payment_status_,create_time_,update_time_)
 		VALUES
 		<foreach collection="profits" item="bean" separator=",">
 			(#{bean.organId},#{bean.cooperationId},#{bean.musicGroupId},#{bean.musicalNum},#{bean.totalAmount},

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

@@ -105,6 +105,7 @@
 	</resultMap>
 	<sql id="queryCoopRefundSql">
 		<where>
+			mgpc.status_ IN ('OPEN','OVER','PAID')
 			<if test="errorType != null and errorType != ''">
 				<if test="errorType == 'COOPERATION_PAYMENT_ERROR'">
 					AND TIMESTAMPDIFF(DAY,crp.refund_date_,DATE_FORMAT(NOW(),'%Y-%m-%d')) >= 1
@@ -125,6 +126,7 @@
 		select COUNT(DISTINCT crp.cooperation_organ_id_)
 		from music_group_calender_refund_period crp
 		left join cooperation_organ co ON co.id_ = crp.cooperation_organ_id_
+		left join music_group_payment_calender mgpc ON mgpc.id_ = crp.calender_id_
 		<include refid="queryCoopRefundSql"/>
 	</select>
 	<select id="queryCoopRefund" resultMap="CooperationRefundDto">
@@ -132,6 +134,7 @@
 		SUM(refund_amount_) receivable_,SUM(sub_refund_amount_) prepaidFee,co.education_user_id_
 		from music_group_calender_refund_period crp
 		left join cooperation_organ co ON co.id_ = crp.cooperation_organ_id_
+		left join music_group_payment_calender mgpc ON mgpc.id_ = crp.calender_id_
 		<include refid="queryCoopRefundSql"/>
 		group by crp.cooperation_organ_id_
 		order by crp.id_ DESC
@@ -167,10 +170,10 @@
 	</sql>
 	<sql id="queryCoopCalenderHavingSql">
 		<if test="refundStatus != null and refundStatus != ''">
-			<if test="refundStatus = 'ING'">
+			<if test="refundStatus == 'ING'">
 				HAVING SUM(crp.sub_refund_amount_) > 0
 			</if>
-			<if test="refundStatus = 'END'">
+			<if test="refundStatus == 'END'">
 				HAVING SUM(crp.sub_refund_amount_) = 0
 			</if>
 		</if>

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -242,11 +242,12 @@ public class TaskController extends BaseController {
 	// 更新课程状态至已结束
 	public void updateCourseScheduleToOverStatus() throws Exception {
 		List<Long> courseIds = courseScheduleService.updateCourseScheduleToOverStatus();
+		//更新合作单位分润
+		cooperationShareProfitService.init(courseIds);
 		courseEventSource.courseStatusChange(courseIds);
+
 		courseIds = courseScheduleService.updateCourseScheduleToUnderway();
 		courseEventSource.courseStatusChange(courseIds);
-		//更新合作单位分润
-		cooperationShareProfitService.init(courseIds);
 		//发送定时群消息
 		imSendGroupMessageService.sendTimedMessages();
 		//更新乐团课统计信息