修改报表bug

Pu Zhibing

2025-03-20 bc044659ae5fde6c1ab32e416db77d81ca2952d6

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

@@ -88,7 +88,6 @@

    @Override
    public ChargingBillVO chargingBillList1(ChargingListQuery dto) {

        ChargingBillVO chargingBillVO = new ChargingBillVO();
        List<TChargingOrder> tChargingOrders1 = new ArrayList<>();
        String startTime1 = null;
@@ -105,7 +104,7 @@
        List<TAppUser> userList = appUserClient.getAllUser().getData();
        List<TAppUserCar> carList = appUserCarClient.getAllCar().getData();
        List<TChargingOrder> total = chargingOrderList.selectList(new LambdaQueryWrapper<>(TChargingOrder.class)
                .eq(TChargingOrder::getRechargePaymentStatus, 2));
                .eq(TChargingOrder::getRechargePaymentStatus, 2).eq(TChargingOrder::getStatus, 5));
        List<TChargingOrderRefund> totalRefund = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2).list();
        Long userId = tokenService.getLoginUser().getUserid();
        // 查询当前登陆人按钮权限
@@ -363,8 +362,8 @@
                            .setScale(2,BigDecimal.ROUND_DOWN));
                }
                // 累加平台分佣
                if (tChargingOrder.getSharingAmount()!=null){
                    sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount());
                if (tChargingOrder.getOrderSource()==2 && tChargingOrder.getServiceCharge()!=null){
                    sharingAmount = sharingAmount.add(tChargingOrder.getServiceCharge().multiply(BigDecimal.valueOf(0.2)).setScale(2,BigDecimal.ROUND_DOWN));
                }
                // 累加充电度数
                if (tChargingOrder.getChargingCapacity()!=null){
@@ -412,11 +411,15 @@
        BigDecimal bigDecimal = new BigDecimal("0");
        int i = 0;
        for (ChargingBillListVO chargingBillListVO : list1) {
            if (chargingBillListVO.getSiteId()!=0&&!siteIds.contains(chargingBillListVO.getSiteId())){
                continue;
            }
            if (chargingBillListVO.getType()==1){
                continue;
            if (dto.getType() == 1){

            }else{
                if (chargingBillListVO.getSiteId()!=0&&!siteIds.contains(chargingBillListVO.getSiteId())){
                    continue;
                }
                if (chargingBillListVO.getType()==1){
                    continue;
                }
            }
            i++;
            LocalDateTime billTime = chargingBillListVO.getBillTime();
@@ -447,7 +450,6 @@
                if (tChargingOrder.getOrderAmount()!=null){
                    paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
                }

                // 累加订单金额
                if (tChargingOrder.getRechargeAmount()!=null){
                    orderAmountTotal = orderAmountTotal.add(tChargingOrder.getRechargeAmount());
@@ -475,8 +477,8 @@
                            .setScale(2,BigDecimal.ROUND_DOWN));
                }
                // 累加平台分佣
                if (tChargingOrder.getSharingAmount()!=null){
                    sharingAmountTotal = sharingAmountTotal.add(tChargingOrder.getSharingAmount());
                if (tChargingOrder.getOrderSource()==2 && tChargingOrder.getServiceCharge()!=null){
                    sharingAmountTotal = sharingAmountTotal.add(tChargingOrder.getServiceCharge().multiply(BigDecimal.valueOf(0.2)).setScale(2,BigDecimal.ROUND_DOWN));
                }
                // 累加充电度数
                if (tChargingOrder.getElectricity()!=null){
@@ -533,7 +535,7 @@
            startTime2 = split[1];
        }
        List<TChargingOrder> total = chargingOrderList.selectList(new LambdaQueryWrapper<>(TChargingOrder.class)
                .eq(TChargingOrder::getRechargePaymentStatus, 2));
                .eq(TChargingOrder::getRechargePaymentStatus, 2).eq(TChargingOrder::getStatus, 5));
        PageInfo<ChargingBillListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
        List<Site> data6 = siteClient.getSiteAll().getData();
        List<TChargingGun> gunList = chargingGunClient.getAllGun().getData();