|
|
@@ -2867,7 +2867,7 @@ public class ExportServiceImpl implements ExportService {
|
|
|
orderDetailMap = orderDetails.stream().collect(Collectors.groupingBy(StudentPaymentOrderDetail::getPaymentOrderId));
|
|
|
}
|
|
|
//获取对外订单关联的合作单位
|
|
|
- Map<Integer, String> cooperationOrganMap = new HashMap<>();
|
|
|
+ Map<Integer, CooperationOrgan> cooperationOrganMap = new HashMap<>();
|
|
|
List<Integer> cooperationOrganIds = studentPaymentOrderExportDtos.stream()
|
|
|
.filter(e -> OUTORDER.equals(e.getType()) || GroupType.OUTORDER == e.getGroupType() && (e.getType() != RENEW && e.getType() != APPLY))
|
|
|
.map(StudentPaymentOrderExportDto::getCooperationId)
|
|
|
@@ -2876,7 +2876,7 @@ public class ExportServiceImpl implements ExportService {
|
|
|
.collect(Collectors.toList());
|
|
|
if (CollectionUtils.isNotEmpty(cooperationOrganIds)) {
|
|
|
List<CooperationOrgan> cooperationOrgans = cooperationOrganService.getDao().getCooperationOrganByIds(cooperationOrganIds);
|
|
|
- cooperationOrganMap = cooperationOrgans.stream().collect(Collectors.toMap(CooperationOrgan::getId, CooperationOrgan::getName));
|
|
|
+ cooperationOrganMap = cooperationOrgans.stream().collect(Collectors.toMap(CooperationOrgan::getId, CooperationOrgan -> CooperationOrgan));
|
|
|
}
|
|
|
//计算手续费
|
|
|
Map<String, BigDecimal> serviceChargeMap = new HashMap<>();
|
|
|
@@ -2941,14 +2941,21 @@ public class ExportServiceImpl implements ExportService {
|
|
|
String goodsName = basicOrder.getGoodsList().stream().map(Goods::getName).collect(Collectors.joining("|"));
|
|
|
basicOrder.setMemo(goodsName);
|
|
|
}
|
|
|
- if (basicOrder.getType() == OUTORDER && StringUtils.isNotEmpty(basicOrder.getMusicGroupId())) {
|
|
|
- if (cooperationOrganMap.containsKey(basicOrder.getCooperationId())) {
|
|
|
- basicOrder.setCooperationOrganName(cooperationOrganMap.get(basicOrder.getCooperationId()));
|
|
|
- CooperationOrgan cooperationOrganEduTeacher = musicGroupService.getDao().findCooperationOrganEduTeacher(Integer.valueOf(basicOrder.getMusicGroupId()));
|
|
|
- if (cooperationOrganEduTeacher != null) {
|
|
|
- basicOrder.setEduTeacher(cooperationOrganEduTeacher.getLinkman());
|
|
|
+ if (basicOrder.getType() == OUTORDER) {
|
|
|
+ if(StringUtils.isNotEmpty(basicOrder.getMusicGroupId())) {
|
|
|
+ if (cooperationOrganMap.containsKey(basicOrder.getMusicGroupId())) {
|
|
|
+ basicOrder.setCooperationOrganName(cooperationOrganMap.get(basicOrder.getMusicGroupId()).getName());
|
|
|
+ CooperationOrgan cooperationOrganEduTeacher = musicGroupService.getDao().findCooperationOrganEduTeacher(Integer.valueOf(basicOrder.getMusicGroupId()));
|
|
|
+ if (cooperationOrganEduTeacher != null) {
|
|
|
+ basicOrder.setEduTeacher(cooperationOrganEduTeacher.getLinkman());
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
+ }else {
|
|
|
+ if (cooperationOrganMap.containsKey(basicOrder.getCooperationId())) {
|
|
|
+ basicOrder.setCooperationOrganName(cooperationOrganMap.get(basicOrder.getCooperationId()).getName());
|
|
|
+ basicOrder.setEduTeacher(cooperationOrganMap.get(basicOrder.getCooperationId()).getLinkman());
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
//如果合作单位不存在取学员的第一个乐团的合作单位,乐团主管
|
|
|
if (basicOrder.getCooperationOrganName() == null) {
|
