优化查询

Pu Zhibing

2025-05-07 dfd33b4f9da0811ed1956c06608c2935318644e9

优化查询

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -1399,13 +1399,12 @@
        if (siteIds.isEmpty())siteIds.add(-1);
        dto.setSiteIds(siteIds);
        List<ChargingOrderVO> list = this.baseMapper.chargingOrder(pageInfo,dto,startTime1,startTime2,endTime1,endTime2);
        List<ChargingOrderVO> list1 = this.baseMapper.chargingOrderNolimit(dto,startTime1,startTime2,endTime1,endTime2);
         BigDecimal total = new BigDecimal("0");
         long time = 0L;
         BigDecimal electronicMoney = new BigDecimal("0");
         BigDecimal serviceMoney = new BigDecimal("0");
         BigDecimal commissionMoney = new BigDecimal("0");
         BigDecimal refundMoney = new BigDecimal("0");
//         BigDecimal refundMoney = new BigDecimal("0");
         BigDecimal paymentMoney = new BigDecimal("0");
        List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();

@@ -1473,15 +1472,11 @@
            }
        }

        List<TChargingOrderRefund> chargingOrderRefunds = chargingOrderRefundService.lambdaQuery()
                .eq(TChargingOrderRefund::getRefundStatus,2).list();

//        BigDecimal total = new BigDecimal("0");
//        long time = 0L;
//        BigDecimal electronicMoney = new BigDecimal("0");
//        BigDecimal serviceMoney = new BigDecimal("0");
//        BigDecimal refundMoney = new BigDecimal("0");
//        BigDecimal paymentMoney = new BigDecimal("0");
//        List<TChargingOrderRefund> chargingOrderRefunds = chargingOrderRefundService.lambdaQuery()
//                .eq(TChargingOrderRefund::getRefundStatus,2).list();
	
	
        List<ChargingOrderVO> list1 = this.baseMapper.chargingOrderNolimit(dto,startTime1,startTime2,endTime1,endTime2);
        for (ChargingOrderVO chargingOrderVO : list1) {
            if(null == chargingOrderVO.getStatus() || 5 != chargingOrderVO.getStatus()){
                continue;
@@ -1506,11 +1501,11 @@
                long between = ChronoUnit.SECONDS.between(startTime, endTime);
                time+=between;
            }
            List<TChargingOrderRefund> list2 = chargingOrderRefunds.stream().filter(e -> e.getChargingOrderId() != null && e.getChargingOrderId().equals(chargingOrderVO.getId()))
                    .collect(Collectors.toList());
            for (TChargingOrderRefund tChargingOrderRefund : list2) {
                refundMoney = refundMoney.add(tChargingOrderRefund.getRefundTotalAmount());
            }
//            List<TChargingOrderRefund> list2 = chargingOrderRefunds.stream().filter(e -> e.getChargingOrderId() != null && e.getChargingOrderId().equals(chargingOrderVO.getId()))
//                    .collect(Collectors.toList());
//            for (TChargingOrderRefund tChargingOrderRefund : list2) {
//                refundMoney = refundMoney.add(tChargingOrderRefund.getRefundTotalAmount());
//            }
        }
        tCharingOrderVO.setTotal(total);
        tCharingOrderVO.setTime(time);