feat: merge v3dev into main

This commit is contained in:
Gordon
2023-07-12 15:12:23 +08:00
123 changed files with 7377 additions and 10288 deletions
+8 -3
View File
@@ -29,13 +29,18 @@ func (s *userServer) UserRegisterCount(
if req.Start > req.End {
return nil, errs.ErrArgs.Wrap("start > end")
}
total, err := s.CountTotal(ctx)
total, err := s.CountTotal(ctx, nil)
if err != nil {
return nil, err
}
count, err := s.CountRangeEverydayTotal(ctx, time.UnixMilli(req.Start), time.UnixMilli(req.End))
start := time.UnixMilli(req.Start)
before, err := s.CountTotal(ctx, &start)
if err != nil {
return nil, err
}
return &pbuser.UserRegisterCountResp{Total: total, Count: count}, nil
count, err := s.CountRangeEverydayTotal(ctx, start, time.UnixMilli(req.End))
if err != nil {
return nil, err
}
return &pbuser.UserRegisterCountResp{Total: total, Before: before, Count: count}, nil
}