From b66a5f3e15ea374016bb3559246fe0e0c3c19d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Tue, 21 May 2024 14:33:47 +0800
Subject: [PATCH] debug

---
 .../ruoyi/ss/device/service/ISmDeviceService.java    |  4 ++--
 .../ss/device/service/impl/SmDeviceServiceImpl.java  | 12 ++++++++----
 .../web/controller/app/AppDeviceController.java      |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/ISmDeviceService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/ISmDeviceService.java
index 4e95b961..0962570d 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/ISmDeviceService.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/ISmDeviceService.java
@@ -108,12 +108,12 @@ public interface ISmDeviceService
      * @param storeId 店铺ID
      * @param deviceNo 设备编号（SN）
      */
-    boolean bindBySn(Long storeId, String deviceNo);
+    String bindBySn(Long storeId, String deviceNo);
 
     /**
      * 通过MAC绑定设备
      */
-    boolean bindByMac(Long storeId, String mac);
+    String bindByMac(Long storeId, String mac);
 
     /**
      * 商户解绑设备
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/SmDeviceServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/SmDeviceServiceImpl.java
index 1ff83239..665989bc 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/SmDeviceServiceImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/SmDeviceServiceImpl.java
@@ -465,18 +465,22 @@ public class SmDeviceServiceImpl implements ISmDeviceService
 
     @Override
     @Transactional
-    public boolean bindBySn(Long storeId, String deviceNo) {
+    public String bindBySn(Long storeId, String deviceNo) {
         SmDeviceVo device = selectByDeviceNo(deviceNo);
         return this.bind(storeId, device);
     }
 
     @Override
-    public boolean bindByMac(Long storeId, String mac) {
+    public String bindByMac(Long storeId, String mac) {
         SmDeviceVo device = selectByMac(mac);
         return this.bind(storeId, device);
     }
 
-    private boolean bind(Long storeId, SmDeviceVo device) {
+    private String bind(Long storeId, SmDeviceVo device) {
+        // 如果绑定的店铺是原来的店铺，则直接返回MAC
+        if (device.getStoreId() != null && device.getStoreId().equals(storeId)) {
+            return device.getMac();
+        }
         ServiceUtil.assertion(device == null, "设备未录入");
         ServiceUtil.assertion(device.getStoreId() != null, "该设备已被绑定");
 
@@ -493,7 +497,7 @@ public class SmDeviceServiceImpl implements ISmDeviceService
             smDeviceBindRecordService.record(store.getUserId(), device.getDeviceId());
         }, 0, TimeUnit.SECONDS);
 
-        return true;
+        return device.getMac();
     }
 
     /**
diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java
index b61ef602..0562c79f 100644
--- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java
+++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java
@@ -106,9 +106,9 @@ public class AppDeviceController extends BaseController {
             return error("设备编号和mac不能同时为空");
         }
         if (StringUtils.hasText(device.getDeviceNo())) {
-            return success(smDeviceService.bindBySn(device.getStoreId(), device.getDeviceNo()));
+            return AjaxResult.success("操作成功", smDeviceService.bindBySn(device.getStoreId(), device.getDeviceNo()));
         } else {
-            return success(smDeviceService.bindByMac(device.getStoreId(), device.getMac()));
+            return AjaxResult.success("操作成功", smDeviceService.bindByMac(device.getStoreId(), device.getMac()));
         }
     }