Merge remote-tracking branch 'origin/master'

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("您输入的授权码无效！");

device-api-service/src/main/java/com/xy/service/DeviceSimServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xy.service;
 
+import cn.hutool.core.util.BooleanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
@@ -7,6 +8,7 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yitter.idgen.YitIdHelper;
 import com.xy.collections.list.JArrayList;
@@ -72,6 +74,14 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
 
     private FileConfig fileConfig;
 
+
+    @PostMapping("countWaitHandle")
+    @ApiOperation("抄送流量卡-运营首页概况")
+    public R<Long> countWaitHandle() {
+        long count = count(Wrappers.<DeviceSim>lambdaQuery().eq(DeviceSim::getWaitHandle, true));
+        return R.ok(count);
+    }
+
     @Override
     @ApiOperation("购买")
     public R pay(DeviceSimDto.Pay pay) {
@@ -428,4 +438,4 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
         private String isTest;
 
     }
-}
+}