抄送流量卡-运营首页概况

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -448,12 +448,12 @@ public class MercMiniDeviceController {
             return R.fail("您输入的授权码有误或者无效！");
         }
         //验证通过，缓存去掉授权码，并更新状态
-        Long mercId = MercAuthUtils.getMercId();
+//        Long mercId = MercAuthUtils.getMercId();
         DeviceBluetoothAuth deviceBluetoothAuth = deviceBluetoothAuthService.getOne(Wrappers.<DeviceBluetoothAuth>lambdaQuery()
-                .eq(DeviceBluetoothAuth::getDeviceId, deviceId)
-                .eq(DeviceBluetoothAuth::getAuthCode, authCode)
-                .eq(DeviceBluetoothAuth::getMercId, mercId)
-                .eq(DeviceBluetoothAuth::getUseStatus, DeviceAuthCodeUseStatus.UN_USED.getCode())
+                        .eq(DeviceBluetoothAuth::getDeviceId, deviceId)
+                        .eq(DeviceBluetoothAuth::getAuthCode, authCode)
+//                .eq(DeviceBluetoothAuth::getMercId, mercId)
+                        .eq(DeviceBluetoothAuth::getUseStatus, DeviceAuthCodeUseStatus.UN_USED.getCode())
         );
         if (deviceBluetoothAuth == null) {
             return R.fail("您输入的授权码无效！");