From 70082014b9b5c62f2edee1301343b3e54cfdc72e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 25 十月 2024 11:27:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
index e294a86..e831ef1 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
@@ -93,6 +93,14 @@
TChargingOrder tChargingOrder = chargingOrderMapper.selectById(orderAppeal.getOrderId());
orderAppealVO.setChargingOrder(tChargingOrder);
if(Objects.nonNull(tChargingOrder)){
+ SiteNameVO siteNameVO = chargingGunClient.getAllInfoById(tChargingOrder.getChargingGunId()).getData();
+ if(Objects.nonNull(siteNameVO)){
+ orderAppealVO.setGunName(siteNameVO.getGunName());
+ orderAppealVO.setGunNumber(siteNameVO.getGunNumber());
+ orderAppealVO.setPileName(siteNameVO.getPileName());
+ orderAppealVO.setPileNumber(siteNameVO.getPileNumber());
+ orderAppealVO.setSiteName(siteNameVO.getSiteName());
+ }
orderAppealVO.setEndMode(tChargingOrder.getEndMode());
}
}else if (orderAppeal.getOrderType() == 2) {
--
Gitblit v1.7.1