平衡关系导出

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,25 +12,33 @@ import java.math.BigDecimal;
  */
 @Data
 public class MusicGroupPaymentStudentCourseDetailLog{
+	@TableId(value = "id_")
 	private Long id;
 
 	@ApiModelProperty(value = "排课时长编号")
+	@TableField(value = "music_group_payment_student_course_detail_id_")
 	private Long musicGroupPaymentStudentCourseDetailId;
 
 	@ApiModelProperty(value = "本次排课预收款")
+	@TableField(value = "course_price_")
 	private BigDecimal coursePrice = BigDecimal.ZERO;
 
 	@ApiModelProperty(value = "本次排课总课酬")
+	@TableField(value = "course_salary_")
 	private BigDecimal courseSalary = BigDecimal.ZERO;
 
 	@ApiModelProperty(value = "本次消耗排课时长")
+	@TableField(value = "used_course_minutes_")
 	private Integer usedCourseMinutes = 0;
 
 	@ApiModelProperty(value = "本次排课次数")
+	@TableField(value = "course_num_")
 	private Integer courseNum = 0;
-	
+
+	@TableField(value = "create_time_")
 	private java.util.Date createTime;
-	
+
+	@TableField(value = "update_time_")
 	private java.util.Date updateTime;
 
 }

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

@@ -2844,8 +2844,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             studentService.updateStudentServiceTag(null, studentIds, YesOrNoEnum.YES.getCode());
             Map<Long,BigDecimal> salaryMap = new HashMap<>();
             if (CollectionUtils.isNotEmpty(courseScheduleTeacherSalaryList)) {
-                salaryMap = courseScheduleTeacherSalaryList.stream()
-                        .collect(Collectors.toMap(CourseScheduleTeacherSalary::getCourseScheduleId, CourseScheduleTeacherSalary::getExpectSalary));
+                //汇总同一节课课程课酬
+                salaryMap = courseScheduleTeacherSalaryList.stream().collect(Collectors.groupingBy(CourseScheduleTeacherSalary::getCourseScheduleId,
+                        Collectors.reducing(BigDecimal.ZERO, CourseScheduleTeacherSalary::getExpectSalary, BigDecimal::add)));
             }
             //学生结算表
             courseScheduleStudentPaymentService.createForMusicGroup(musicGroupId, courseScheduleList, studentIds,salaryMap);

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

@@ -579,7 +579,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 //					operatingReportCloudService.updateSet(calender,courseIds);
 				}
 				if(courseMinutes == 0){
-					detailLog.setCourseSalary(salary == null?BigDecimal.ZERO:salary);
+					detailLog.setCourseSalary(detailLog.getCourseSalary().add(salary == null?BigDecimal.ZERO:salary));
 					return;
 				}
 			}

mec-common/audit-log/src/main/java/com/yonge/log/interceptor/AuditLogInterceptor.java

@@ -41,7 +41,7 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
 
     @Override
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
-        syncSaveLog(request, handler);
+//        syncSaveLog(request, handler);
     }
 
     public void syncSaveLog(HttpServletRequest request, Object handler) {