经营报表问题排查

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

@@ -1702,12 +1702,12 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     @Override
     public List<OperatingTotalIncomeDto> queryOperatingSummaryIncome(Map<String, Object> params) {
         List<StudentPaymentOrderExportDto> studentPaymentOrderExportDtos = studentPaymentOrderDao.ExportQueryPage1(params);
-//        studentPaymentOrderExportDtos.addAll(studentPaymentOrderDao.ExportQueryPage2(params));
-        List<BaseMapDto<Long,BigDecimal>> sellOrderMap = studentPaymentOrderDao.groupSellOrder(params);
-        Map<Long, BigDecimal> sellMap = new HashMap<>();
-        if(CollectionUtils.isNotEmpty(sellOrderMap)){
-            sellMap = sellOrderMap.stream().collect(Collectors.groupingBy(e -> e.getKey(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0).getValue())));
-        }
+        studentPaymentOrderExportDtos.addAll(studentPaymentOrderDao.ExportQueryPage2(params));
+//        List<BaseMapDto<Long,BigDecimal>> sellOrderMap = studentPaymentOrderDao.groupSellOrder(params);
+//        Map<Long, BigDecimal> sellMap = new HashMap<>();
+//        if(CollectionUtils.isNotEmpty(sellOrderMap)){
+//            sellMap = sellOrderMap.stream().collect(Collectors.groupingBy(e -> e.getKey(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0).getValue())));
+//        }
         long i = 1;
         //获取机构费率
         List<Long> otherOrderIds = studentPaymentOrderExportDtos.stream().filter(e -> e.getGroupType() != GroupType.GOODS_SELL
@@ -1871,7 +1871,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                 } else if (row.getGroupType().equals(GroupType.REPLACEMENT)) {
                     row.setMusicalFee(row.getActualAmount());
                 } else if (row.getGroupType().equals(GroupType.GOODS_SELL)) {
-                    row.setRetailGoodsFee(row.getActualAmount());
+                    if (CollectionUtils.isEmpty(row.getOrderDetailList())){
+                        row.setRetailGoodsFee(row.getActualAmount());
+                    }
                 } else {
                     List<StudentPaymentOrderExportDto> exportDtoList = feeByTypeMap.get(row.getId());
                     if (!org.springframework.util.CollectionUtils.isEmpty(exportDtoList)) {
@@ -1997,7 +1999,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                     .add(incomeDto.getGroupPurchaseInstruments())
                     .add(incomeDto.getGroupPurchaseTeachingAids())
                     .add(incomeDto.getLargeInstruments())
-                    .add(incomeDto.getOtherIncome()).add(sellMap.getOrDefault(organId.longValue(),BigDecimal.ZERO))
+                    .add(incomeDto.getOtherIncome())
             );
             incomeDtos.add(incomeDto);
         }