|
@@ -187,6 +187,8 @@ public class ExportServiceImpl implements ExportService {
|
|
|
row.setSubjectName(vipGroupInfo.getSubjectName());
|
|
|
row.setEduTeacher(vipGroupInfo.getEducationalTeacherName());
|
|
|
}
|
|
|
+ }else if(row.getGroupType() == GroupType.ACTIVITY){
|
|
|
+ row.setVipCourseFee(row.getActualAmount());
|
|
|
}else if(row.getGroupType() == GroupType.MEMBER){
|
|
|
row.setCloudTeacherFee(row.getActualAmount());
|
|
|
} else if (row.getGroupType().equals(GroupType.SPORADIC)) {
|
|
@@ -521,7 +523,9 @@ public class ExportServiceImpl implements ExportService {
|
|
|
row.setSubjectName(vipGroupInfo.getSubjectName());
|
|
|
row.setEduTeacher(vipGroupInfo.getEducationalTeacherName());
|
|
|
}
|
|
|
- } else if (row.getGroupType().equals(GroupType.SPORADIC)) {
|
|
|
+ } else if(row.getGroupType().equals(GroupType.ACTIVITY)){
|
|
|
+ row.setVipCourseFee(row.getActualAmount());
|
|
|
+ }else if (row.getGroupType().equals(GroupType.SPORADIC)) {
|
|
|
//考级报名
|
|
|
if (row.getType().equals(OrderTypeEnum.DEGREE_REGISTRATION)) {
|
|
|
String[] feeTypes = row.getMemo().split(";");
|