修改bug

Pu Zhibing

2024-10-09 a16959665e26c3c065217b7f3aca59c8bbed0e32

修改bug

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java

@@ -182,7 +182,7 @@
     * 修改安全检测数据
     * @param securityDetection
     */
    @PostMapping("/t-shopping-order/securityDetection")
    @PostMapping("/t-charging-order/securityDetection")
    void securityDetection(@RequestBody SecurityDetection securityDetection);
    
    
@@ -190,6 +190,6 @@
     * 远程启动充电应答
     * @param message
     */
    @PostMapping("/t-shopping-order/startChargeSuccessfully")
    @PostMapping("/t-charging-order/startChargeSuccessfully")
    void startChargeSuccessfully(PlatformStartChargingReplyMessage message);
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/base/BaseMessage.java

@@ -1,5 +1,6 @@
package com.ruoyi.integration.rocket.base;

import lombok.AllArgsConstructor;
import lombok.Data;

import java.time.LocalDateTime;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/GroundLockRealTimeDataMessage.java

@@ -1,6 +1,7 @@
package com.ruoyi.integration.rocket.model;

import com.ruoyi.integration.rocket.base.BaseMessage;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.data.mongodb.core.mapping.Document;

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

@@ -641,9 +641,9 @@
        //使用订单id作为逻辑卡号
        platformStartCharging.setCard_number(chargingOrder.getId().toString());
        platformStartCharging.setAccount_balance(electrovalence);

        System.err.println("-------------------远程调起开始充电请求-------------------");
        System.err.println(platformStartCharging.toString());
		
        log.error(chargingOrder.getCode() + "：-------------------远程调起开始充电请求-------------------");
        log.error(platformStartCharging.toString());

        sendMessageClient.platformStartCharging(platformStartCharging);
        //异步线程检测远程启动的应答结果。如果失败，则需要全额退款
@@ -685,8 +685,8 @@
        }
        
        List<PlatformStartChargingReply> data = platformStartChargingReplyClient.getPlatformStartChargingReply(code).getData();
        System.err.println(code + "：-------------------开始检查调起充电结果-------------------");
        System.err.println(data.toString());
        log.error(code + "：-------------------开始检查调起充电结果-------------------");
        log.error(data.toString());
        if(data.size() != 0){
            PlatformStartChargingReply platformStartChargingReply = data.get(1);
            Integer startup_result = platformStartChargingReply.getStartup_result();
@@ -725,7 +725,7 @@
            redisService.setCacheObject(key, preChargeCheck1, 24L, TimeUnit.HOURS);
            return true;
        }else{
            log.error(code + "：未上传开启充电结果........");
            log.error(code + "：-------------------未上传开启充电结果-------------------");
            
            Integer counter = boot_failed_map.get(code);
            PreChargeCheck preChargeCheck1 = redisService.getCacheObject(key);
@@ -820,6 +820,7 @@
     * @param code
     */
    public void refund(String code){
        log.error(code + "：-------------------充电启动失败，执行退款-------------------");
        TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, code));
        if(chargingOrder.getStatus() == 2){
            Integer rechargePaymentType = chargingOrder.getRechargePaymentType();