Explorar el Código

流量卡完善

lijin hace 1 año
padre
commit
84d8038e8f

+ 1 - 1
device-api-service/src/main/java/com/xy/service/DeviceDataServiceImpl.java

@@ -502,7 +502,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
                 .ge(DeviceInfo::getCreateTime, queryDate).eq(DeviceInfo::getActiveState, EnumDeviceActiveStatus.N_1.getCode()));
         vo.setNewNum(newAdd.intValue());
         //活跃 产生订单的
-        Integer activeNum = null;
+        Integer activeNum = R.feignCheckData(ordersService.deviceActiveCount(new CountDto.MercCountDTO().setStartTime(DateUtil.format(queryDate, DatePattern.NORM_DATETIME_PATTERN))));
         vo.setActiveNum(activeNum);
         //设备管理费
         Long debtNum = deviceChargingService.count(Wrappers.<DeviceCharging>lambdaQuery().lt(DeviceCharging::getTimeout, DateUtil.now()));