|
@@ -1902,14 +1902,6 @@ public class ExportServiceImpl implements ExportService {
|
|
|
} else if (row.getGroupType().equals(GroupType.GOODS_SELL)) {
|
|
|
row.setRetailGoodsFee(row.getActualAmount());
|
|
|
row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RETAIL_GOODS);
|
|
|
- } else if (row.getGroupType().equals(GroupType.OUTORDER)) {
|
|
|
- if(outOrderAmountMap.get(row.getId()) == null){
|
|
|
- row.setCourseSchoolBuyAmount(row.getActualAmount());
|
|
|
- row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.COURSE_SCHOOL_BUY);
|
|
|
- }else {
|
|
|
- row.setLargeMusicalFee(row.getActualAmount());
|
|
|
- row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.LARGE_MUSICAL);
|
|
|
- }
|
|
|
} else {
|
|
|
List<StudentPaymentOrderExportDto> exportDtoList = feeByTypeMap.get(row.getId());
|
|
|
if(!CollectionUtils.isEmpty(exportDtoList)){
|