소스 검색

fix零星收费类型错误

周箭河 5 년 전
부모
커밋
f0c560e6ad
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

+ 2 - 2
mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -2163,13 +2163,13 @@ public class ExportController extends BaseController {
 
         for (OrderByTypeExportDto order : orders) {
             for (VipBuyResultDto vipGroupTeacher : vipGroupTeachers) {
-                if(order.getMusicGroupId().equals(vipGroupTeacher.getVipGroupId().longValue())){
+                if(order.getGroupType().equals(GroupType.VIP) && order.getMusicGroupId().equals(vipGroupTeacher.getVipGroupId().longValue())){
                     order.setTeacherName(vipGroupTeacher.getTeacherName());
                     order.setEduTeacherName(vipGroupTeacher.getEduTeacherName());
                 }
             }
             for (PracticeCourseDto practiceCourseDto : practiceGroupsTeacher) {
-                if(order.getMusicGroupId().equals(practiceCourseDto.getId())){
+                if(order.getGroupType().equals(GroupType.PRACTICE) && order.getMusicGroupId().equals(practiceCourseDto.getId())){
                     order.setTeacherName(practiceCourseDto.getTeacherName());
                     order.setEduTeacherName(practiceCourseDto.getEduTeacherName());
                 }