From 1bbad460d9ed4b3999aee4c5ee62df4f27b4b8dc Mon Sep 17 00:00:00 2001
From: ZZ <coml_aaron@163.com>
Date: Mon, 14 Mar 2022 11:00:21 +0800
Subject: [PATCH] el npe

---
 .../notification/NotificationChargeOrderInfo4BonusTask.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java
index e3187fb0..6a52fb12 100644
--- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java
+++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java
@@ -81,7 +81,11 @@ public class NotificationChargeOrderInfo4BonusTask extends CoreDispatcher {
                 logger.error("station[{}] operator id evcs not set", chargingStationId);
                 return false;
             }
-            operatorIdEvcs = stationOperatorIdEvcs.substring(8, 17);
+            if (stationOperatorIdEvcs.length() == 18) {
+                operatorIdEvcs = stationOperatorIdEvcs.substring(8, 17);
+            } else {
+                operatorIdEvcs = stationOperatorIdEvcs;
+            }
         }
         EtOrderMapping etOrderMapping = saveOrderMapping(xhpcHistoryOrder, orderMappingRepository, operatorIdEvcs);
         CDChargeOrderInfo4BonusReq cdChargeOrderInfo4BonusReq = new CDChargeOrderInfo4BonusReq(xhpcHistoryOrder,