HI-VPN/hi-server
4
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

家庭组逻辑导致支付失败
Build docker and publish / build (20.15.1) (push) Failing after 9m9s
Details

Browse Source
This commit is contained in:
shanshanzhong
2026-03-05 02:13:28 -08:00
parent f4fe0e32a8
commit 9f4d71770b
7 changed files with 349 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/logic/admin/console/queryServerTotalDataLogic.go
+24 -15
View File
@@ -69,14 +69,17 @@ func (l *QueryServerTotalDataLogic) QueryServerTotalData() (resp *types.ServerTo
yesterday := todayStart.Add(-24 * time.Hour).Format(time.DateOnly)
var yesterdayLog log.SystemLog
err = query.Model(&log.SystemLog{}).Where("`date` = ? AND `type` = ?", yesterday, log.TypeUserTrafficRank).First(&yesterdayLog).Error
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
l.Errorw("[QueryServerTotalDataLogic] Query yesterday user traffic rank log error", logger.Field("error", err.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Query yesterday user traffic rank log error: %v", err)
yesterdayUserRankQuery := query.Model(&log.SystemLog{}).
Where("`date` = ? AND `type` = ?", yesterday, log.TypeUserTrafficRank).
Limit(1).
Find(&yesterdayLog)
if yesterdayUserRankQuery.Error != nil {
l.Errorw("[QueryServerTotalDataLogic] Query yesterday user traffic rank log error", logger.Field("error", yesterdayUserRankQuery.Error.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Query yesterday user traffic rank log error: %v", yesterdayUserRankQuery.Error)
}
var yesterdayUserRankData []types.UserTrafficData
if yesterdayLog.Id > 0 {
if yesterdayUserRankQuery.RowsAffected > 0 {
var rank log.UserTrafficRank
err = rank.Unmarshal([]byte(yesterdayLog.Content))
if err != nil {
@@ -122,12 +125,15 @@ func (l *QueryServerTotalDataLogic) QueryServerTotalData() (resp *types.ServerTo
// query server traffic rank yesterday
var yesterdayTop10Server []types.ServerTrafficData
var yesterdayServerTrafficLog log.SystemLog
err = query.Model(&log.SystemLog{}).Where("`date` = ? AND `type` = ?", yesterday, log.TypeServerTrafficRank).First(&yesterdayServerTrafficLog).Error
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
l.Errorw("[QueryServerTotalDataLogic] Query yesterday server traffic rank log error", logger.Field("error", err.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Query yesterday server traffic rank log error: %v", err)
yesterdayServerRankQuery := query.Model(&log.SystemLog{}).
Where("`date` = ? AND `type` = ?", yesterday, log.TypeServerTrafficRank).
Limit(1).
Find(&yesterdayServerTrafficLog)
if yesterdayServerRankQuery.Error != nil {
l.Errorw("[QueryServerTotalDataLogic] Query yesterday server traffic rank log error", logger.Field("error", yesterdayServerRankQuery.Error.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Query yesterday server traffic rank log error: %v", yesterdayServerRankQuery.Error)
}
if yesterdayServerTrafficLog.Id > 0 {
if yesterdayServerRankQuery.RowsAffected > 0 {
var rank log.ServerTrafficRank
err = rank.Unmarshal([]byte(yesterdayServerTrafficLog.Content))
if err != nil {
@@ -195,12 +201,15 @@ func (l *QueryServerTotalDataLogic) QueryServerTotalData() (resp *types.ServerTo
for i := now.Day() - 1; i >= 1; i-- {
var logInfo log.SystemLog
date := time.Date(now.Year(), now.Month(), i, 0, 0, 0, 0, now.Location()).Format(time.DateOnly)
err = query.Model(&log.SystemLog{}).Where("`date` = ? AND `type` = ?", date, log.TypeTrafficStat).First(&logInfo).Error
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
l.Errorw("[QueryServerTotalDataLogic] Query daily traffic stat log error", logger.Field("error", err.Error()), logger.Field("date", date))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Query daily traffic stat log error: %v", err)
trafficStatQuery := query.Model(&log.SystemLog{}).
Where("`date` = ? AND `type` = ?", date, log.TypeTrafficStat).
Limit(1).
Find(&logInfo)
if trafficStatQuery.Error != nil {
l.Errorw("[QueryServerTotalDataLogic] Query daily traffic stat log error", logger.Field("error", trafficStatQuery.Error.Error()), logger.Field("date", date))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Query daily traffic stat log error: %v", trafficStatQuery.Error)
}
if logInfo.Id > 0 {
if trafficStatQuery.RowsAffected > 0 {
var stat log.TrafficStat
err = stat.Unmarshal([]byte(logInfo.Content))
if err != nil {