无关风月
2025-03-06 c33465d453f0de925076c5b640e0880c81d3d944
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1244,7 +1244,6 @@
      List<TChargingPile> allPile = chargingGunClient.getAllPile().getData();
      List<Site> data9 = siteClient.getSiteAll().getData();
      List<TAppUser> data6 = appUserClient.getAllUser().getData();
      List<Partner> data7 = siteClient.getAllPartner().getData();
      List<TAppUserCar> data4 = appUserCarClient.getAllCar().getData();
      String startTime1 = null;
      String startTime2 = null;
@@ -1311,31 +1310,13 @@
      List<ChargingOrderVO> list1 = this.baseMapper.chargingOrder(pageInfo1,dto,startTime1,startTime2,endTime1,endTime2);
       BigDecimal total = new BigDecimal("0");
       long time = 0L;
       BigDecimal income = new BigDecimal("0");
       BigDecimal electronicMoney = new BigDecimal("0");
       BigDecimal serviceMoney = new BigDecimal("0");
       BigDecimal commissionMoney = new BigDecimal("0");
       BigDecimal refundMoney = new BigDecimal("0");
       BigDecimal paymentMoney = new BigDecimal("0");
      List<Long> collect = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
      List<TChargingOrderAccountingStrategy> list3 = new ArrayList<>();
      if(collect.size()>=800){
         int i = collect.size() / 800;
         int k = collect.size() % 800;
         for (int j = 0; j <= i; j++) {
            if(j==i&& k>0){
               list3.addAll(chargingOrderAccountingStrategyService.lambdaQuery()
                     .in(TChargingOrderAccountingStrategy::getChargingOrderId,collect.subList(j * 800, j * 800 + k)).list());
            }else {
               List<Long> longs = collect.subList(j * 800, (j + 1) * 800);
               list3.addAll(chargingOrderAccountingStrategyService.lambdaQuery()
                     .in(TChargingOrderAccountingStrategy::getChargingOrderId,longs).list());
            }
         }
      }else {
         list3 = chargingOrderAccountingStrategyService.lambdaQuery()
               .in(TChargingOrderAccountingStrategy::getChargingOrderId,collect).list();
      }
      List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();
      for (ChargingOrderVO chargingOrderVO : list) {
         if (roleType == 2){
            for (Integer siteId : siteIds) {
@@ -1392,10 +1373,7 @@
      }
      List<Long> orderIds = list1.stream().map(TChargingOrder::getId).collect(Collectors.toList());
      if(orderIds.isEmpty())orderIds.add(-1L);
      List<TChargingOrderRefund> chargingOrderRefunds = chargingOrderRefundService.lambdaQuery()
            .in(TChargingOrderRefund::getChargingOrderId, orderIds)
            .eq(TChargingOrderRefund::getRefundStatus,2).list();
      for (ChargingOrderVO chargingOrderVO : list1) {
@@ -1774,26 +1752,7 @@
      BigDecimal feng = new BigDecimal("0");
      BigDecimal ping = new BigDecimal("0");
      BigDecimal gu = new BigDecimal("0");
      List<Long> collect = list1.stream().map(ChargingOrderListVO::getId).collect(Collectors.toList());
      List<TChargingOrderAccountingStrategy> chargingOrderAccountingStrategies = new ArrayList<>();
      if(collect.size()>=800){
         int i = collect.size() / 800;
         int k = collect.size() % 800;
         for (int j = 0; j <= i; j++) {
            if(j==i&& k>0){
               chargingOrderAccountingStrategies.addAll(chargingOrderAccountingStrategyService.lambdaQuery()
                     .in(TChargingOrderAccountingStrategy::getChargingOrderId,collect.subList(j * 800, j * 800 + k)).list());
            }else {
               List<Long> longs = collect.subList(j * 800, (j + 1) * 800);
               chargingOrderAccountingStrategies.addAll(chargingOrderAccountingStrategyService.lambdaQuery()
                     .in(TChargingOrderAccountingStrategy::getChargingOrderId,longs).list());
            }
         }
      }else {
         chargingOrderAccountingStrategies = chargingOrderAccountingStrategyService.lambdaQuery()
               .in(TChargingOrderAccountingStrategy::getChargingOrderId,collect).list();
      }
      List<TChargingOrderAccountingStrategy> chargingOrderAccountingStrategies = chargingOrderAccountingStrategyService.list();
      for (ChargingOrderListVO chargingOrderListVO : list1) {
         if (chargingOrderListVO.getChargingCapacity()!=null)electronic = electronic.add(chargingOrderListVO.getElectricity());