From dbf20ce75878e3c4d1571ac8475d54ab91e5127a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Mon, 3 Jul 2023 15:08:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8B=89=E5=8D=A1=E6=8B=89?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=91=E5=AE=9A=E8=A7=A3=E7=BB=91=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java
index 9403241..0919a2d 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java
@@ -191,7 +191,7 @@ public class DeviceStockServiceImpl extends ServiceImpl<DeviceStockMapper, Devic
         DeviceStock device = getById(id);
 
         if(device.getSnNo().startsWith("QR")){
-            MerchantBaseInfo merchantBaseInfo=merchantBaseInfoService.getMerchantBaseInfoByUserId(device.getBuyMercId());
+            MerchantBaseInfo merchantBaseInfo=merchantBaseInfoService.getMerchantBaseInfoByUserId(device.getBelongUserId().toString());
 
 
             boolean flag=lklPayService.deactivate(merchantBaseInfo,device.getSnNo());