From cd42805c21f822491170f1ca1665d46b25fcf86c Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Mon, 7 Apr 2025 09:30:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E8=AE=A2=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0try=20catch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../programlogic/NotDelayMerchantProgramLogic.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
index c4d6932f8..f9bc2fd94 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
@@ -450,12 +450,20 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
 
         // 将卡/vin状态解锁
         if (!StringUtils.equals("0000000000000000", data.getLogicCard())) {
-            cardStatusUnlocked(orderBasicInfo.getLogicCard());
+            try {
+                cardStatusUnlocked(orderBasicInfo.getLogicCard());
+            } catch (Exception e) {
+                logger.error("【{}】-结算订单:{}, 将卡/vin状态解锁失败", this.getClass().getSimpleName(), orderBasicInfo.getOrderCode(), e);
+            }
         }
 
         // 如果是vin启动，将启动锁定状态改为正常
         if (StringUtils.equals(data.getTransactionIdentifier(), "05")) {
-            vinStatusUnlocked(data.getVinCode());
+            try {
+                vinStatusUnlocked(data.getVinCode());
+            } catch (Exception e) {
+                logger.error("【{}】-结算订单:{}, 将启动锁定状态改为正常失败", this.getClass().getSimpleName(), orderBasicInfo.getOrderCode(), e);
+            }
         }
 
         // 发送停止充电订阅消息