修改bug

Pu Zhibing

2025-03-14 b880058e6ded5169ed38bb214d2da3b841d51bdd

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java

@@ -400,15 +400,37 @@
    @GetMapping(value = "/pay/order/charging/details")
    @ApiOperation(value = "充电明细", tags = {"管理后台-支付订单-订单信息"})
    public R<List<TChargingOrderAccountingStrategy>> chargingDetail(Long orderId) {
        List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, orderId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();
        List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, orderId)
                .orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
            String format = tChargingOrderAccountingStrategy.getCreateTime().format(formatter);
            LocalDateTime createTime = tChargingOrderAccountingStrategy.getCreateTime();
            String format = createTime.format(formatter);
            String startTime = tChargingOrderAccountingStrategy.getStartTime();
            if("00:00".equals(startTime)){
                createTime = createTime.plusDays(1);
                format = createTime.format(formatter);
            }
            tChargingOrderAccountingStrategy.setStartTime(format+" "+tChargingOrderAccountingStrategy.getStartTime());
            tChargingOrderAccountingStrategy.setEndTime(format+" "+tChargingOrderAccountingStrategy.getEndTime());
        }


        //从新排序
        list.sort(new Comparator<TChargingOrderAccountingStrategy>() {
            @Override
            public int compare(TChargingOrderAccountingStrategy o1, TChargingOrderAccountingStrategy o2) {
                String startTime = o1.getStartTime();
                String startTime1 = o2.getStartTime();
                LocalDateTime localDateTime = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
                LocalDateTime localDateTime1 = LocalDateTime.parse(startTime1, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
                if(localDateTime.isBefore(localDateTime1)){
                    return -1;
                }
                if(localDateTime.isAfter(localDateTime1)){
                    return 1;
                }
                return 0;
            }
        });
        return R.ok(list);
    }
    
@@ -522,8 +544,6 @@
    }


    
    
    @RequiresPermissions(value = {"/chargingPileOrder/monitoring_record"}, logical = Logical.OR)
    @ResponseBody
    @GetMapping(value = "/chargingOrderInfo")
@@ -550,27 +570,15 @@
        List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, strategyId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
            String format = "";
            String format1 = "";
//            String temp1=list.get(0).getStartTime().split(":")[0];
            System.err.println("订单详情时间第一条"+list.get(0).getStartTime());
            System.err.println("订单详情时间开始"+tChargingOrderAccountingStrategy.getStartTime());
            System.err.println("订单详情时间结束"+tChargingOrderAccountingStrategy.getEndTime());
            String temp1=list.get(0).getStartTime().split(" ")[1].split(":")[0];
            String[] split = tChargingOrderAccountingStrategy.getStartTime().split(" ")[1].split(":");
            if (Integer.parseInt(split[0])>=Integer.valueOf(temp1)){
                format = byId.getCreateTime().format(formatter);
            }else {
                format = byId.getEndTime().format(formatter);
            }
            String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(" ")[1].split(":");
            if (Integer.parseInt(split1[0])<Integer.valueOf(temp1)){
                format1 = byId.getCreateTime().format(formatter);
            }else {
                format1 = byId.getEndTime().format(formatter);
            LocalDateTime createTime = tChargingOrderAccountingStrategy.getCreateTime();
            String format = createTime.format(formatter);
            String startTime = tChargingOrderAccountingStrategy.getStartTime();
            if("00:00".equals(startTime)){
                createTime = createTime.plusDays(1);
                format = createTime.format(formatter);
            }
            tChargingOrderAccountingStrategy.setStartTime(format+" "+tChargingOrderAccountingStrategy.getStartTime());
            tChargingOrderAccountingStrategy.setEndTime(format1+" "+tChargingOrderAccountingStrategy.getEndTime());
            tChargingOrderAccountingStrategy.setEndTime(format+" "+tChargingOrderAccountingStrategy.getEndTime());
            if (byId.getVipDiscountAmount()!=null && byId.getServiceCharge().compareTo(BigDecimal.ZERO) != 0){
                BigDecimal multiply = byId.getVipDiscountAmount().divide(byId.getServiceCharge(), 2)
                        .multiply(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
@@ -582,6 +590,23 @@
                tChargingOrderAccountingStrategy.setCouponDiscount(multiply);
            }
        }
        //从新排序
        list.sort(new Comparator<TChargingOrderAccountingStrategy>() {
            @Override
            public int compare(TChargingOrderAccountingStrategy o1, TChargingOrderAccountingStrategy o2) {
                String startTime = o1.getStartTime();
                String startTime1 = o2.getStartTime();
                LocalDateTime localDateTime = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
                LocalDateTime localDateTime1 = LocalDateTime.parse(startTime1, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
                if(localDateTime.isBefore(localDateTime1)){
                    return -1;
                }
                if(localDateTime.isAfter(localDateTime1)){
                    return 1;
                }
                return 0;
            }
        });
        chargingOrderInfoVO.setList(list);
        return AjaxResult.success(chargingOrderInfoVO);
    }
@@ -1027,6 +1052,10 @@
    }
    
    
    
    
    
    
    @RequiresPermissions(value = {"/platformRevenueAnalysis"}, logical = Logical.OR)
    @ResponseBody
    @GetMapping(value = "/six/total")
