From e98b3a8acf7d14af2a329fdfcd727bda2a1169e4 Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 30 Mar 2023 08:56:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AE=A1=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E5=92=8C=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E6=96=B0=E5=A2=9E=20=E5=90=AF=E5=8A=A8=E5=8D=A1?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/OrderService.java | 1 + .../netty/handler/ConfirmStartChargingRequestHandler.java | 1 + .../main/java/com/jsowell/pile/domain/OrderBasicInfo.java | 6 ++++++ .../java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java | 1 + .../src/main/java/com/jsowell/pile/vo/web/OrderListVO.java | 6 ++++++ .../src/main/resources/mapper/pile/OrderBasicInfoMapper.xml | 3 +++ jsowell-ui/src/views/order/order/index.vue | 1 + jsowell-ui/src/views/order/order/orderDetail.vue | 1 + 8 files changed, 20 insertions(+) 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 834c77ebf..9857d3cf5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -607,6 +607,7 @@ public class OrderService { order.setOrderCode(orderBasicInfo.getOrderCode()); order.setTransactionCode(orderBasicInfo.getTransactionCode()); order.setOrderStatus(orderBasicInfo.getOrderStatus()); + order.setLogicCard(orderBasicInfo.getLogicCard()); String describe = orderBasicInfoService.transformOrderStatusDescribe(orderBasicInfo.getOrderStatus(), orderBasicInfo.getPayStatus()); order.setOrderStatusDescribe(describe); order.setStartTime(DateUtils.formatDateTime(orderBasicInfo.getChargeStartTime())); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java index 022941e3c..978401764 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java @@ -170,6 +170,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ .pileSn(pileSn) .connectorCode(connectorCode) .pileConnectorCode(pileSn + connectorCode) + .logicCard(logicCard) .startMode(StartModeEnum.CARD.getValue()) .payStatus(Constants.ZERO) .payAmount(new BigDecimal(String.valueOf(accountBalance))) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java index 824adae90..e637842b3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java @@ -79,6 +79,12 @@ public class OrderBasicInfo extends BaseEntity { @Excel(name = "充电桩枪口编号") private String pileConnectorCode; + /** + * 逻辑卡号 + */ + @Excel(name = "逻辑卡号") + private String logicCard; + /** * 启动方式 * 0-后管启动；1-用户app启动 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 3f6481292..32fd2ec15 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 @@ -63,6 +63,7 @@ public class OrderDetailInfoVO { private String transactionCode; // 交易流水号 private String orderStatus; // 订单状态 private String orderStatusDescribe; // 订单状态描述 + private String logicCard; // 卡号 private String startTime; // 充电开始时间 private String endTime; // 充电结束时间 private String stopReasonMsg; // 停止原因 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java index 76fd487a5..cd2b88893 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java @@ -90,6 +90,12 @@ public class OrderListVO { @Excel(name = "充电桩枪口编号") private String pileConnectorCode; + /** + * 逻辑卡号 + */ + @Excel(name = "逻辑卡号") + private String logicCard; + /** * 启动方式（0-后管启动；1-用户app启动） */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 51aea4c1c..968328ac9 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -13,6 +13,7 @@ + @@ -90,6 +91,7 @@ pile_sn, connector_code, pile_connector_code, + logic_card, start_mode, pay_mode, pay_status, @@ -159,6 +161,7 @@ t3.station_name as stationName, t1.pile_sn as pileSn, t1.connector_code as connectorCode, + t1.logic_card as logicCard, t1.start_mode as startMode, t1.pay_mode as payMode, t1.pay_status as payStatus, diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue index 98c2e6371..fc50b5314 100644 --- a/jsowell-ui/src/views/order/order/index.vue +++ b/jsowell-ui/src/views/order/order/index.vue @@ -164,6 +164,7 @@ +