* fix(database): correct name entry for SingBox in initialization script * fix(purchase): update gift amount deduction logic and handle zero-amount order status * feat: add type and default fields to rule group requests and update related logic * feat(rule): implement logic to set a default rule group during creation and update * fix(rule): add type and default fields to rule group model and update related logic * feat(proxy): enhance proxy group handling and sorting logic * refactor(proxy): replace hardcoded group names with constants for better maintainability * fix(proxy): update group selection logic to skip empty and default names * feat(proxy): enhance proxy and group handling with new configuration options * feat(surge): add Surge adapter support and enhance subscription URL handling * feat(traffic): implement traffic reset logic for subscription cycles * feat(auth): improve email and mobile config unmarshalling with default values * fix(auth) upbind email not update * fix(order) discount set default 1 * fix(order) discount set default 1 * fix: refactor surfboard proxy handling and enhance configuration template * fix(renewal) discount set default 1 * feat(loon): add Loon configuration template and enhance proxy handling * feat(subscription): update user subscription status based on expiration time * fix(renewal): update subscription retrieval method to use token instead of order ID * feat(order): enhance order processing logic with improved error handling and user subscription management * fix(order): improve code quality and fix critical bugs in order processing logic - Fix inconsistent logging calls across all order logic files - Fix critical gift amount deduction logic bug in renewal process - Fix variable shadowing errors in database transactions - Add comprehensive Go-standard documentation comments - Improve log prefix consistency for better debugging - Remove redundant discount validation code * fix(docker): add build argument for version in Docker image build process * feat(version): add endpoint to retrieve application version information * fix(auth): improve user authentication method logic and update user cache * feat(user): add ordering functionality to user list retrieval * fix(RevenueStatistics) fill list * fix(UserStatistics) fill list * fix(user): implement user cache clearing after auth method operations * fix(auth): enhance OAuth login logic with improved request handling and user registration flow * fix(user): implement sorting for authentication methods based on priority * fix(user): correct ordering clause for user retrieval based on filter * refactor(user): streamline cache management and enhance cache clearing logic * feat(logs) set logs volume in develop * fix(handler): implement browser interception to deny access for specific user agents * fix(resetTraffic) reset daily server * refactor(trojan): remove unused parameter and clean up logging in slice * fix(middleware): add domain length check and improve user-agent handling * fix(middleware): reorder domain processing and enhance user-agent handling * fix(resetTraffic): update subscription reset logic to use expire_time for monthly and yearly checks * fix(scheduler): update reset traffic task schedule to run daily at 00:30 * fix(traffic): enhance traffic reset logic for subscriptions and adjust status checks * fix(activateOrder): update traffic reset logic to include reset day check * feat(marketing): add batch email task management API and logic * feat(application): implement CRUD operations for subscribe applications * feat(types): add user agent limit and list to subscription configuration * feat(application): update subscription application requests to include structured download links * feat(application): add scheme field and download link handling to subscribe application * feat(application): add endpoint to retrieve client information * feat(application): move DownloadLink and SubscribeApplication types to types.api * feat(application): add DownloadLink and SubscribeClient types, update client response structure * feat(application): remove ProxyTemplate field from application API * feat(application): implement adapter for client configuration and add preview template functionality * feat(application): move DownloadLink type to types.api and remove from common.api * feat(application): update PreviewSubscribeTemplate to return structured response * feat(application): remove ProxyTemplate field from application API * feat(application): enhance cache key generation for user list and server data * feat(subscribe): add ClearCache method to manage subscription cache invalidation * feat(payment): add Description field to PaymentMethodDetail response * feat(subscribe): update next reset time calculation to use ExpireTime * feat(purchase): include handling fee in total amount calculation * feat(subscribe): add V2SubscribeHandler and logic for enhanced subscription management * feat(subscribe): add output format configuration to subscription adapter * feat(application): default data --------- Co-authored-by: Chang lue Tsen <tension@ppanel.dev> Co-authored-by: NoWay <Bob455668@hotmail.com>
171 lines
5.8 KiB
Go
171 lines
5.8 KiB
Go
package console
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/perfect-panel/server/internal/svc"
|
|
"github.com/perfect-panel/server/internal/types"
|
|
"github.com/perfect-panel/server/pkg/logger"
|
|
)
|
|
|
|
type QueryUserStatisticsLogic struct {
|
|
logger.Logger
|
|
ctx context.Context
|
|
svcCtx *svc.ServiceContext
|
|
}
|
|
|
|
// Query user statistics
|
|
func NewQueryUserStatisticsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *QueryUserStatisticsLogic {
|
|
return &QueryUserStatisticsLogic{
|
|
Logger: logger.WithContext(ctx),
|
|
ctx: ctx,
|
|
svcCtx: svcCtx,
|
|
}
|
|
}
|
|
|
|
func (l *QueryUserStatisticsLogic) QueryUserStatistics() (resp *types.UserStatisticsResponse, err error) {
|
|
if strings.ToLower(os.Getenv("PPANEL_MODE")) == "demo" {
|
|
return l.mockRevenueStatistics(), nil
|
|
}
|
|
resp = &types.UserStatisticsResponse{}
|
|
now := time.Now()
|
|
// query today user register count
|
|
todayUserResisterCount, err := l.svcCtx.UserModel.QueryResisterUserTotalByDate(l.ctx, now)
|
|
if err != nil {
|
|
l.Errorw("[QueryUserStatisticsLogic] QueryResisterUserTotalByDate error", logger.Field("error", err.Error()))
|
|
} else {
|
|
resp.Today.Register = todayUserResisterCount
|
|
}
|
|
// query today user purchase count
|
|
newToday, renewalToday, err := l.svcCtx.OrderModel.QueryDateUserCounts(l.ctx, now)
|
|
if err != nil {
|
|
l.Errorw("[QueryUserStatisticsLogic] QueryDateUserCounts error", logger.Field("error", err.Error()))
|
|
} else {
|
|
resp.Today.NewOrderUsers = newToday
|
|
resp.Today.RenewalOrderUsers = renewalToday
|
|
}
|
|
// query month user register count
|
|
monthUserResisterCount, err := l.svcCtx.UserModel.QueryResisterUserTotalByMonthly(l.ctx, now)
|
|
if err != nil {
|
|
l.Errorw("[QueryUserStatisticsLogic] QueryResisterUserTotalByMonthly error", logger.Field("error", err.Error()))
|
|
} else {
|
|
resp.Monthly.Register = monthUserResisterCount
|
|
}
|
|
// query month user purchase count
|
|
newMonth, renewalMonth, err := l.svcCtx.OrderModel.QueryMonthlyUserCounts(l.ctx, now)
|
|
if err != nil {
|
|
l.Errorw("[QueryUserStatisticsLogic] QueryMonthlyUserCounts error", logger.Field("error", err.Error()))
|
|
} else {
|
|
resp.Monthly.NewOrderUsers = newMonth
|
|
resp.Monthly.RenewalOrderUsers = renewalMonth
|
|
}
|
|
|
|
// Get monthly daily user statistics list for the current month (from 1st to current date)
|
|
monthlyListData, err := l.svcCtx.UserModel.QueryDailyUserStatisticsList(l.ctx, now)
|
|
if err != nil {
|
|
l.Errorw("[QueryUserStatisticsLogic] QueryDailyUserStatisticsList error", logger.Field("error", err.Error()))
|
|
// Don't return error, just log it and continue with empty list
|
|
} else {
|
|
monthlyList := make([]types.UserStatistics, len(monthlyListData))
|
|
for i, data := range monthlyListData {
|
|
monthlyList[i] = types.UserStatistics{
|
|
Date: data.Date,
|
|
Register: data.Register,
|
|
NewOrderUsers: data.NewOrderUsers,
|
|
RenewalOrderUsers: data.RenewalOrderUsers,
|
|
}
|
|
}
|
|
resp.Monthly.List = monthlyList
|
|
}
|
|
|
|
// query all user count
|
|
allUserCount, err := l.svcCtx.UserModel.QueryResisterUserTotal(l.ctx)
|
|
if err != nil {
|
|
l.Errorw("[QueryUserStatisticsLogic] QueryResisterUserTotal error", logger.Field("error", err.Error()))
|
|
} else {
|
|
resp.All.Register = allUserCount
|
|
}
|
|
|
|
// query all user order counts
|
|
allNewOrderUsers, allRenewalOrderUsers, err := l.svcCtx.OrderModel.QueryTotalUserCounts(l.ctx)
|
|
if err != nil {
|
|
l.Errorw("[QueryUserStatisticsLogic] QueryTotalUserCounts error", logger.Field("error", err.Error()))
|
|
} else {
|
|
resp.All.NewOrderUsers = allNewOrderUsers
|
|
resp.All.RenewalOrderUsers = allRenewalOrderUsers
|
|
}
|
|
|
|
// Get all monthly user statistics list for the past 6 months
|
|
allListData, err := l.svcCtx.UserModel.QueryMonthlyUserStatisticsList(l.ctx, now)
|
|
if err != nil {
|
|
l.Errorw("[QueryUserStatisticsLogic] QueryMonthlyUserStatisticsList error", logger.Field("error", err.Error()))
|
|
// Don't return error, just log it and continue with empty list
|
|
} else {
|
|
allList := make([]types.UserStatistics, len(allListData))
|
|
for i, data := range allListData {
|
|
allList[i] = types.UserStatistics{
|
|
Date: data.Date,
|
|
Register: data.Register,
|
|
NewOrderUsers: data.NewOrderUsers,
|
|
RenewalOrderUsers: data.RenewalOrderUsers,
|
|
}
|
|
}
|
|
resp.All.List = allList
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func (l *QueryUserStatisticsLogic) mockRevenueStatistics() *types.UserStatisticsResponse {
|
|
now := time.Now()
|
|
|
|
// Generate daily user statistics for the current month (from 1st to current date)
|
|
monthlyList := make([]types.UserStatistics, 7)
|
|
for i := 0; i < 7; i++ {
|
|
dayDate := now.AddDate(0, 0, -(6 - i))
|
|
baseRegister := int64(18 + ((6 - i) * 3) + ((6-i)%3)*8)
|
|
monthlyList[i] = types.UserStatistics{
|
|
Date: dayDate.Format("2006-01-02"),
|
|
Register: baseRegister,
|
|
NewOrderUsers: int64(float64(baseRegister) * 0.65),
|
|
RenewalOrderUsers: int64(float64(baseRegister) * 0.35),
|
|
}
|
|
}
|
|
|
|
// Generate monthly user statistics for the past 6 months (oldest first)
|
|
allList := make([]types.UserStatistics, 6)
|
|
for i := 0; i < 6; i++ {
|
|
monthDate := now.AddDate(0, -(5 - i), 0)
|
|
baseRegister := int64(1800 + ((5 - i) * 200) + ((5-i)%2)*500)
|
|
allList[i] = types.UserStatistics{
|
|
Date: monthDate.Format("2006-01"),
|
|
Register: baseRegister,
|
|
NewOrderUsers: int64(float64(baseRegister) * 0.65),
|
|
RenewalOrderUsers: int64(float64(baseRegister) * 0.35),
|
|
}
|
|
}
|
|
|
|
return &types.UserStatisticsResponse{
|
|
Today: types.UserStatistics{
|
|
Register: 28,
|
|
NewOrderUsers: 18,
|
|
RenewalOrderUsers: 10,
|
|
},
|
|
Monthly: types.UserStatistics{
|
|
Register: 888,
|
|
NewOrderUsers: 588,
|
|
RenewalOrderUsers: 300,
|
|
List: monthlyList,
|
|
},
|
|
All: types.UserStatistics{
|
|
Register: 18888,
|
|
NewOrderUsers: 0, // This field is not used in All statistics
|
|
RenewalOrderUsers: 0, // This field is not used in All statistics
|
|
List: allList,
|
|
},
|
|
}
|
|
}
|