diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java
index 30cadc4aa..14c99bec8 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java
@@ -604,24 +604,24 @@ public class TransactionRecordsRequestHandler extends AbstractHandler {
 			if (Objects.isNull(orderBasicInfo.getChargeEndTime())) { // 结束时间
 				orderBasicInfo.setChargeEndTime(DateUtils.parseDate(data.getEndTime()));
 			}
-			if (!StringUtils.equals("0000000000000000", data.getLogicCard())) {
-				// 根据物理卡号查出当前为锁定状态的卡
-				PileAuthCard cardInfo = pileAuthCardService.selectSomeStatusCardInfo(CardStatusEnum.START_LOCK.getCode(), orderBasicInfo.getLogicCard());
-				if (cardInfo != null) {
-					// orderBasicInfo.setMemberId(cardInfo.getMemberId());
-					// 将此卡状态改为正常
-					cardInfo.setStatus(CardStatusEnum.NORMAL.getCode());
-					pileAuthCardService.updatePileAuthCard(cardInfo);
-				}
-			}
-			// 如果是vin启动，将启动锁定状态改为正常
-			if (StringUtils.equals(data.getTransactionIdentifier(), "05")) {
-				MemberPlateNumberRelation plateInfo = memberPlateNumberRelationService.getMemberPlateInfoByVinCode(data.getVinCode());
-				if (plateInfo != null && (StringUtils.equals(plateInfo.getVinStatus(), "2"))) {
-					plateInfo.setVinStatus("1");
-					memberPlateNumberRelationService.updateMemberPlateNumberRelation(plateInfo);
-				}
-			}
+			// if (!StringUtils.equals("0000000000000000", data.getLogicCard())) {
+			// 	// 根据物理卡号查出当前为锁定状态的卡
+			// 	PileAuthCard cardInfo = pileAuthCardService.selectSomeStatusCardInfo(CardStatusEnum.START_LOCK.getCode(), orderBasicInfo.getLogicCard());
+			// 	if (cardInfo != null) {
+			// 		// orderBasicInfo.setMemberId(cardInfo.getMemberId());
+			// 		// 将此卡状态改为正常
+			// 		cardInfo.setStatus(CardStatusEnum.NORMAL.getCode());
+			// 		pileAuthCardService.updatePileAuthCard(cardInfo);
+			// 	}
+			// }
+			// // 如果是vin启动，将启动锁定状态改为正常
+			// if (StringUtils.equals(data.getTransactionIdentifier(), "05")) {
+			// 	MemberPlateNumberRelation plateInfo = memberPlateNumberRelationService.getMemberPlateInfoByVinCode(data.getVinCode());
+			// 	if (plateInfo != null && (StringUtils.equals(plateInfo.getVinStatus(), "2"))) {
+			// 		plateInfo.setVinStatus("1");
+			// 		memberPlateNumberRelationService.updateMemberPlateNumberRelation(plateInfo);
+			// 	}
+			// }
 			orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo);
 
 			// 结算订单操作
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 4ffc449fb..46480e761 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -805,6 +805,30 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         transactionService.doUpdateOrder(dto);
         logger.info("结算订单 end OrderTransactionDTO:{}", JSONObject.toJSONString(dto));
 
+        try {
+            // 将卡/vin状态解锁
+            if (!StringUtils.equals("0000000000000000", data.getLogicCard())) {
+                // 根据物理卡号查出当前为锁定状态的卡
+                PileAuthCard cardInfo = pileAuthCardService.selectSomeStatusCardInfo(CardStatusEnum.START_LOCK.getCode(), orderBasicInfo.getLogicCard());
+                if (cardInfo != null) {
+                    // orderBasicInfo.setMemberId(cardInfo.getMemberId());
+                    // 将此卡状态改为正常
+                    cardInfo.setStatus(CardStatusEnum.NORMAL.getCode());
+                    pileAuthCardService.updatePileAuthCard(cardInfo);
+                }
+            }
+            // 如果是vin启动，将启动锁定状态改为正常
+            if (StringUtils.equals(data.getTransactionIdentifier(), "05")) {
+                MemberPlateNumberRelation plateInfo = memberPlateNumberRelationService.getMemberPlateInfoByVinCode(data.getVinCode());
+                if (plateInfo != null && (StringUtils.equals(plateInfo.getVinStatus(), "2"))) {
+                    plateInfo.setVinStatus("1");
+                    memberPlateNumberRelationService.updateMemberPlateNumberRelation(plateInfo);
+                }
+            }
+        } catch (Exception e) {
+            logger.error("解锁卡/vin状态 error,", e);
+        }
+
         try {
             // uniApp 发送停止充电订阅消息
             WechatSendMsgDTO wechatSendMsgDTO = new WechatSendMsgDTO();