From 7214dd4a5702ecbec52728eac4b31c347aa52689 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Sat, 3 Aug 2024 17:31:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hfkj/channel/gas/newlink/NewLinkGasService.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/service/src/main/java/com/hfkj/channel/gas/newlink/NewLinkGasService.java b/service/src/main/java/com/hfkj/channel/gas/newlink/NewLinkGasService.java
index 3a36ed5..0b4d8df 100644
--- a/service/src/main/java/com/hfkj/channel/gas/newlink/NewLinkGasService.java
+++ b/service/src/main/java/com/hfkj/channel/gas/newlink/NewLinkGasService.java
@@ -348,10 +348,8 @@ public class NewLinkGasService {
         }
         else if ("120000".equals(response.getString("code"))) {
             /*** 油站下线 ***/
-            // 获取加油站数据
-            JSONObject gasData = response.getJSONObject("result");
             // 查询商户
-            BsMerchant merchant = merchantService.getMerchant(gasData.getString("gasId"));
+            BsMerchant merchant = merchantService.getMerchant(merNo);
             if (merchant != null) {
                 merchant.setStatus(MerchantStatusEnum.status2.getNumber());
                 // 修改商户信息