From 4012bded166a10d57cf29dc4d518433ff3fdd99d Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期四, 17 七月 2025 11:21:20 +0800 Subject: [PATCH] 修改监管上传bug --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 18 ++++++------------ ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 9 --------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java index d956b76..2eb375b 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java @@ -1289,12 +1289,6 @@ sendMessageClient.platformStopCharging(platformStopCharging); log.info(code1 + ":-------------------远程停止充电请求-------------------"); log.info(platformStopCharging.toString()); - - //推送监管平台订单状态和订单详情 - ChargingOrderVo chargingOrderVo = new ChargingOrderVo(); - BeanUtils.copyProperties(order, chargingOrderVo); - chargingMessageClient.pushOrderInfo(chargingOrderVo); - chargingMessageClient.pushOrderStatus(chargingOrderVo); }); //推送三方平台 if (2 == order.getOrderSource()) { @@ -2807,6 +2801,12 @@ summaryData.setElectricPrice(electronic_reduce.setScale(2, BigDecimal.ROUND_HALF_EVEN)); summaryData.setServicePrice(serviceMoney.setScale(2, BigDecimal.ROUND_HALF_EVEN)); chargingOrderSummaryDataService.save(summaryData); + + //推送监管平台订单状态和订单详情 + ChargingOrderVo chargingOrderVo = new ChargingOrderVo(); + BeanUtils.copyProperties(chargingOrder, chargingOrderVo); + chargingMessageClient.pushOrderInfo(chargingOrderVo); + chargingMessageClient.pushOrderStatus(chargingOrderVo); } catch (Exception e) { e.printStackTrace(); } finally { @@ -4183,12 +4183,6 @@ sendMessageClient.platformStopCharging(platformStopCharging); log.info(code1 + ":-------------------远程停止充电请求-------------------"); log.info(platformStopCharging.toString()); - - //推送监管平台订单状态和订单详情 - ChargingOrderVo chargingOrderVo = new ChargingOrderVo(); - BeanUtils.copyProperties(chargingOrder, chargingOrderVo); - chargingMessageClient.pushOrderInfo(chargingOrderVo); - chargingMessageClient.pushOrderStatus(chargingOrderVo); }); return R.ok(); } diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java index 032d4db..c9c2c85 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java +++ b/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); - } } } } -- Gitblit v1.7.1