Pu Zhibing
2025-02-13 947112db555fe33b8964446892542a501fbc581b
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -611,6 +611,7 @@
         if(null != data && data.getChargeNum() > 0){
            //计算折扣
            List<AccountingStrategyDetailOrder> list = accountingStrategyDetailOrderClient.getAllAccountingStrategyDetailOrder(chargingOrder.getId()).getData();
            list.get(list.size() - 1).setEndTime("23:59");
            //将数据叠加两份,处理跨天的情况
            list.addAll(list);
            boolean sta = false;
@@ -1251,7 +1252,7 @@
         endTime2 = split[1];
      }
      PageInfo<ChargingOrderVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
      PageInfo<ChargingOrderVO> pageInfo1 = new PageInfo<>(1,9999999);
      PageInfo<ChargingOrderVO> pageInfo1 = new PageInfo<>(1,999999999);
      if (StringUtils.hasLength(dto.getPhone())){
         List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();