修改bug

Pu Zhibing

6 天以前 88f8a06039ddb14cb1c8ac0c012b6d1ee8bd933a

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java

@@ -80,12 +80,14 @@
            List<TChargingOrder> failedStartupOrder = chargingOrderService.findFailedStartupOrder();
            log.info("定时任务执行，查询到启动失败的订单数量：{}", failedStartupOrder.size());
            for (TChargingOrder order : failedStartupOrder) {
                log.info("定时任务执行，查询到启动失败的订单：{}", order.getCode());
                //查询是否有充电信息
                List<UploadRealTimeMonitoringData> dataByOrderCode = uploadRealTimeMonitoringDataService.getDataByOrderCode(order.getCode());
                log.info("充电实时数据：{}", JSON.toJSONString(dataByOrderCode));
                log.info("充电实时数据：{}", dataByOrderCode.size());
                //没有充电数据，则执行退款
                if(null == dataByOrderCode || dataByOrderCode.isEmpty()){
                    log.info("定时任务执行，查询到启动失败的订单，执行退款：{}", order.getCode());
                    if(1 == order.getOrderSource()){
                    chargingOrderService.refund(order.getCode());
                    int num = 0;
                    while (true){
@@ -105,12 +107,17 @@
                            break;
                        }
                    }
                    }else{
                        order.setStatus(-1);
                        chargingOrderService.updateById(order);
                    }
                }
            }
            //处理退款中的数据
            List<TChargingOrder> stoppedOrder = chargingOrderService.findStoppedOrder();
            log.info("定时任务执行，查询到停止中的订单数量：{}", stoppedOrder.size());
            for (TChargingOrder order : stoppedOrder) {
                log.info("定时任务执行，查询到停止中的订单：{}", order.getCode());
                TransactionRecord one = transactionRecordService.findOne(order.getCode());
                if(null != one){
                    log.info("定时任务执行，查询到停止中的订单账单数据：{}", JSON.toJSONString(one));
@@ -124,6 +131,7 @@
            List<TChargingOrder> chargingOrder = chargingOrderService.findChargingOrder();
            log.info("定时任务执行，查询到充电中的订单数量：{}", chargingOrder.size());
            for (TChargingOrder order : chargingOrder) {
                log.info("定时任务执行，查询到充电中的订单：{}", order.getCode());
                TransactionRecord one = transactionRecordService.findOne(order.getCode());
                if(null != one && StringUtils.isNotEmpty(one.getResult())){
                    log.info("定时任务执行，查询到充电中的订单账单数据：{}", JSON.toJSONString(one));