财务导出

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

@@ -2317,9 +2317,6 @@ public class ExportServiceImpl implements ExportService {
             feeFlagMap = feeFlagNumDtos.stream().collect(Collectors.toMap(FeeFlagNumDto::getOrderNo, Function.identity()));
         }
         for (StudentPaymentOrderExportDto basicOrder : studentPaymentOrderExportDtos) {
-            if(basicOrder.getRouteAmount().compareTo(BigDecimal.ZERO) == 0){
-                continue;
-            }
             basicOrder.getUser().setUsername(studentNameMap.get(basicOrder.getUserId()));
             //填充业务数据
             //计算手续费
@@ -2341,8 +2338,10 @@ public class ExportServiceImpl implements ExportService {
                 }
             }
             //根据订单类型初始化业务数据
-            Optional.ofNullable(groupTypeConsumerMap1.get(basicOrder.getType())).ifPresent(consumer -> consumer.accept(basicOrder));
-
+            Optional.ofNullable(groupTypeConsumerMap1.get(basicOrder.getGroupType())).ifPresent(consumer -> consumer.accept(basicOrder));
+            if(basicOrder.getRouteAmount().compareTo(BigDecimal.ZERO) == 0){
+                continue;
+            }
             if(basicOrder.getTypeDesc() == null){
                 if(basicOrder.getGroupType() == GroupType.VIP){
                     //学员没有历史VIP课程则导出为【VIP课新增】