update

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -841,8 +841,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
             logger.error("解锁卡/vin状态 error,", e);
         }
 
-        try {
+        // 发送停止充电订阅消息
+        sendMsg(orderBasicInfo);
+
+        // 从redis中取出实时记录保存到表中
+        realTimeMonitorDataRedis2DB(orderBasicInfo.getTransactionCode(), orderBasicInfo.getOrderCode());
+    }
+
     // uniApp 发送停止充电订阅消息
+    private void sendMsg(OrderBasicInfo orderBasicInfo) {
+        try {
             WechatSendMsgDTO wechatSendMsgDTO = new WechatSendMsgDTO();
             wechatSendMsgDTO.setOrderCode(orderBasicInfo.getOrderCode());
             Map<String, String> resultMap = wxAppletRemoteService.stopChargingSendMsg(wechatSendMsgDTO);
@@ -850,13 +858,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         } catch (Exception e) {
             logger.error("小程序发送充电停止推送消息 error", e);
         }
-
-        try {
-            realTimeMonitorDataRedis2DB(orderBasicInfo.getTransactionCode(), orderBasicInfo.getOrderCode());
-        } catch (Exception e) {
-            logger.error("redis中取出实时记录保存到表 发生异常", e);
-        }
-
     }
 
     /**
@@ -902,6 +903,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
      */
     @Override
     public void realTimeMonitorDataRedis2DB(String transactionCode, String orderCode) {
+        try {
             if (StringUtils.isBlank(transactionCode) || StringUtils.isBlank(orderCode)) {
                 return;
             }
@@ -944,7 +946,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
                 String redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + pileConnectorCode + "_" + transactionCode;
                 redisCache.deleteObject(redisKey);
             }
-
+        } catch (Exception e) {
+            logger.info("redis中取出实时记录保存到表发生异常", e);
+        }
     }
 
     /**