无关风月
2025-03-06 12cee4a31216ef825899d0e301557d7f89d2ebe9
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1318,24 +1318,8 @@
       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) {
@@ -1395,7 +1379,6 @@
      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 +1757,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());
@@ -2928,8 +2892,8 @@
         }
         // 累加分佣
         if (tChargingOrder.getSharingAmount()!=null) {
            sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount());
         if (tChargingOrder.getOrderSource()==2) {
            sharingAmount = sharingAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
         }
         // 累加电费
         if (tChargingOrder.getElectrovalence()!=null) {
@@ -2937,8 +2901,11 @@
         }
         // 累加服务费
         if (tChargingOrder.getServiceCharge()!=null){
            serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
            if (tChargingOrder.getOrderSource()==2) {
               serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
            }else{
               serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
            }
         }
         // 累加会员折扣
         if (tChargingOrder.getVipDiscountAmount()!=null){