Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java

@@ -436,6 +436,11 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
         // 订单退款
         refundOrder(orderBasicInfo);
 
+        // 如果是vin启动，将启动锁定状态改为正常
+        if (StringUtils.equals(data.getTransactionIdentifier(), "05")) {
+            vinStatusUnlocked(data.getVinCode());
+        }
+
         // 发送停止充电订阅消息
         sendMsg(orderBasicInfo);