diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 56a54097d..5f88ee3fb 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -430,6 +430,9 @@ public class OrderService { order.setTransactionCode(orderBasicInfo.getTransactionCode()); order.setOrderStatus(orderBasicInfo.getOrderStatus()); order.setLogicCard(orderBasicInfo.getLogicCard()); + if (orderBasicInfo.getVinCode() != null) { + order.setVinCode(orderBasicInfo.getVinCode()); + } String describe = orderBasicInfoService.transformOrderStatusDescribe(orderBasicInfo.getOrderStatus(), orderBasicInfo.getPayStatus()); order.setOrderStatusDescribe(describe); order.setStartTime(DateUtils.formatDateTime(orderBasicInfo.getChargeStartTime())); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java index a52a59a0b..a3af8d280 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java @@ -59,6 +59,7 @@ public class OrderDetailInfoVO { private String orderStatus; // 订单状态 private String orderStatusDescribe; // 订单状态描述 private String logicCard; // 卡号 + private String vinCode; // vin号 private String startTime; // 充电开始时间 private String endTime; // 充电结束时间 private String stopReasonMsg; // 停止原因 diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue index 19d1b20b6..c21937b52 100644 --- a/jsowell-ui/src/views/order/order/orderDetail.vue +++ b/jsowell-ui/src/views/order/order/orderDetail.vue @@ -71,6 +71,10 @@ orderInfo.logicCard }} + {{ + orderInfo.vinCode + }} + {{ orderInfo.orderStatusDescribe }}