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/dao/OperatingReportNewDao.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.OperatingReportNewDto1;
 import com.ym.mec.biz.dal.entity.OperatingReportNew;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentMusicCourseFeeDao.java

@@ -11,4 +11,6 @@ public interface StudentMusicCourseFeeDao extends BaseMapper<StudentMusicCourseF
     void addExpectPrice(@Param("id") Integer id, @Param("expectPrice") BigDecimal expectPrice);
 
     void cutExpectPrice(@Param("id") Integer id, @Param("expectPrice") BigDecimal expectPrice);
+
+    void addActualPrice(@Param("id") Integer id, @Param("actualPrice") BigDecimal actualPrice);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/OperatingReportNewDto1.java

@@ -0,0 +1,14 @@
+package com.ym.mec.biz.dal.dto;
+
+import lombok.Data;
+
+@Data
+public class OperatingReportNewDto1{
+    private String musicGroupId;
+
+    private Integer userId;
+
+    private String courseType;
+
+    private Integer signClassTime;
+}

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

@@ -158,6 +158,9 @@ public class CourseSchedule  extends BaseEntity{
 
 	private Integer isSettlement = 0;
 
+	//是否结算经营报表
+	private Boolean settlementReportFlag = false;
+
 	private String classGroupType;
 
 	private java.util.Date coursesExpireDate;
@@ -204,6 +207,14 @@ public class CourseSchedule  extends BaseEntity{
 	//当前课程是否是转换课
 	private Boolean convertFlag = false;
 
+	public Boolean getSettlementReportFlag() {
+		return settlementReportFlag;
+	}
+
+	public void setSettlementReportFlag(Boolean settlementReportFlag) {
+		this.settlementReportFlag = settlementReportFlag;
+	}
+
 	public Boolean getConvertFlag() {
 		return convertFlag;
 	}

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

@@ -1,25 +1,20 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
-import com.ym.mec.common.entity.BaseEntity;
-
-import java.math.BigDecimal;
-
 /**
  * 对应数据库表(music_group_payment_calender_course_settings):
  */
+@Data
 public class MusicGroupPaymentCalenderCourseSettings extends BaseEntity {
 
-	/**  */
 	private Integer id;
 	
-	/**  */
 	private Long musicGroupPaymentCalenderId;
 
-	/**  */
 	private String name;
 	
 	@ApiModelProperty(value = "课程类型", required = false)
@@ -33,114 +28,21 @@ public class MusicGroupPaymentCalenderCourseSettings extends BaseEntity {
 	
 	@ApiModelProperty(value = "课程原价", required = false)
 	private java.math.BigDecimal courseOriginalPrice;
-	
+
 	@ApiModelProperty(value = "课程现价", required = false)
 	private java.math.BigDecimal courseCurrentPrice;
 	
 	@ApiModelProperty(value = "是否学生可选", required = false)
 	private boolean isStudentOptional = true;
-	
+
+
 	/**  */
 	private java.util.Date createTime;
 	
 	/**  */
 	private java.util.Date updateTime;
-
-	public void setStudentOptional(boolean studentOptional) {
-		isStudentOptional = studentOptional;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setMusicGroupPaymentCalenderId(Long musicGroupPaymentCalenderId){
-		this.musicGroupPaymentCalenderId = musicGroupPaymentCalenderId;
-	}
-	
-	public Long getMusicGroupPaymentCalenderId(){
-		return this.musicGroupPaymentCalenderId;
-	}
-			
-	public void setCourseType(CourseScheduleType courseType){
-		this.courseType = courseType;
-	}
-	
-	public CourseScheduleType getCourseType() {
-		return this.courseType;
-	}
-
-	public Integer getCourseTotalMinuties() {
-		return courseTotalMinuties;
-	}
-
-	public void setCourseTotalMinuties(Integer courseTotalMinuties) {
-		this.courseTotalMinuties = courseTotalMinuties;
-	}
-			
-	public void setUnitPrice(java.math.BigDecimal unitPrice){
-		this.unitPrice = unitPrice;
-	}
-	
-	public java.math.BigDecimal getUnitPrice(){
-		return this.unitPrice;
-	}
-			
-	public void setCourseOriginalPrice(java.math.BigDecimal courseOriginalPrice){
-		this.courseOriginalPrice = courseOriginalPrice;
-	}
-	
-	public java.math.BigDecimal getCourseOriginalPrice(){
-		return this.courseOriginalPrice;
-	}
-			
-	public void setCourseCurrentPrice(java.math.BigDecimal courseCurrentPrice){
-		this.courseCurrentPrice = courseCurrentPrice;
-	}
-	
-	public java.math.BigDecimal getCourseCurrentPrice(){
-		return this.courseCurrentPrice;
-	}
-			
-	public void setIsStudentOptional(boolean isStudentOptional){
-		this.isStudentOptional = isStudentOptional;
-	}
-	
-	public boolean getIsStudentOptional(){
-		return this.isStudentOptional;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}
-
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/GoodsQueryInfo.java

@@ -40,6 +40,9 @@ public class GoodsQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "会员收费团展示分部")
     private String memberFeeShowOrganId;
 
+    @ApiModelProperty(value = "免费团展示分部")
+    private String freeFeeShowOrganId;
+
     @ApiModelProperty(value = "乐器置换展示分部")
     private String replacementShowOrganId;
 
@@ -162,4 +165,12 @@ public class GoodsQueryInfo extends QueryInfo {
     public void setSubjectId(Integer subjectId) {
         this.subjectId = subjectId;
     }
+
+	public String getFreeFeeShowOrganId() {
+		return freeFeeShowOrganId;
+	}
+
+	public void setFreeFeeShowOrganId(String freeFeeShowOrganId) {
+		this.freeFeeShowOrganId = freeFeeShowOrganId;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentMusicCourseFeeService.java

@@ -16,6 +16,8 @@ public interface StudentMusicCourseFeeService extends IService<StudentMusicCours
 
     StudentMusicCourseFeeDao getDao();
 
+    void addActualPrice(Integer userId, String musicGroupId, BigDecimal actualPrice);
+
     void addExpectPrice(Integer userId, String musicGroupId, BigDecimal expectPrice);
 
     void cutExpectPrice(Integer userId, String musicGroupId, BigDecimal expectPrice);

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

@@ -83,9 +83,6 @@ public class MusicGroupPaymentCalenderCourseSettingsServiceImpl extends BaseServ
     public void batchInsert(MusicGroupPaymentCalender musicGroupPaymentCalender) {
 		List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingss = musicGroupPaymentCalender.getMusicGroupPaymentCalenderCourseSettingsList();
 		if (musicGroupPaymentCalenderCourseSettingss != null && musicGroupPaymentCalenderCourseSettingss.size() > 0) {
-//			if (musicGroupPaymentCalender.getPayUserType() == SCHOOL) {
-//				musicGroupPaymentCalenderCourseSettingss.forEach(e->e.setCourseCurrentPrice(BigDecimal.ZERO));
-//			}
 			MusicGroupOrganizationCourseSettings courseSettings = musicGroupOrganizationCourseSettingsService.get(musicGroupPaymentCalender
 					.getMusicGroupOrganizationCourseSettingId());
 			for (MusicGroupPaymentCalenderCourseSettings musicGroupPaymentCalenderCourseSettings : musicGroupPaymentCalenderCourseSettingss) {

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

@@ -402,8 +402,19 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             musicGroupPaymentCalenderActivityService.batchInsert(musicGroupPaymentBaseCalender, calenderId);
         }
         //保存课程费用列表
-        musicGroupPaymentCalender.setMusicGroupPaymentCalenderCourseSettingsList(musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList());
-        musicGroupPaymentCalenderCourseSettingsService.batchInsert(musicGroupPaymentCalender);
+        List<MusicGroupPaymentCalenderCourseSettings> courseSettingsList = musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList();
+        if(CollectionUtils.isNotEmpty(courseSettingsList)){
+            //是否会员团
+            if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE && Objects.nonNull(calenderMember)){
+                //获取云教练溢出费用
+                BigDecimal courseIncome = memberFeeSettingService.getAmount(musicGroup.getOrganId(), 1, calenderMember.getPeriod(),
+                        calenderMember.getNum(), MemberFeeSettingServiceImpl::getIncome);
+                //平摊金额
+                distributeTotalAmount(courseSettingsList,courseIncome);
+            }
+            musicGroupPaymentCalender.setMusicGroupPaymentCalenderCourseSettingsList(courseSettingsList);
+            musicGroupPaymentCalenderCourseSettingsService.batchInsert(musicGroupPaymentCalender);
+        }
 
         // 如果是报名，需要修改乐团状态
         if (musicGroupPaymentCalender.getPaymentType() == MUSIC_APPLY) {
@@ -445,6 +456,30 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         return BaseController.succeed(map);
     }
 
+    public static void distributeTotalAmount(List<MusicGroupPaymentCalenderCourseSettings> settings, BigDecimal totalAmount) {
+        if(CollectionUtils.isEmpty(settings) || BigDecimal.ZERO.compareTo(totalAmount) == 0){
+            return;
+        }
+        BigDecimal remainingAmount = totalAmount;
+        int lastIndex = settings.size() - 1;
+        BigDecimal totalUnitPrice = settings.stream().map(e -> e.getUnitPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+        // 分摊总金额
+        for (int i = 0; i < lastIndex; i++) {
+            MusicGroupPaymentCalenderCourseSettings setting = settings.get(i);
+            BigDecimal ratio = setting.getUnitPrice().divide(totalUnitPrice, 10, BigDecimal.ROUND_HALF_UP);
+            BigDecimal itemAmount = totalAmount.multiply(ratio).setScale(2, BigDecimal.ROUND_HALF_UP);
+            setting.setCourseCurrentPrice(itemAmount.add(setting.getCourseCurrentPrice()));
+            remainingAmount = remainingAmount.subtract(itemAmount);
+        }
+
+        // 将剩余的金额放在最后一个Item对象中
+        MusicGroupPaymentCalenderCourseSettings lastItem = settings.get(lastIndex);
+        lastItem.setCourseCurrentPrice(lastItem.getCourseCurrentPrice().add(remainingAmount));
+    }
+
+
+
     //校验缴费项目进行中加学员
     public void checkAddStudent(CalenderAddStudent calenderAddStudent, MusicGroup musicGroup) {
         //获取缴费状态在审核中或者已拒绝的缴费项目的学员

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

@@ -61,10 +61,22 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 		//服务收入
 		//导入的服务收入  (全部记录为课程收入)
 		Map<Integer, BigDecimal> collect24 = MapUtil.convertIntegerMap(operatingReportNewDao.sumImportServerOrderAmount(currentMonth));
+		//1、调整student_registration表surplus_course_fee_字段，原有逻辑是用于保存学员已缴费，但是未排课的总乐团课程费用。在课程结束后按课程预计金额分摊到课程实际收入。
+		// 现在需要新增逻辑，记录免费团溢出的乐器课费、以及云教练团溢出的课费。用于在课程结束后计算实际课费，涉及到乐团缴费项目、支付回调
+
+		//2、music_group_payment_calender_course_settings表新增字段，用于记录 云教练、乐器溢出的课程费用，在排课时用于计算预计课费、涉及到降费项目创建、报名支付回调
+
+		//3、course_schedule表新增字段 标记课程是否结算经营报表，用于年底确认经营报表收入、或者已结束调整到未开始，涉及到所有的排课、调整、合班、合课逻辑
+
+		//4、课程调整逻辑修改、已结算经营报表的课程不允许调整（需要合业务部门确认）。如果可以调整，需要在course_schedule_student_payment 表新增结算金额，用于记录已结算的金额，在下次结算时去单独计算。
+
+		//5、初始化历史云教练缴费数据，按课程数量和课费总额比例计算，已排课的初始化预计金额、已缴费的初始化实际金额、以及部分排课数据初始化
+
+		//6、云教练按月计算收入，只计算配置金额，溢出的部分分配给课程
 		//云教练赠送课程实际收入
-		Map<Integer, BigDecimal> collect1 = MapUtil.convertIntegerMap(operatingReportNewDao.sumCloudCourseAmount(firstDayOfMonth,lastDayOfMonth));
+//		Map<Integer, BigDecimal> collect1 = MapUtil.convertIntegerMap(operatingReportNewDao.sumCloudCourseAmount(firstDayOfMonth,lastDayOfMonth));
 		//亏损的云教练算到当月实际收入
-		Map<Integer, BigDecimal> collect22 = MapUtil.convertIntegerMap(operatingReportNewDao.sumLossCloudAmount(currentMonth));
+//		Map<Integer, BigDecimal> collect22 = MapUtil.convertIntegerMap(operatingReportNewDao.sumLossCloudAmount(currentMonth));
 		//付费课程实际收入
 		Map<Integer, BigDecimal> collect2 = MapUtil.convertIntegerMap(operatingReportNewDao.sumCourseAmount(firstDayOfMonth,lastDayOfMonth));
 
@@ -139,14 +151,14 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 				operatingReportNew.setSaleCost(reportNew.getSaleCost());
 			}
 
-			operatingReportNew.setCourseAmount(getAmount(collect1.get(organId)));
-			operatingReportNew.setCourseAmount(operatingReportNew.getCourseAmount().add(getAmount(collect2.get(organId))));
+			operatingReportNew.setCourseAmount(getAmount(collect2.get(organId)));
+//			operatingReportNew.setCourseAmount(operatingReportNew.getCourseAmount().add(getAmount(collect2.get(organId))));
 			operatingReportNew.setCourseAmount(operatingReportNew.getCourseAmount().add(getAmount(collect24.get(organId))));
 
 			operatingReportNew.setCloudAmount(getAmount(collect3.get(organId)));
 			operatingReportNew.setCloudAmount(operatingReportNew.getCloudAmount().add(getAmount(collect4.get(organId))));
 			operatingReportNew.setCloudAmount(operatingReportNew.getCloudAmount().add(getAmount(collect5.get(organId))));
-			operatingReportNew.setCloudAmount(operatingReportNew.getCloudAmount().add(getAmount(collect22.get(organId))));
+//			operatingReportNew.setCloudAmount(operatingReportNew.getCloudAmount().add(getAmount(collect22.get(organId))));
 
 			operatingReportNew.setMaintenanceAmount(getAmount(collect26.get(organId)));
 			operatingReportNew.setBusinessRefund(getAmount(collect6.get(organId)));

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

@@ -21,6 +21,14 @@ public class StudentMusicCourseFeeServiceImpl extends ServiceImpl<StudentMusicCo
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    public void addActualPrice(Integer userId, String musicGroupId, BigDecimal actualPrice) {
+        StudentMusicCourseFee one = this.lambdaQuery().eq(StudentMusicCourseFee::getMusicGroupId, musicGroupId)
+                .eq(StudentMusicCourseFee::getUserId, userId).one();
+        this.baseMapper.addActualPrice(one.getId(),actualPrice);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public void addExpectPrice(Integer userId, String musicGroupId, BigDecimal expectPrice) {
         StudentMusicCourseFee one = this.lambdaQuery().eq(StudentMusicCourseFee::getMusicGroupId, musicGroupId)
                 .eq(StudentMusicCourseFee::getUserId, userId).one();

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

@@ -145,6 +145,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
         return studentPaymentOrderDetailList;
     }
 
+
     @Override
     public List<StudentPaymentOrderDetail> findApplyOrderSuccess(String musicGroupId, DealStatusEnum status, Integer deliveryStatus) {
         return studentPaymentOrderDetailDao.findApplyOrderSuccess(musicGroupId, status, deliveryStatus);
@@ -627,7 +628,11 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
 
     public void addOrderDetailTo(StudentPaymentOrder studentPaymentOrder, MusicGroup musicGroup, StudentRegistration studentRegistration) {
         //SurplusCourseFee
-        List<StudentPaymentOrderDetail> allDetails = this.findByOrderId(studentPaymentOrder.getId());
+        Integer userId = studentPaymentOrder.getUserId();
+        Long orderId = studentPaymentOrder.getId();
+        String musicGroupId = musicGroup.getId();
+        Integer tenantId = studentPaymentOrder.getTenantId();
+        List<StudentPaymentOrderDetail> allDetails = this.findByOrderId(orderId);
         BigDecimal courseFee = allDetails.stream().filter(o -> !(o.getType() == MUSICAL)
                         && !(o.getType() == VIP)
                         && !(o.getType() == PRACTICE)
@@ -640,7 +645,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
         
         if (studentRegistration.getTemporaryCourseFee() != null) {
-            studentRegistration.setTemporaryCourseFee(new BigDecimal(0));
+            studentRegistration.setTemporaryCourseFee(BigDecimal.ZERO);
         }
         studentRegistration.setPaymentStatus(YES);
         studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.NORMAL);
@@ -652,13 +657,15 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
             studentRegistration.setSurplusCourseFee(studentRegistration.getSurplusCourseFee().add(courseFee));
             //添加日志
             StudentCourseFeeDetail studentCourseFeeDetail = new StudentCourseFeeDetail();
-            studentCourseFeeDetail.setTenantId(studentPaymentOrder.getTenantId());
+            studentCourseFeeDetail.setTenantId(tenantId);
             studentCourseFeeDetail.setStudentRegistrationId(studentRegistration.getId());
             studentCourseFeeDetail.setAmount(courseFee);
             studentCourseFeeDetail.setSurplusCourseFee(studentRegistration.getSurplusCourseFee());
             studentCourseFeeDetail.setMemo("乐团缴费充值");
-            studentCourseFeeDetail.setOperator(studentPaymentOrder.getUserId());
+            studentCourseFeeDetail.setOperator(userId);
             studentCourseFeeDetailDao.insert(studentCourseFeeDetail);
+            //记录用户实际课费
+            studentMusicCourseFeeService.addActualPrice(userId,musicGroupId,courseFee);
         }
 
         //缴费项目详情
@@ -705,7 +712,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 repair.setStudentInstrumentId(studentInstrumentId);
                 studentPaymentOrderDetailDao.update(repair);
             }
-            if(studentPaymentOrder.getType() == OrderTypeEnum.APPLY){
+            if(musicGroup.getCourseViewType() == CourseViewTypeEnum.FREE){
                 //如果是免费团，那么要处理乐器溢出的课程费用
                 CourseViewTypeEnum courseViewType = musicGroup.getCourseViewType();
                 Integer subjectId = studentRegistration.getActualSubjectId();
@@ -715,6 +722,17 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                     BigDecimal musicalFee = musical.getPrice().subtract(chargeType.getFee());
                     studentMusicCourseFeeService.addExpectPrice(studentRegistration.getUserId(),
                             musicGroup.getId(),musicalFee);
+                    //累加充值金额
+                    studentRegistration.setSurplusCourseFee(studentRegistration.getSurplusCourseFee().add(musicalFee));
+                    //添加日志
+                    StudentCourseFeeDetail studentCourseFeeDetail = new StudentCourseFeeDetail();
+                    studentCourseFeeDetail.setTenantId(tenantId);
+                    studentCourseFeeDetail.setStudentRegistrationId(studentRegistration.getId());
+                    studentCourseFeeDetail.setAmount(musicalFee);
+                    studentCourseFeeDetail.setSurplusCourseFee(studentRegistration.getSurplusCourseFee());
+                    studentCourseFeeDetail.setMemo("免费团,购买乐器赠送课费");
+                    studentCourseFeeDetail.setOperator(userId);
+                    studentCourseFeeDetailDao.insert(studentCourseFeeDetail);
                     //设置缴费项目详情乐器和课费
                     paymentCalenderDetail.setExpectAmount(chargeType.getFee());
                     paymentCalenderDetail.setActualAmount(musicalFee);
@@ -733,8 +751,20 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                     BigDecimal courseIncome = memberFeeSettingService.getAmount(musicGroup.getOrganId(), 1, calenderMember.getPeriod(),
                             calenderMember.getNum(), MemberFeeSettingServiceImpl::getIncome);
                     if(calenderMember.getActualAmount().compareTo(courseIncome) > 0){
+                        BigDecimal subtract = calenderMember.getActualAmount().subtract(courseIncome);
+                        //累加充值金额
+                        studentRegistration.setSurplusCourseFee(studentRegistration.getSurplusCourseFee().add(subtract));
+                        //添加日志
+                        StudentCourseFeeDetail studentCourseFeeDetail = new StudentCourseFeeDetail();
+                        studentCourseFeeDetail.setTenantId(tenantId);
+                        studentCourseFeeDetail.setStudentRegistrationId(studentRegistration.getId());
+                        studentCourseFeeDetail.setAmount(subtract);
+                        studentCourseFeeDetail.setSurplusCourseFee(studentRegistration.getSurplusCourseFee());
+                        studentCourseFeeDetail.setMemo("会员团,购买云教练赠送课费");
+                        studentCourseFeeDetail.setOperator(userId);
+                        studentCourseFeeDetailDao.insert(studentCourseFeeDetail);
                         paymentCalenderDetail.setExpectMemberAmount(courseIncome);
-                        paymentCalenderDetail.setActualAmount(calenderMember.getActualAmount().subtract(courseIncome));
+                        paymentCalenderDetail.setActualAmount(subtract);
                     }
                 }
             }
@@ -743,7 +773,10 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
             cloudTeacherOrderService.addOrderDetail2CloudTeacher(studentPaymentOrder, cloudTeacherFee);
         }
-        musicGroupPaymentCalenderDetailService.update(paymentCalenderDetail);
+        if(BigDecimal.ZERO.compareTo(paymentCalenderDetail.getActualAmount()) < 0){
+            musicGroupPaymentCalenderDetailService.update(paymentCalenderDetail);
+            studentMusicCourseFeeService.addActualPrice(userId,musicGroupId,paymentCalenderDetail.getActualAmount());
+        }
         studentRegistrationDao.update(studentRegistration);
     }
 

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

@@ -321,7 +321,6 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                     for (MusicGroupPaymentCalenderDetail calenderDetail : calenderDetails) {
                         calenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
                         calenderDetail.setPayTime(nowDate);
-                        calenderDetail.setUpdateTime(nowDate);
                     }
                     if (calenderDetails.size() > 0) {
                         musicGroupPaymentCalenderDetailDao.batchUpdate(calenderDetails);

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

@@ -43,6 +43,7 @@
         <result column="tenant_id_" property="tenantId"/>
         <result column="evaluate_flag_" property="evaluateFlag"/>
         <result column="convert_flag_" property="convertFlag"/>
+        <result column="settlement_report_flag_" property="settlementReportFlag"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.Mapper" id="Mapper">
@@ -214,14 +215,14 @@
             keyProperty="id">
         INSERT INTO course_schedule
         (id_,group_type_,music_group_id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,
-        teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_,student_num_,leave_student_num_,
+        teacher_id_,actual_teacher_id_,type_,name_,teach_mode_,student_num_,leave_student_num_,
         schoole_id_,is_lock_,note_,teaching_content_,organ_id_,member_flag_,pre_course_flag_,valid_end_time_,valid_start_time_,tenant_id_)
         VALUE
         <foreach collection="list" item="course" separator=",">
             (#{course.id},#{course.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.musicGroupId},
             #{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},
-            #{course.teacherId},now(),now(),#{course.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            #{course.teacherId},#{course.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{course.name},#{course.teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.studentNum},
             #{course.leaveStudentNum},#{course.schoolId},#{course.isLock},#{course.note},#{course.teachingContent},
             #{course.organId},#{course.memberFlag},#{course.preCourseFlag},#{course.validEndTime},#{course.validStartTime},#{course.tenantId})
@@ -232,14 +233,14 @@
             keyProperty="id">
         INSERT INTO course_schedule
         (id_,group_type_,music_group_id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,
-        teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_,student_num_,leave_student_num_,
+        teacher_id_,actual_teacher_id_,type_,name_,teach_mode_,student_num_,leave_student_num_,
         schoole_id_,is_lock_,note_,teaching_content_,organ_id_,member_flag_,pre_course_flag_,valid_end_time_,valid_start_time_,tenant_id_)
         VALUE
         <foreach collection="list" item="course" separator=",">
             (#{course.id},#{course.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.musicGroupId},
             #{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},
-            #{course.actualTeacherId},now(),now(),#{course.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            #{course.actualTeacherId},#{course.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{course.name},#{course.teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.studentNum},
             #{course.leaveStudentNum},#{course.schoolId},#{course.isLock},#{course.note},#{course.teachingContent},
             #{course.organId},#{course.memberFlag},#{course.preCourseFlag},#{course.validEndTime},#{course.validStartTime},#{course.tenantId})
@@ -322,7 +323,6 @@
             <if test="isLock != null">
                 is_lock_ = #{isLock},
             </if>
-            update_time_ = NOW()
         </set>
         WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
@@ -346,8 +346,7 @@
 
     <update id="logicDeleteCourseSchedulesByMusicGroupID">
         update course_schedule
-        set del_flag_    = '1',
-            update_time_ = NOW()
+        set del_flag_    = '1'
         WHERE music_group_id_ = #{musicGroupID}
           AND group_type_ = 'MUSIC'
           and status_ = 'NOT_START'
@@ -355,8 +354,7 @@
 
     <update id="resumeCourseScheduleByMusicGroupId">
         update course_schedule
-        set del_flag_    = '0',
-            update_time_ = NOW()
+        set del_flag_    = '0'
         WHERE music_group_id_ = #{musicGroupID}
           AND group_type_ = 'MUSIC'
           and status_ = 'NOT_START'

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

@@ -37,21 +37,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_,create_time_,update_time_,name_,tenant_id_)
+		course_current_price_,is_student_optional_,name_,tenant_id_)
 		VALUES(#{musicGroupPaymentCalenderId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{courseTotalMinuties},
-		#{unitPrice},#{courseOriginalPrice},#{courseCurrentPrice},#{isStudentOptional},#{createTime},#{updateTime},#{name},#{tenantId})
+		#{unitPrice},#{courseOriginalPrice},#{courseCurrentPrice},#{isStudentOptional},#{name},#{tenantId})
 	</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_,create_time_,update_time_,name_,tenant_id_)
+		course_current_price_,is_student_optional_,name_,tenant_id_)
 		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},NOW(),NOW(),#{item.name},#{item.tenantId})
+		#{item.isStudentOptional},#{item.name},#{item.tenantId})
 		</foreach>
 	</insert>
 
@@ -84,7 +84,6 @@
 			<if test="courseTotalMinuties != null">
 				course_total_minuties_ = #{courseTotalMinuties},
 			</if>
-				update_time_ = NOW()
 		</set>
 		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>

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

@@ -61,7 +61,6 @@
 	</update>
     <update id="settlementCalender">
 		UPDATE operating_report_cloud orc
-		LEFT JOIN cloud_teacher_free_course ctf ON ctf.calender_id_ = orc.calender_id_
 		SET orc.settlement_flag_ = 1
 		WHERE orc.month_flag_ = 0 AND orc.settlement_flag_ = 0 AND DATE_FORMAT(orc.start_date_,'%Y-%m') = #{month};
 	</update>

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

@@ -18,4 +18,7 @@
     <insert id="cutExpectPrice">
         update student_music_course_fee set expect_price_ = expect_price_ - #{expectPrice} where id_ = #{id}
     </insert>
+    <insert id="addActualPrice">
+        update student_music_course_fee set actual_price_ = actual_price_ + #{actualPrice} where id_ = #{id}
+    </insert>
 </mapper>