修改bug

puzhibing

6 小时以前 66a18938bf8935f331feb4c5d44fdc195ea5750c

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

@@ -2086,14 +2086,6 @@
        return StringUtils.hasLength(vin) ? vin.replaceAll("\\s+", "").toUpperCase(Locale.ROOT) : null;
    }

    private boolean vinMatches(String expectedVin, String actualVin) {
        if (!StringUtils.hasLength(expectedVin) || !StringUtils.hasLength(actualVin)) {
            return false;
        }
        return expectedVin.equals(actualVin)
                || expectedVin.equals(new StringBuilder(actualVin).reverse().toString());
    }

    @Scheduled(fixedDelay = 5000L)
    public void startDueReservationOrders() {
        LocalDateTime now = LocalDateTime.now();
@@ -2135,17 +2127,6 @@
            TChargingGun gun = chargingGunClient.getChargingGunById(latest.getChargingGunId()).getData();
            TChargingPile pile = chargingPileClient.getChargingPileById(gun.getChargingPileId()).getData();
            String actualVin = normalizeVin(check.getActualVin());
            String expectedVin = normalizeVin(latest.getExpectedVin());
            if (Integer.valueOf(1).equals(pile.getVinFlag())
                    && !vinMatches(expectedVin, actualVin)) {
                check.setStartupSuccess(3);
                check.setFailureCause(9);
                latest.setActualVin(actualVin);
                this.updateById(latest);
                redisService.setCacheObject("AQJC_" + latest.getChargingGunId(), check, 24L, TimeUnit.HOURS);
                refund(latest.getCode());
                return;
            }
            PlatformStartCharging command = new PlatformStartCharging();
            command.setTransaction_serial_number(latest.getCode());
            command.setCharging_pile_code(pile.getCode());
@@ -2156,7 +2137,7 @@
            latest.setActualVin(actualVin);
            this.updateById(latest);
            redisService.setCacheObject("AQJC_" + latest.getChargingGunId(), check, 24L, TimeUnit.HOURS);
            log.info(latest.getCode() + "：安全检测及VIN校验通过，下发启动充电命令：" + command);
            log.info(latest.getCode() + "：安全检测通过，下发启动充电命令：" + command);
            sendMessageClient.platformStartCharging(command);
            ScheduledExecutorService resultScheduler = Executors.newScheduledThreadPool(1);
            resultScheduler.scheduleAtFixedRate(() -> {