Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

xuhy

3 天以前 ff265ba53df1d9e89ae2d4258007cd2e02811f8c

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

@@ -131,15 +131,6 @@
                    BeanUtils.copyProperties(one, vo);
                    R r = chargingOrderService.endChargeBillingCharge(vo);
                    log.info("定时任务执行，充电中的订单处理结果：{}", JSON.toJSONString(r));
                    
                    if(200 == r.getCode()){
                        order = chargingOrderService.getById(order.getId());
                        //推送监管平台订单状态和订单详情
                        ChargingOrderVo chargingOrderVo = new ChargingOrderVo();
                        BeanUtils.copyProperties(order, chargingOrderVo);
                        chargingMessageClient.pushOrderInfo(chargingOrderVo);
                        chargingMessageClient.pushOrderStatus(chargingOrderVo);
                    }
                }
            }
        }