大屏

huliguo

2 天以前 8115295a64e0809246897fefb8c45de06dce0799

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

@@ -20,18 +20,16 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TChargingOrderRefund;
import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.vo.ChargingBillListVO;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TChargingBill;
import com.ruoyi.order.api.vo.ChargingBillVO;
import com.ruoyi.order.api.model.ChargingListQuery;
import com.ruoyi.order.mapper.TChargingBillMapper;
import com.ruoyi.order.mapper.TChargingOrderMapper;
import com.ruoyi.order.service.TChargingBillService;
import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
import com.ruoyi.order.service.TChargingOrderRefundService;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
@@ -88,7 +86,6 @@

    @Override
    public ChargingBillVO chargingBillList1(ChargingListQuery dto) {

        ChargingBillVO chargingBillVO = new ChargingBillVO();
        List<TChargingOrder> tChargingOrders1 = new ArrayList<>();
        String startTime1 = null;
@@ -105,7 +102,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));
                .isNotNull(TChargingOrder::getPayTime));
        List<TChargingOrderRefund> totalRefund = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2).list();
        Long userId = tokenService.getLoginUser().getUserid();
        // 查询当前登陆人按钮权限
@@ -160,6 +157,7 @@
        BigDecimal sharingAmountTotal = new BigDecimal("0");
        BigDecimal chargingCapacityTotal = new BigDecimal("0");
        BigDecimal discountTotal = new BigDecimal("0");
        List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();


        for (ChargingBillListVO chargingBillListVO : list) {
@@ -179,7 +177,10 @@
                    break;
                case 2:
                    temp = "各个站点账单";
                    temp1 = siteClient.getSiteByIds(Arrays.asList(chargingBillListVO.getSiteId())).getData().get(0).getName();
                    Site site = siteList.stream().filter(e -> e.getId().equals(chargingBillListVO.getSiteId())).findFirst().orElse(null);
                    if (site!=null){
                        temp1 =site.getName();
                    }
                    break;
            }
            chargingBillVO.setCategory(temp);
