需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/big/BigLogic.java

@@ -351,18 +351,16 @@ public class BigLogic {
                 .between(UserLog::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -1), DateUtil.offsetDay(DateUtil.endOfDay(new Date()), -1)).count();
 
 
-        Integer allUser = userService.lambdaQuery().eq(User::getType, UserTypeEnum.GENERAL.getKey())
-                .in(!CollectionUtils.isEmpty(companyIds), User::getCompanyWechatId, companyIds).count();
+        Integer allUser = adminUserService.lambdaQuery().eq(AdminUser::getStatus, true)
+                .in(!CollectionUtils.isEmpty(companyIds), AdminUser::getCompanyWechatId, companyIds).count();
 
 
-        Integer allUserLogin = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.NO.getKey())
-                .eq(UserLog::getMiniType, UserTypeEnum.GENERAL.getKey())
+        Integer allUserLogin = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.YES.getKey())
                 .eq(UserLog::getType, "LOGIN")
                 .in(!CollectionUtils.isEmpty(companyIds), UserLog::getCompanyWechatId, companyIds)
                 .between(UserLog::getCreateTime, DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())).count();
 
         Integer allUserBefore = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.YES.getKey())
-                .eq(UserLog::getMiniType, UserTypeEnum.GENERAL.getKey())
                 .eq(UserLog::getType, "LOGIN")
                 .in(!CollectionUtils.isEmpty(companyIds), UserLog::getCompanyWechatId, companyIds)
                 .between(UserLog::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -1), DateUtil.offsetDay(DateUtil.endOfDay(new Date()), -1)).count();