From eaada0d4f9c7370691a69a3524674ecd60f61d96 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 14:34:54 +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

---
 .../deviceStock/impl/DeviceStockServiceImpl.java       | 10 ++++++++++
 1 file changed, 10 insertions(+)

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 af6863a..9403241 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
@@ -116,8 +116,18 @@ public class DeviceStockServiceImpl extends ServiceImpl<DeviceStockMapper, Devic
         MerchantBaseInfo baseInfo = merchantBaseInfoService.queryMerchantBaseInfo(info);
         MsgException.check(baseInfo == null, "当前商户异常或不存在！");
 
+
+
         MsgException.check("3".equals(deviceStock.getStatus()), "当前设备已绑定，请勿重复绑定！");
 
+        if(deviceStock.getSnNo().startsWith("QR")){
+          boolean flag=  lklPayService.activityCloudDevice(baseInfo,deviceStock.getSnNo());
+          if(!flag){
+              MsgException.checkNull(null,"设备激活失败");
+          }
+        }
+
+
         deviceStock.setActMercName(baseInfo.getAlias());
         deviceStock.setActMercId(String.valueOf(baseInfo.getId()));
         deviceStock.setStatus("3");