导出需求

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ExportTypeEnum.java

@@ -6,7 +6,7 @@ public enum ExportTypeEnum implements BaseEnum<Integer, ExportTypeEnum> {
 	ORDER(0, "订单列表"),
 	COURSE_SCHEDULE(1, "课表列表"),
 	ROUTE_ORDER(2, "财务管理"),
-	STUDENT_VIP_PRACTICE(3, "学员小课记录"),
+	STUDENT_VIP_PRACTICE(3, "VIP网管课耗导出"),
 	STUDENT_MUSIC_THEORY_COURSE_INFO(4, "网管课学员课程信息导出"),
 	STUDENT_VIP_COURSE_INFO(5, "VIP课学员课程信息导出");
 

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

@@ -2172,6 +2172,15 @@ public class ExportServiceImpl implements ExportService {
                     row.setSubjectName(vipGroupInfo.getSubjectName());
                     row.setEduTeacher(vipGroupInfo.getEducationalTeacherName());
                 }
+                if(row.getTypeDesc() == null){
+                    //学员没有历史VIP课程则导出为【VIP课新增】
+                    //学员有历史VIP课程到导出为【VIP课续费]
+                    if(Objects.equals(userFirstVipMap.get(row.getUserId()),row.getMusicGroupId())){
+                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_VIP);
+                    }else {
+                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_VIP);
+                    }
+                }
             } else if(row.getGroupType().equals(GroupType.ACTIVITY)){
                 row.setVipCourseFee(row.getActualAmount());
             }else if (row.getGroupType().equals(GroupType.SPORADIC)) {