订单导出调整

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

@@ -1638,11 +1638,11 @@ public class ExportServiceImpl implements ExportService {
             musicGroupNameMap = MapUtil.convertIntegerMap(musicGroupDao.queryMusicGroupNameMap(musicGroupIds));
         }
         //获取外部订单的商品销售金额
-        List<Long> outOrderList = studentPaymentOrderExportDtos.stream().filter(e -> e.getType() == OUTORDER).map(e -> e.getId()).collect(Collectors.toList());
-        Map<Long, BigDecimal> outOrderAmountMap = new HashMap<>();
-        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(outOrderList)) {
-            outOrderAmountMap = MapUtil.convertIntegerMap(sellOrderDao.sumOutOrderAmount(outOrderList));
-        }
+//        List<Long> outOrderList = studentPaymentOrderExportDtos.stream().filter(e -> e.getType() == OUTORDER).map(e -> e.getId()).collect(Collectors.toList());
+//        Map<Long, BigDecimal> outOrderAmountMap = new HashMap<>();
+//        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(outOrderList)) {
+//            outOrderAmountMap = MapUtil.convertIntegerMap(sellOrderDao.sumOutOrderAmount(outOrderList));
+//        }
         List<Long> otherOrderIds = studentPaymentOrderExportDtos.stream().filter(e -> e.getGroupType() != GroupType.GOODS_SELL
                 && e.getGroupType() != GroupType.REPLACEMENT
                 && e.getGroupType() != GroupType.PRACTICE
@@ -2002,6 +2002,9 @@ public class ExportServiceImpl implements ExportService {
             } else if (row.getPaymentChannel().equals("BALANCE")) {
                 paymentChannel = "余额";
             }
+            if(StringUtils.isNotEmpty(row.getSporadicType())){
+                row.setTypeDesc(row.getSporadicType());
+            }
             row.setPaymentChannel(paymentChannel);
             row.setId(i);
             row.setRepairFee(row.getRepairFee().add(row.getMaintenanceProductFee()));