|
@@ -2832,6 +2832,14 @@ public class ExportServiceImpl implements ExportService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ //如果合作单位不存在取学员的第一个乐团的合作单位,乐团主管
|
|
|
+ if (basicOrder.getCooperationOrganName() == null) {
|
|
|
+ CooperationOrgan cooperationOrgan = studentService.getStudentEduTeacher(basicOrder.getUserId());
|
|
|
+ if (cooperationOrgan != null) {
|
|
|
+ basicOrder.setCooperationOrganName(cooperationOrgan.getName());
|
|
|
+ basicOrder.setEduTeacher(cooperationOrgan.getLinkman() != null ? cooperationOrgan.getLinkman() : basicOrder.getEduTeacher());
|
|
|
+ }
|
|
|
+ }
|
|
|
//根据订单类型初始化业务数据
|
|
|
Optional.ofNullable(groupTypeConsumerMap1.get(basicOrder.getGroupType())).ifPresent(consumer -> consumer.accept(basicOrder));
|
|
|
this.setSubTypeDesc(basicOrder, userFirstVipMap, userFirstPracticeMap);
|