@@ -1046,7 +1075,7 @@
            siteIds.add(-1);
        }
        Map<String,Object>  map = chargingOrderService.countAll(sixBefore,siteIds);
        BigDecimal data = parkingLotClient.getRecordAmount(sixBefore).getData();
        BigDecimal data = parkingLotClient.getRecordAmount(sixBefore.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))).getData();
        if (map ==null){
            map = new HashMap<String,Object>();
        }
@@ -1063,7 +1092,7 @@
            if (chargingOrder.getOrderSource().equals(2)){
                serviceCharge = serviceCharge.add(chargingOrder.getServiceCharge()!=null?chargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
                commissionAmount = commissionAmount.add(chargingOrder.getServiceCharge()!=null?chargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
            }else{
            }else if (chargingOrder.getServiceCharge()!=null){
                serviceCharge = serviceCharge.add(chargingOrder.getServiceCharge());
            }

@@ -1136,7 +1165,11 @@
                    if (chargingOrderVO != null) {
                        BeanUtils.copyProperties(chargingOrderVO, dataDto);
                    }

                    BeanUtils.copyProperties(uploadRealTimeMonitoringData, dataDto);
                    if (chargingOrderVO != null && chargingOrderVO.getOrderSource()==2){
                        dataDto.setPeriod_service_price(uploadRealTimeMonitoringData.getPeriod_service_price().multiply(new BigDecimal("0.2").setScale(2,BigDecimal.ROUND_DOWN)));
                    }
                    dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime());
                    dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime() == null ? null : uploadRealTimeMonitoringData.getEndTime());
                    dataDto.setStatus(uploadRealTimeMonitoringData.getStatus());
@@ -1254,14 +1287,14 @@
            }
        }

        List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getCreateTime, start).le(TChargingOrder::getCreateTime, end).in(TChargingOrder::getSiteId, siteIds).list();
        List<Long> chargingOrderIds = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
        chargingOrderIds.add(-1L);
//        List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getCreateTime, start).le(TChargingOrder::getCreateTime, end).in(TChargingOrder::getSiteId, siteIds).list();
//        List<Long> chargingOrderIds = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
//        chargingOrderIds.add(-1L);
        //上方饼图
         List<Map<String,Object>> maps =   chargingOrderService.getSumByType(chargingOrderIds);
         List<Map<String,Object>> maps =   chargingOrderService.getSumByType(start,end);

        if (statisticsQueryDto.getDayType()==1){
            List<Map<String,Object>> maps1 = chargingOrderService.getDateData(chargingOrderIds);
            List<Map<String,Object>> maps1 = chargingOrderService.getDateData(start,end);

            List<Map<String, Object>> charMap = new ArrayList<>();
            // 生成从 "00:00" 到 "23:00" 的时间数据
@@ -1288,7 +1321,7 @@



            List<Map<String,Object>> maps1 = chargingOrderService.getWeekData(chargingOrderIds);
            List<Map<String,Object>> maps1 = chargingOrderService.getWeekData(start,end);

            LocalDate startDate = statisticsQueryDto.getStartTime();
            LocalDate endDate = statisticsQueryDto.getEndTime();
@@ -1318,7 +1351,7 @@
            }
            tCharingOrderMapVO.setMaps1(dateRangeStatistics);
        }else if (statisticsQueryDto.getDayType()==3){
            List<Map<String,Object>> maps1 = chargingOrderService.getMonthData(chargingOrderIds);
            List<Map<String,Object>> maps1 = chargingOrderService.getMonthData(start,end);

            LocalDate startDate = statisticsQueryDto.getStartTime();
            LocalDate endDate = statisticsQueryDto.getEndTime();
@@ -1348,7 +1381,7 @@
            }
            tCharingOrderMapVO.setMaps1(dateRangeStatistics);
        }else  if (statisticsQueryDto.getDayType()==4){
            List<Map<String,Object>> maps1 = chargingOrderService.getYearData(chargingOrderIds);
            List<Map<String,Object>> maps1 = chargingOrderService.getYearData(start,end);

            LocalDate startDate = statisticsQueryDto.getStartTime();
            LocalDate endDate = statisticsQueryDto.getEndTime();
@@ -1379,7 +1412,7 @@
            }
            tCharingOrderMapVO.setMaps1(dateRangeStatistics);
        }else if (statisticsQueryDto.getDayType()==5){
            List<Map<String,Object>> maps1 = chargingOrderService.getByDate(chargingOrderIds);
            List<Map<String,Object>> maps1 = chargingOrderService.getByDate(start,end);

            LocalDate startDate = statisticsQueryDto.getStartTime();
            LocalDate endDate = statisticsQueryDto.getEndTime();
@@ -2258,4 +2291,6 @@
        return chargingOrderService.getNotPaymentChargingOrder();
    }
    
 
    
}