@@ -204,10 +205,15 @@
            // 获取该月份的最后一天
            LocalDateTime lastDayOfMonth = localDate.with(TemporalAdjusters.lastDayOfMonth());
            LocalDateTime firstDayOfMonth = localDate.with(TemporalAdjusters.firstDayOfMonth());
            List<TChargingOrder> tChargingOrders = total.stream().filter(e -> chargingBillListVO.getType() == 2 ?
                    e.getSiteId().equals(chargingBillListVO.getSiteId()) : true &&
                    e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
                    && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
            List<TChargingOrder> tChargingOrders = new ArrayList<>();
            if (chargingBillListVO.getType() == 2){
                tChargingOrders = total.stream().filter(e -> e.getSiteId().equals(chargingBillListVO.getSiteId()) && e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
                        && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
            }else{
                tChargingOrders = total.stream().filter(e ->  e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
                        && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
            }



            int chargingSecond = 0;
@@ -223,6 +229,7 @@
            chargingBillVO.setCategory("");
            chargingBillVO.setExportList(tChargingOrders);
            for (TChargingOrder tChargingOrder : tChargingOrders) {

                Site site1 = siteList.stream().filter(site -> site.getId().equals(tChargingOrder.getSiteId())).findFirst().orElse(null);
                if (site1!=null){
                    chargingBillVO.setSiteName(site1.getName());
@@ -246,26 +253,29 @@
                tChargingOrder.setOrderClassification1("线上订单");
                tChargingOrder.setRechargePaymentType1("预付");
                tChargingOrder.setChargingType("充电桩接口充电服务");
                switch (tChargingOrder.getStatus()){
                    case 1:
                        tChargingOrder.setStatus1("等待中");
                        break;
                    case 2:
                        tChargingOrder.setStatus1("启动中");
                        break;
                    case 3:
                        tChargingOrder.setStatus1("充电中");
                        break;
                    case 4:
                        tChargingOrder.setStatus1("停止中");
                        break;
                    case 5:
                        tChargingOrder.setStatus1("已结束");
                        break;
                    case 0:
                        tChargingOrder.setStatus1("未知");
                        break;
                if (tChargingOrder.getStatus()!=null){
                    switch (tChargingOrder.getStatus()){
                        case 1:
                            tChargingOrder.setStatus1("等待中");
                            break;
                        case 2:
                            tChargingOrder.setStatus1("启动中");
                            break;
                        case 3:
                            tChargingOrder.setStatus1("充电中");
                            break;
                        case 4:
                            tChargingOrder.setStatus1("停止中");
                            break;
                        case 5:
                            tChargingOrder.setStatus1("已结束");
                            break;
                        case 0:
                            tChargingOrder.setStatus1("未知");
                            break;
                    }
                }

                if (tChargingOrder.getEndMode()!=null){
                    switch (tChargingOrder.getEndMode()){
                        case 1:
@@ -282,13 +292,11 @@
                            break;
                    }
                }
                BigDecimal add = tChargingOrder.getElectrovalence().add(tChargingOrder.getServiceCharge());
                tChargingOrder.setTotalAmount(add.toString());
                tChargingOrder.setDiscount(tChargingOrder.getCouponDiscountAmount()!=null?tChargingOrder.getCouponDiscountAmount().toString():"0");
                UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(tChargingOrder.getCode()).getData();
                if (data5!=null){
                    tChargingOrder.setEndSoc(data5.getSoc().toString());
                }
//                UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(tChargingOrder.getCode()).getData();
//                if (data5!=null){
//                    tChargingOrder.setEndSoc(data5.getSoc().toString());
//                }
                if (tChargingOrder.getStartTime()!=null && tChargingOrder.getEndTime()!=null){
                    LocalDateTime startTime = tChargingOrder.getStartTime();
                    LocalDateTime endTime = tChargingOrder.getEndTime();
@@ -326,18 +334,29 @@
                }else{
                    tChargingOrder.setLicensePlate(tChargingOrder.getPlateNum());
                }
                List<TChargingOrderAccountingStrategy> list4 = list3.stream().filter(e -> e.getChargingOrderId().equals(tChargingOrder.getId())).collect(Collectors.toList());
                BigDecimal electronic_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
                BigDecimal service_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
                BigDecimal charging_capacity = list4.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
                tChargingOrder.setTotalAmount(electronic_reduce.add(service_reduce)+"");
                // 累加实收金额 支付结算金额
                if (tChargingOrder.getRechargeAmount()!=null){
                    paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
                }
               if (tChargingOrder.getOrderSource()!=2){
                   paymentAmount = paymentAmount.add(electronic_reduce.add(service_reduce));
                   // 累加累计服务费
                   serviceCharge = serviceCharge.add(service_reduce);
               }else{
                   paymentAmount = paymentAmount.add(electronic_reduce.add(service_reduce.multiply(new BigDecimal("0.8"))));
                   // 累加累计服务费
                   serviceCharge = serviceCharge.add(service_reduce.multiply(new BigDecimal("0.8")));
               }

                // 总金额
                if (tChargingOrder.getRechargeAmount()!=null){
                    orderAmount = orderAmount.add(tChargingOrder.getRechargeAmount());
                }
                // 累加累计电费
                if (tChargingOrder.getElectrovalence()!=null){
                    electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());
                }
                electrovalence = electrovalence.add(electronic_reduce);

                if (tChargingOrder.getRechargeAmount()!=null){
                    rechargeAmount = rechargeAmount.add(tChargingOrder.getRechargeAmount());
                }
@@ -345,24 +364,17 @@
                for (TChargingOrderRefund tChargingOrderRefund : list2) {
                        refundAmount = refundAmount.add(tChargingOrderRefund.getRefundTotalAmount());
                }
                // 累加累计服务费
                if (tChargingOrder.getServiceCharge()!=null){
                    serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
                }
                // 累加平台手续费
                if (tChargingOrder.getOrderAmount()!=null){
                    commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(BigDecimal.valueOf(0.006))
                            .setScale(2,BigDecimal.ROUND_DOWN));
                }
                // 累加平台分佣
                if (tChargingOrder.getSharingAmount()!=null){
                    sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount());
                if (tChargingOrder.getOrderSource()==2){
                    sharingAmount = sharingAmount.add(service_reduce.multiply(BigDecimal.valueOf(0.2)).setScale(2,BigDecimal.ROUND_DOWN));
                }
                // 累加充电度数
                if (tChargingOrder.getChargingCapacity()!=null){
                    chargingCapacity = chargingCapacity.add(tChargingOrder.getChargingCapacity());
                }

                chargingCapacity = chargingCapacity.add(charging_capacity);
            }
            // 将chargingSecond 这是以秒为单位存放的总秒数 将其转化为xx小时xx分钟xx秒
            int hours = chargingSecond / 3600;
@@ -375,7 +387,7 @@
                chargingBillVO.setPaymentAmount(BigDecimal.ZERO);
            }

            chargingBillListVO.setPaymentAmount(paymentAmount.subtract(sharingAmount));
            chargingBillListVO.setPaymentAmount(paymentAmount);
            chargingBillListVO.setOrderAmount(refundAmount);
            chargingBillListVO.setRefundAmount(refundAmount == null?BigDecimal.ZERO:refundAmount);
            chargingBillListVO.setElectrovalence(electrovalence == null?BigDecimal.ZERO:electrovalence);
@@ -383,7 +395,7 @@
            chargingBillListVO.setCommissionAmount(commissionAmount == null?BigDecimal.ZERO:commissionAmount.setScale(2,BigDecimal.ROUND_DOWN));
            chargingBillListVO.setSharingAmount(sharingAmount == null?BigDecimal.ZERO:sharingAmount);
            chargingBillListVO.setChargingCapacity(chargingCapacity == null?BigDecimal.ZERO:chargingCapacity);
            chargingBillListVO.setBillMoney(orderAmount
            chargingBillListVO.setBillMoney(paymentAmount
                            .subtract(commissionAmount.setScale(2,BigDecimal.ROUND_DOWN)).subtract(sharingAmount).setScale(2, BigDecimal.ROUND_DOWN));
            switch (chargingBillListVO.getType()){
                case 1:
@@ -404,11 +416,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();
@@ -427,23 +443,35 @@
            // 获取该月份的最后一天
            LocalDateTime lastDayOfMonth = localDate.with(TemporalAdjusters.lastDayOfMonth());
            LocalDateTime firstDayOfMonth = localDate.with(TemporalAdjusters.firstDayOfMonth());
            List<TChargingOrder> tChargingOrders = total.stream().filter(e -> chargingBillListVO.getType() == 2 ?
                    e.getSiteId().equals(chargingBillListVO.getSiteId()) : true &&
                    e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
                    && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
            List<TChargingOrder> tChargingOrders = new ArrayList<>();
            if (chargingBillListVO.getType() == 2){
                tChargingOrders = total.stream().filter(e -> e.getSiteId().equals(chargingBillListVO.getSiteId()) && e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
                        && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
            }else{
                tChargingOrders = total.stream().filter(e ->  e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
                        && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
            }
            for (TChargingOrder tChargingOrder : tChargingOrders) {
                if (tChargingOrder.getOrderAmount()!=null){
                    paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
                List<TChargingOrderAccountingStrategy> list4 = list3.stream().filter(e -> e.getChargingOrderId().equals(tChargingOrder.getId())).collect(Collectors.toList());
                BigDecimal electronic_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
                BigDecimal service_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
                BigDecimal charging_capacity = list4.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
                tChargingOrder.setTotalAmount(electronic_reduce.add(service_reduce)+"");
                if (tChargingOrder.getOrderSource()!=2){
                    paymentAmountTotal = paymentAmountTotal.add(electronic_reduce.add(service_reduce));
                    // 累加累计服务费
                    serviceChargeTotal = serviceChargeTotal.add(service_reduce);
                }else{
                    paymentAmountTotal = paymentAmountTotal.add(electronic_reduce.add(service_reduce.multiply(new BigDecimal("0.8"))));
                    // 累加累计服务费
                    serviceChargeTotal = serviceChargeTotal.add(service_reduce.multiply(new BigDecimal("0.8")));
                }

                // 累加订单金额
                if (tChargingOrder.getRechargeAmount()!=null){
                    orderAmountTotal = orderAmountTotal.add(tChargingOrder.getRechargeAmount());
                }
                // 累加累计电费
                if (tChargingOrder.getElectrovalence()!=null){
                    electrovalenceTotal = electrovalenceTotal.add(tChargingOrder.getElectrovalence());
                }
                electrovalenceTotal = electrovalenceTotal.add(electronic_reduce);
                List<TChargingOrderRefund> list2 = totalRefund.stream().filter(e -> e.getChargingOrderId().equals(tChargingOrder.getId())).collect(Collectors.toList());
                for (TChargingOrderRefund tChargingOrderRefund : list2) {
                    refundAmountTotal =refundAmountTotal.add(tChargingOrderRefund.getRefundAmount());
@@ -453,24 +481,19 @@
                    tChargingOrder.setRefundTime1(DateUtils.localDateTimeToString(tChargingOrderRefund.getRefundTime()));
                    bigDecimal = bigDecimal.add(tChargingOrderRefund.getRefundAmount());
                }
                // 累加累计服务费
                if (tChargingOrder.getServiceCharge()!=null){
                    serviceChargeTotal = serviceChargeTotal.add(tChargingOrder.getServiceCharge());
                }

                // 累加平台手续费
                if (tChargingOrder.getOrderAmount()!=null){
                    commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006"))
                            .setScale(2,BigDecimal.ROUND_DOWN));
                }
                // 累加平台分佣
                if (tChargingOrder.getSharingAmount()!=null){
                    sharingAmountTotal = sharingAmountTotal.add(tChargingOrder.getSharingAmount());
                if (tChargingOrder.getOrderSource()==2 ){
                    sharingAmountTotal = sharingAmountTotal.add(service_reduce.multiply(BigDecimal.valueOf(0.2)).setScale(2,BigDecimal.ROUND_DOWN));
                }
                // 累加充电度数
                if (tChargingOrder.getElectricity()!=null){
                chargingCapacityTotal = chargingCapacityTotal.add(charging_capacity);

                    chargingCapacityTotal = chargingCapacityTotal.add(tChargingOrder.getElectricity());
                }
                // 累加优惠金额
                if (tChargingOrder.getCouponDiscountAmount()!=null){
                    discountTotal = discountTotal.add(tChargingOrder.getCouponDiscountAmount());
@@ -501,7 +524,8 @@
        chargingBillVO.setList(pageInfo);
        return chargingBillVO;
    }

    @Resource
    private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;

    @Override
    public ChargingBillVO chargingBillList(ChargingListQuery dto) {
@@ -521,13 +545,15 @@
            startTime2 = split[1];
        }
        List<TChargingOrder> total = chargingOrderList.selectList(new LambdaQueryWrapper<>(TChargingOrder.class)
                .eq(TChargingOrder::getRechargePaymentStatus, 2));
                .isNotNull(TChargingOrder::getPayTime));
        PageInfo<ChargingBillListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
        List<Site> data6 = siteClient.getSiteAll().getData();
        List<TChargingGun> gunList = chargingGunClient.getAllGun().getData();
        List<TChargingPile> pileList = chargingGunClient.getAllPile().getData();
        List<TAppUser> userList = appUserClient.getAllUser().getData();
        List<TAppUserCar> carList = appUserCarClient.getAllCar().getData();
        List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();

        Long userId = tokenService.getLoginUser().getUserid();
        // 查询当前登陆人按钮权限
        SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
@@ -614,7 +640,10 @@
                    break;
                case 2:
                    temp = "各个站点账单";
                    temp1 = data6.stream().filter(e->e.getId().equals(chargingBillListVO.getSiteId())).findFirst().orElse(new Site()).getName();
                    Site site = data6.stream().filter(e -> e.getId().equals(chargingBillListVO.getSiteId())).findFirst().orElse(null);
                    if(site!=null){
                        temp1 = site.getName();
                    }
                    break;
            }
            chargingBillVO.setCategory(temp);
@@ -639,10 +668,14 @@
            // 获取该月份的最后一天
            LocalDateTime lastDayOfMonth = localDate.with(TemporalAdjusters.lastDayOfMonth());
            LocalDateTime firstDayOfMonth = localDate.with(TemporalAdjusters.firstDayOfMonth());
            List<TChargingOrder> tChargingOrders = total.stream().filter(e -> chargingBillListVO.getType() == 2 ?
                    e.getSiteId().equals(chargingBillListVO.getSiteId()) : true &&
                    e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
                    && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
            List<TChargingOrder> tChargingOrders = new ArrayList<>();
            if (chargingBillListVO.getType() == 2){
                tChargingOrders = total.stream().filter(e -> e.getSiteId().equals(chargingBillListVO.getSiteId()) && e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
                        && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
            }else{
                tChargingOrders = total.stream().filter(e ->  e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
                        && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
            }
            int chargingSecond = 0;
            BigDecimal paymentAmount = new BigDecimal("0");
            BigDecimal orderAmount = new BigDecimal("0");
@@ -679,26 +712,29 @@
                tChargingOrder.setOrderClassification1("线上订单");
                tChargingOrder.setRechargePaymentType1("预付");
                tChargingOrder.setChargingType("充电桩接口充电服务");
                switch (tChargingOrder.getStatus()){
                    case 1:
                        tChargingOrder.setStatus1("等待中");
                        break;
                    case 2:
                        tChargingOrder.setStatus1("启动中");
                        break;
                    case 3:
                        tChargingOrder.setStatus1("充电中");
                        break;
                    case 4:
                        tChargingOrder.setStatus1("停止中");
                        break;
                    case 5:
                        tChargingOrder.setStatus1("已结束");
                         break;
                    case 0:
                        tChargingOrder.setStatus1("未知");
                        break;
                if (tChargingOrder.getStatus()!=null){
                    switch (tChargingOrder.getStatus()){
                        case 1:
                            tChargingOrder.setStatus1("等待中");
                            break;
                        case 2:
                            tChargingOrder.setStatus1("启动中");
                            break;
                        case 3:
                            tChargingOrder.setStatus1("充电中");
                            break;
                        case 4:
                            tChargingOrder.setStatus1("停止中");
                            break;
                        case 5:
                            tChargingOrder.setStatus1("已结束");
                            break;
                        case 0:
                            tChargingOrder.setStatus1("未知");
                            break;
                    }
                }

                if (tChargingOrder.getEndMode()!=null){
                    switch (tChargingOrder.getEndMode()){
                        case 1:
@@ -715,8 +751,7 @@
                            break;
                    }
                }
                BigDecimal add = tChargingOrder.getElectrovalence().add(tChargingOrder.getServiceCharge());
                tChargingOrder.setTotalAmount(add.toString());

                tChargingOrder.setDiscount(tChargingOrder.getCouponDiscountAmount()!=null?tChargingOrder.getCouponDiscountAmount().toString():"0");
                if (tChargingOrder.getStartTime()!=null && tChargingOrder.getEndTime()!=null){
                    LocalDateTime startTime = tChargingOrder.getStartTime();
@@ -758,43 +793,46 @@
                    tChargingOrder.setUserName(data3.getName());
                    tChargingOrder.setPhone(data3.getPhone());
                }
                if ( tChargingOrder.getPaymentAmount()!=null&&(!tChargingOrder.getOrderSource().equals(2))){
                List<TChargingOrderAccountingStrategy> list4 = list3.stream().filter(e -> e.getChargingOrderId().equals(tChargingOrder.getId())).collect(Collectors.toList());
                BigDecimal electronic_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
                BigDecimal service_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
                BigDecimal charging_capacity = list4.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);

                if ( !tChargingOrder.getOrderSource().equals(2)){
                    // 实收
                    paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
                    paymentAmount = paymentAmount.add(electronic_reduce).add(service_reduce);
                    BigDecimal add = electronic_reduce.add(service_reduce);
                    tChargingOrder.setTotalAmount(add.toString());
                }
                // 总金额
                if (tChargingOrder.getRechargeAmount()!=null){
                orderAmount = orderAmount.add(tChargingOrder.getRechargeAmount());
                }
                // 累加累计电费
                if (tChargingOrder.getElectrovalence()!=null){
                electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());
                }
                electrovalence = electrovalence.add(electronic_reduce);
                if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus() !=null && tChargingOrder.getRefundStatus() == 2){
                    refundAmount = refundAmount.add(tChargingOrder.getRefundAmount());
                }
                // 累加累计服务费
                if (tChargingOrder.getServiceCharge()!=null){
                    if (tChargingOrder.getOrderSource().equals(2)) {
                        serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN));
                        // 累加平台分佣
                        sharingAmount = sharingAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
                        // 累加实收
                        paymentAmount = paymentAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
                    }else {
                        serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
                    }
                }
                // 累加平台手续费
                if (tChargingOrder.getOrderAmount()!=null){
                    commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(BigDecimal.valueOf(0.006))
                            .setScale(2,BigDecimal.ROUND_DOWN));
                }

                // 累加充电度数
                if (tChargingOrder.getChargingCapacity()!=null){
                    chargingCapacity = chargingCapacity.add(tChargingOrder.getChargingCapacity());
                    if (tChargingOrder.getOrderSource().equals(2)) {
                        serviceCharge = serviceCharge.add(service_reduce.multiply(new BigDecimal("0.8")).setScale(2, BigDecimal.ROUND_DOWN));
                        // 累加平台分佣
                        sharingAmount = sharingAmount.add(service_reduce.multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
                        // 累加实收
                        paymentAmount = paymentAmount.add(electronic_reduce).add(service_reduce.multiply(new BigDecimal("0.8")).setScale(2,BigDecimal.ROUND_DOWN));
                        BigDecimal add = electronic_reduce.add(service_reduce.multiply(new BigDecimal("0.8")));
                        tChargingOrder.setTotalAmount(add.toString());
                    }else {
                        serviceCharge = serviceCharge.add(service_reduce);
                    }

                // 累加平台手续费
                if (tChargingOrder.getRechargeAmount()!=null){
                    commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(BigDecimal.valueOf(0.006)).setScale(2,BigDecimal.ROUND_DOWN));
                }
                // 累加充电度数
                chargingCapacity = chargingCapacity.add(charging_capacity);
            }
            // 将chargingSecond 这是以秒为单位存放的总秒数 将其转化为xx小时xx分钟xx秒
            int hours = chargingSecond / 3600;
@@ -828,8 +866,17 @@
            chargingBillListVO.setChargingSecond(chargingSecond);
        }
        for (ChargingBillListVO chargingBillListVO : list1) {
            if (chargingBillListVO.getSiteId()!=0&&!siteIds.contains(chargingBillListVO.getSiteId())){
                continue;
            if (dto.getType() == 1){
                if (chargingBillListVO.getSiteId()!=0){
                    continue;
                }
            }else{
                if (chargingBillListVO.getSiteId()!=0&&!siteIds.contains(chargingBillListVO.getSiteId())){
                    continue;
                }
                if (chargingBillListVO.getType()==1){
                    continue;
                }
            }
            if (roleType == 2){
                if (chargingBillListVO.getSiteId()==0){
@@ -845,7 +892,6 @@
            chargingBillListVO.setUid(chargingBillListVO.getId().toString());
            // 根据账单的出账时间 查询上个月的充电订单
            LocalDateTime localDate = chargingBillListVO.getBillTime().minusMonths(1);
//            LocalDateTime localDate = chargingBillListVO.getBillTime().minusDays(1);
            // 账单周期
            chargingBillListVO.setBillWeek(localDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
            // 获取 LocalDate 对象
@@ -853,10 +899,15 @@
            // 获取该月份的最后一天
            LocalDateTime lastDayOfMonth = localDate.with(TemporalAdjusters.lastDayOfMonth());
            LocalDateTime firstDayOfMonth = localDate.with(TemporalAdjusters.firstDayOfMonth());
            List<TChargingOrder> tChargingOrders = total.stream().filter(e -> chargingBillListVO.getType() == 2 ?
                    e.getSiteId().equals(chargingBillListVO.getSiteId()) : true &&
                    e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
                    && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());

            List<TChargingOrder> tChargingOrders = new ArrayList<>();
            if (chargingBillListVO.getType() == 2){
                tChargingOrders = total.stream().filter(e -> e.getSiteId().equals(chargingBillListVO.getSiteId()) && e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
                        && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
            }else{
                tChargingOrders = total.stream().filter(e ->  e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
                        && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
            }
            orderCount+=tChargingOrders.size();
            BigDecimal paymentAmount = new BigDecimal("0");
            BigDecimal orderAmount = new BigDecimal("0");
@@ -867,12 +918,15 @@
            BigDecimal chargingCapacity = new BigDecimal("0");
            chargingBillListVO.setOrderCount(tChargingOrders.size());
            for (TChargingOrder tChargingOrder : tChargingOrders) {
                List<TChargingOrderAccountingStrategy> list4 = list3.stream().filter(e -> e.getChargingOrderId().equals(tChargingOrder.getId())).collect(Collectors.toList());
                BigDecimal electronic_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
                BigDecimal service_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
                BigDecimal charging_capacity = list4.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
                // 累加实收金额
                if ( tChargingOrder.getPaymentAmount()!=null&&(!tChargingOrder.getOrderSource().equals(2))){
                    paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
                    paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
                if (!tChargingOrder.getOrderSource().equals(2)){
                    paymentAmount = paymentAmount.add(electronic_reduce.add(service_reduce));
                    paymentAmountTotal = paymentAmountTotal.add(electronic_reduce.add(service_reduce));
                }

                // 累加订单金额
                if (tChargingOrder.getRechargeAmount()!=null){
                    orderAmount = orderAmount.add(tChargingOrder.getRechargeAmount());
@@ -880,42 +934,35 @@
                }
                // 累加累计电费
                if (tChargingOrder.getElectrovalence()!=null){
                    electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());
                    electrovalenceTotal = electrovalenceTotal.add(tChargingOrder.getElectrovalence());
                    electrovalence = electrovalence.add(electronic_reduce);
                    electrovalenceTotal = electrovalenceTotal.add(electronic_reduce);
                }
                if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus() !=null && tChargingOrder.getRefundStatus() == 2){
                    refundAmountTotal = refundAmountTotal.add(tChargingOrder.getRefundAmount());
                }
                // 累加累计服务费
                if (tChargingOrder.getServiceCharge()!=null){
                    if (tChargingOrder.getOrderSource().equals(2)) {
                        serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN));
                        serviceChargeTotal = serviceChargeTotal.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN));
                        serviceCharge = serviceCharge.add(service_reduce.multiply(new BigDecimal("0.8")).setScale(2, BigDecimal.ROUND_DOWN));
                        serviceChargeTotal = serviceChargeTotal.add(service_reduce.multiply(new BigDecimal("0.8")).setScale(2, BigDecimal.ROUND_DOWN));
                        // 累加平台分佣
                        sharingAmount = sharingAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN));
                        sharingAmountTotal = sharingAmountTotal.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN));
                        sharingAmount = sharingAmount.add(service_reduce.multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN));
                        sharingAmountTotal = sharingAmountTotal.add(service_reduce.multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN));
                        // 累加实收
                        paymentAmount = paymentAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
                        paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
                        paymentAmount = paymentAmount.add(electronic_reduce.add(service_reduce.multiply(new BigDecimal("0.8")).setScale(2,BigDecimal.ROUND_DOWN)));
                        paymentAmountTotal = paymentAmountTotal.add(electronic_reduce.add(service_reduce.multiply(new BigDecimal("0.8")).setScale(2,BigDecimal.ROUND_DOWN)));
                    }else{
                        serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
                        serviceChargeTotal = serviceChargeTotal.add(tChargingOrder.getServiceCharge());
                        serviceCharge = serviceCharge.add(service_reduce);
                        serviceChargeTotal = serviceChargeTotal.add(service_reduce);
                    }

                }

                        // 累加平台手续费
                    // 累加平台手续费
                if (tChargingOrder.getOrderAmount()!=null){
                    commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN));
                    commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006"))
                            .setScale(2,BigDecimal.ROUND_DOWN));
                    commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN));
                }

                // 累加充电度数
                if (tChargingOrder.getElectricity()!=null){
                    chargingCapacity = chargingCapacity.add(tChargingOrder.getElectricity());
                    chargingCapacityTotal = chargingCapacityTotal.add(tChargingOrder.getElectricity());
                }
                    chargingCapacity = chargingCapacity.add(charging_capacity);
                    chargingCapacityTotal = chargingCapacityTotal.add(charging_capacity);
                // 累加优惠金额
                if (tChargingOrder.getCouponDiscountAmount()!=null){
                    discountTotal = discountTotal.add(tChargingOrder.getCouponDiscountAmount());