Merge branch 'zhongqi-delivery' into dev

app-ghs/controllers/ShopController.php

@@ -464,8 +464,17 @@ class ShopController extends BaseController
 
         if ($deviceId != '') {
             //设备登录状态更新
-            \bizGhs\device\classes\GhsDeviceClass::updateByCondition(['shopId'=>$this->shopId, 'deviceId'=>$deviceId], ['status'=>0]);
-            //\bizGhs\device\classes\GhsDeviceClass::updateByCondition(['shopId'=>$newShop, 'deviceId'=>$deviceId], ['status'=>1]);
+            $oldDevice = \bizGhs\device\classes\GhsDeviceClass::getByCondition(['shopId'=>$this->shopId, 'deviceId'=>$deviceId], true);
+            if ($oldDevice) {
+                $oldDevice->status = 0;
+                $oldDevice->save();
+            }
+
+            $newLoginDevice = \bizGhs\device\classes\GhsDeviceClass::getByCondition(['shopId'=>$newShop, 'deviceId'=>$deviceId], true);
+            if ($newLoginDevice) {
+                $newLoginDevice->status = 1;
+                $newLoginDevice->save();
+            }
         }
 
         util::success($res);

app-hd/controllers/ShopController.php

@@ -238,8 +238,17 @@ class ShopController extends BaseController
 
         if ($deviceId != '') {
             //设备登录状态更新
-            \bizHd\device\classes\HdDeviceClass::updateByCondition(['shopId' => $this->shopId, 'deviceId' => $deviceId], ['status' => 0]);
-            //\bizHd\device\classes\HdDeviceClass::updateByCondition(['shopId'=>$newShopId, 'deviceId'=>$deviceId], ['status'=>1]);
+            $oldDevice = \bizHd\device\classes\HdDeviceClass::getByCondition(['shopId' => $this->shopId, 'deviceId' => $deviceId], true);
+            if ($oldDevice) {
+                $oldDevice->status = 0;
+                $oldDevice->save();
+            }
+
+            $newLoginDevice = \bizHd\device\classes\HdDeviceClass::getByCondition(['shopId'=>$newShopId, 'deviceId'=>$deviceId], true);
+            if ($newLoginDevice) {
+                $newLoginDevice->status = 1;
+                $newLoginDevice->save();
+            }
         }
 
         util::success($res);