* 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.7 KiB
Go
171 lines
5.7 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"
|
|
"github.com/perfect-panel/server/pkg/xerr"
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
type QueryRevenueStatisticsLogic struct {
|
|
logger.Logger
|
|
ctx context.Context
|
|
svcCtx *svc.ServiceContext
|
|
}
|
|
|
|
// NewQueryRevenueStatisticsLogic Query revenue statistics
|
|
func NewQueryRevenueStatisticsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *QueryRevenueStatisticsLogic {
|
|
return &QueryRevenueStatisticsLogic{
|
|
Logger: logger.WithContext(ctx),
|
|
ctx: ctx,
|
|
svcCtx: svcCtx,
|
|
}
|
|
}
|
|
|
|
func (l *QueryRevenueStatisticsLogic) QueryRevenueStatistics() (resp *types.RevenueStatisticsResponse, err error) {
|
|
if strings.ToLower(os.Getenv("PPANEL_MODE")) == "demo" {
|
|
return l.mockRevenueStatistics(), nil
|
|
}
|
|
|
|
var today, monthly, all types.OrdersStatistics
|
|
now := time.Now()
|
|
// Get today's revenue statistics
|
|
todayData, err := l.svcCtx.OrderModel.QueryDateOrders(l.ctx, now)
|
|
if err != nil {
|
|
l.Errorw("[QueryRevenueStatisticsLogic] QueryDateOrders error", logger.Field("error", err.Error()))
|
|
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "QueryDateOrders error: %v", err)
|
|
} else {
|
|
today = types.OrdersStatistics{
|
|
AmountTotal: todayData.AmountTotal,
|
|
NewOrderAmount: todayData.NewOrderAmount,
|
|
RenewalOrderAmount: todayData.RenewalOrderAmount,
|
|
}
|
|
}
|
|
// Get monthly's revenue statistics
|
|
monthlyData, err := l.svcCtx.OrderModel.QueryMonthlyOrders(l.ctx, now)
|
|
if err != nil {
|
|
l.Errorw("[QueryRevenueStatisticsLogic] QueryMonthlyOrders error", logger.Field("error", err.Error()))
|
|
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "QueryMonthlyOrders error: %v", err)
|
|
} else {
|
|
monthly = types.OrdersStatistics{
|
|
AmountTotal: monthlyData.AmountTotal,
|
|
NewOrderAmount: monthlyData.NewOrderAmount,
|
|
RenewalOrderAmount: monthlyData.RenewalOrderAmount,
|
|
List: make([]types.OrdersStatistics, 0),
|
|
}
|
|
}
|
|
|
|
// Get monthly daily list for the current month (from 1st to current date)
|
|
monthlyListData, err := l.svcCtx.OrderModel.QueryDailyOrdersList(l.ctx, now)
|
|
if err != nil {
|
|
l.Errorw("[QueryRevenueStatisticsLogic] QueryDailyOrdersList error", logger.Field("error", err.Error()))
|
|
// Don't return error, just log it and continue with empty list
|
|
} else {
|
|
monthlyList := make([]types.OrdersStatistics, len(monthlyListData))
|
|
for i, data := range monthlyListData {
|
|
monthlyList[i] = types.OrdersStatistics{
|
|
Date: data.Date,
|
|
AmountTotal: data.AmountTotal,
|
|
NewOrderAmount: data.NewOrderAmount,
|
|
RenewalOrderAmount: data.RenewalOrderAmount,
|
|
}
|
|
}
|
|
monthly.List = monthlyList
|
|
}
|
|
|
|
// Get all revenue statistics
|
|
allData, err := l.svcCtx.OrderModel.QueryTotalOrders(l.ctx)
|
|
if err != nil {
|
|
l.Errorw("[QueryRevenueStatisticsLogic] QueryTotalOrders error", logger.Field("error", err.Error()))
|
|
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "QueryTotalOrders error: %v", err)
|
|
} else {
|
|
all = types.OrdersStatistics{
|
|
AmountTotal: allData.AmountTotal,
|
|
NewOrderAmount: allData.NewOrderAmount,
|
|
RenewalOrderAmount: allData.RenewalOrderAmount,
|
|
List: make([]types.OrdersStatistics, 0),
|
|
}
|
|
}
|
|
|
|
// Get all monthly list for the past 6 months
|
|
allListData, err := l.svcCtx.OrderModel.QueryMonthlyOrdersList(l.ctx, now)
|
|
if err != nil {
|
|
l.Errorw("[QueryRevenueStatisticsLogic] QueryMonthlyOrdersList error", logger.Field("error", err.Error()))
|
|
// Don't return error, just log it and continue with empty list
|
|
} else {
|
|
allList := make([]types.OrdersStatistics, len(allListData))
|
|
for i, data := range allListData {
|
|
allList[i] = types.OrdersStatistics{
|
|
Date: data.Date,
|
|
AmountTotal: data.AmountTotal,
|
|
NewOrderAmount: data.NewOrderAmount,
|
|
RenewalOrderAmount: data.RenewalOrderAmount,
|
|
}
|
|
}
|
|
all.List = allList
|
|
}
|
|
|
|
return &types.RevenueStatisticsResponse{
|
|
Today: today,
|
|
Monthly: monthly,
|
|
All: all,
|
|
}, nil
|
|
}
|
|
|
|
// mockRevenueStatistics is a mock function to simulate revenue statistics data.
|
|
func (l *QueryRevenueStatisticsLogic) mockRevenueStatistics() *types.RevenueStatisticsResponse {
|
|
now := time.Now()
|
|
|
|
// Generate daily data for the current month (from 1st to current date)
|
|
monthlyList := make([]types.OrdersStatistics, 7)
|
|
for i := 0; i < 7; i++ {
|
|
dayDate := now.AddDate(0, 0, -(6 - i))
|
|
baseAmount := int64(25000 + ((6 - i) * 3000) + ((6-i)%3)*8000)
|
|
monthlyList[i] = types.OrdersStatistics{
|
|
Date: dayDate.Format("2006-01-02"),
|
|
AmountTotal: baseAmount,
|
|
NewOrderAmount: int64(float64(baseAmount) * 0.68),
|
|
RenewalOrderAmount: int64(float64(baseAmount) * 0.32),
|
|
}
|
|
}
|
|
|
|
// Generate monthly data for the past 6 months (oldest first)
|
|
allList := make([]types.OrdersStatistics, 6)
|
|
for i := 0; i < 6; i++ {
|
|
monthDate := now.AddDate(0, -(5 - i), 0)
|
|
baseAmount := int64(1800000 + ((5 - i) * 200000) + ((5-i)%2)*500000)
|
|
allList[i] = types.OrdersStatistics{
|
|
Date: monthDate.Format("2006-01"),
|
|
AmountTotal: baseAmount,
|
|
NewOrderAmount: int64(float64(baseAmount) * 0.68),
|
|
RenewalOrderAmount: int64(float64(baseAmount) * 0.32),
|
|
}
|
|
}
|
|
|
|
return &types.RevenueStatisticsResponse{
|
|
Today: types.OrdersStatistics{
|
|
AmountTotal: 35888,
|
|
NewOrderAmount: 22888,
|
|
RenewalOrderAmount: 13000,
|
|
},
|
|
Monthly: types.OrdersStatistics{
|
|
AmountTotal: 888888,
|
|
NewOrderAmount: 588888,
|
|
RenewalOrderAmount: 300000,
|
|
List: monthlyList,
|
|
},
|
|
All: types.OrdersStatistics{
|
|
AmountTotal: 12888888,
|
|
NewOrderAmount: 8588888,
|
|
RenewalOrderAmount: 4300000,
|
|
List: allList,
|
|
},
|
|
}
|
|
}
|