由于获取的deviceId不是完全可靠，所以设备表的唯一键要由shopId + deviceId组成

app-ghs/controllers/AdminController.php

@@ -108,7 +108,7 @@ class AdminController extends BaseController
         $this->admin->clientId = $id;
         $this->admin->save();
 
-        $ghsDevice = GhsDeviceClass::getByCondition(['deviceId'=>$deviceId], true);
+        $ghsDevice = GhsDeviceClass::getByCondition(['shopId'=>$this->shopId, 'deviceId'=>$deviceId], true);
         if ($ghsDevice == null){
             $device = [
                 'deviceId' => $deviceId,

app-hd/controllers/AdminController.php

@@ -443,7 +443,7 @@ class AdminController extends BaseController
             util::success(['returnStatus' => 'FAILURE']);
         }
 
-        $hdDevice = HdDeviceClass::getByCondition(['deviceId'=>$deviceId], true);
+        $hdDevice = HdDeviceClass::getByCondition(['shopId'=>$this->shopId, 'deviceId'=>$deviceId], true);
         if ($hdDevice == null) {
             $device = [
                 'deviceId' => $deviceId,