bug修改

无关风月

2025-02-07 cfb640b05d0eca5e95b355d5b04f345be262923e

bug修改

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

@@ -132,8 +132,9 @@
        List<TChargingOrderExport> tChargingOrderExports = new ArrayList<>();
        List<ChargingOrderListVO> exportList = res.getExportList();
        int i = 0;
        List<Site> data9 = siteClient.getSiteAll().getData();
        List<TChargingGun> data = chargingGunClient.getAllGun().getData();

        List<Site> data9 = siteClient.getSiteAll().getData();
        List<TAppUser> data6 = appUserClient.getAllUser().getData();
        List<Partner> data7 = siteClient.getAllPartner().getData();
        List<AccountingStrategyOrder> listAll = accountingStrategyOrderService.lambdaQuery()

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

@@ -1190,8 +1190,12 @@
    @Override
    public TCharingOrderVO chargingOrder(ChargingOrderQuery dto) {
        TCharingOrderVO tCharingOrderVO = new TCharingOrderVO();


        List<TChargingGun> allGun = chargingGunClient.getAllGun().getData();
        List<TChargingPile> allPile = chargingGunClient.getAllPile().getData();
        List<Site> data9 = siteClient.getSiteAll().getData();
        List<TAppUser> data6 = appUserClient.getAllUser().getData();
        List<Partner> data7 = siteClient.getAllPartner().getData();
        List<TAppUserCar> data4 = appUserCarClient.getAllCar().getData();
        String startTime1 = null;
        String startTime2 = null;
        String endTime1 = null;
@@ -1264,6 +1268,8 @@
         BigDecimal refundMoney = new BigDecimal("0");
         BigDecimal paymentMoney = new BigDecimal("0");
        List<String> collect2 = list.stream().map(TChargingOrder::getCode).collect(Collectors.toList());
        List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list(new QueryWrapper<TChargingOrderAccountingStrategy>());

        for (ChargingOrderVO chargingOrderVO : list) {
            if (roleType == 2){
                for (Integer siteId : siteIds) {
@@ -1276,20 +1282,19 @@
            chargingOrderVO.setCommissionAmount(chargingOrderVO.getOrderAmount()!=null?chargingOrderVO.getOrderAmount().multiply(new BigDecimal("0.006")):new BigDecimal("0"));
            chargingOrderVO.setPlatFormMoney(chargingOrderVO.getOrderAmount()!=null?chargingOrderVO.getOrderAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
            chargingOrderVO.setUid(chargingOrderVO.getId()+"");
            TChargingGun data3 = chargingGunClient.getChargingGunById(chargingOrderVO.getChargingGunId()).getData();
            TChargingPile data2 = chargingPileClient.getChargingPileById(chargingOrderVO.getChargingPileId()).getData();
            TChargingGun data3 = allGun.stream().filter(e->e.getId().equals(chargingOrderVO.getChargingGunId())).findFirst().orElse(null);
            TChargingPile data2 = allPile.stream().filter(e->e.getId().equals(chargingOrderVO.getChargingPileId())).findFirst().orElse(null);
            if (chargingOrderVO.getSiteId()!=null){
                List<Integer> integers = new ArrayList<>();
                integers.add(chargingOrderVO.getSiteId());
                List<Site> data = siteClient.getSiteByIds(integers).getData();
                if (!data.isEmpty())chargingOrderVO.setSiteName(data.get(0).getName());
                Site site = data9.stream().filter(e -> e.getId().equals(chargingOrderVO.getSiteId())).findFirst().orElse(null);
                if (site!=null)chargingOrderVO.setSiteName(site.getName());
            }
            if (data2!=null && data3!=null){
                chargingOrderVO.setTerminalName(data2.getName()+"-"+data3.getName());
            }
            // 充电订单 明细记录
            List<TChargingOrderAccountingStrategy> chargingOrderId = chargingOrderAccountingStrategyService.list(new QueryWrapper<TChargingOrderAccountingStrategy>()
                    .eq("charging_order_id", chargingOrderVO.getId()));
            List<TChargingOrderAccountingStrategy> chargingOrderId = list3.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderVO.getId())).collect(Collectors.toList());
            if (chargingOrderVO.getStartTime()!=null && chargingOrderVO.getEndTime()!=null){
                LocalDateTime startTime = chargingOrderVO.getStartTime();
                LocalDateTime endTime = chargingOrderVO.getEndTime();
@@ -1302,16 +1307,16 @@
            int size = chargingOrderId.size();
            chargingOrderVO.setCount(size);
            // 用户手机号
            TAppUser data = appUserClient.getUserById(chargingOrderVO.getAppUserId()).getData();
            TAppUser data = data6.stream().filter(e -> e.getId().equals(chargingOrderVO.getAppUserId())).findFirst().orElse(null);
            if (data!=null){
                // 车牌号
                chargingOrderVO.setPhone(data.getPhone());
                List<Long> longs = new ArrayList<>();
                if (chargingOrderVO.getAppUserCarId()!=null){
                    longs.add(chargingOrderVO.getAppUserCarId());
                    List<TAppUserCar> data1 = appUserCarClient.getCarByIds(longs).getData();
                    if (!data1.isEmpty()){
                        chargingOrderVO.setLicensePlate(data1.get(0).getLicensePlate());
                    TAppUserCar tAppUserCar = data4.stream().filter(e -> e.getId().equals(chargingOrderVO.getAppUserCarId())).findFirst().orElse(null);
                    if (tAppUserCar!=null){
                        chargingOrderVO.setLicensePlate(tAppUserCar.getLicensePlate());
                    }
                }

@@ -1538,7 +1543,7 @@
            }
            if (chargingOrderListVO.getChargingGunId()!=null && chargingOrderListVO.getChargingPileId()!=null){
                TChargingGun data1 = allGun.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingGunId())).findFirst().orElse(null);
                TChargingGun data2 = allGun.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingGunId())).findFirst().orElse(null);
                TChargingPile data2 = allPile.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingPileId())).findFirst().orElse(null);
                if (data2 != null && data1 != null) {
                    chargingOrderListVO.setTerminalName(data2.getName() + "-" + data1.getName());
                }
@@ -1648,7 +1653,7 @@
            }
            if (chargingOrderListVO.getChargingGunId()!=null && chargingOrderListVO.getChargingPileId()!=null){
                TChargingGun data1 = allGun.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingGunId())).findFirst().orElse(null);
                TChargingGun data2 = allGun.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingGunId())).findFirst().orElse(null);
                TChargingPile data2 = allPile.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingPileId())).findFirst().orElse(null);
                if (data2 != null && data1 != null) {
                    chargingOrderListVO.setTerminalName(data2.getName() + "-" + data1.getName());
                }