* refactor: rename queryannouncementhandler.go to queryAnnouncementLogic.go for clarity
* feat(panDomain): update subscription logic to use V2 handler for improved functionality
* refactor(subscribe): replace V2 handler with a unified Handler method for subscription logic
* feat(subscribe): implement user agent limit feature with configurable list
* fix(subscribe): improve error handling and logging for subscription requests
* feat(subscribe): add user agent limit configuration to system settings
* refactor(api): remove deprecated application-related endpoints and types
* refactor(swagger): remove deprecated app.json generation from swagger configuration
* refactor(swagger): remove deprecated app.json check from swagger configuration
* fix(subscribe): update delete method to use Where clause for improved query accuracy
* fix(subscribe): update Id field tag to use primaryKey and improve save method query
* fix(subscribe): update Id field tag to use primaryKey and improve model queries
* fix(subscribe): rename variable for clarity and add special handling for Stash user agent
* fix(email): convert RegisterStartTime and RegisterEndTime to time.Time for accurate query filtering
* refactor(log): consolidate logging models and update related logic for improved clarity and functionality
* fix(types): change Content field type in MessageLog to interface{} for improved flexibility
* fix(log): change MessageLog list to use value type for improved performance and memory efficiency
* fix(email): set EmailTypeVerify in task payload and update content type conversion for verification email
* fix(log): remove unused Id field from SystemLog during login log insertion
* fix(login): remove debug logs and error logging during user login process
* fix(log): add traffic reset logging for subscription resets
* fix(log): insert reset traffic log during subscription activation
* feat(log): add endpoints for retrieving and resetting subscribe traffic logs
* refactor(log): remove Reset Subscribe Traffic Log endpoint and related types
* feat(traffic): add traffic statistics logging and scheduling
* fix(subscribe): ensure active status and reset timestamps during traffic resets
* feat(api): enhance server and node management with new request/response structures
* refactor(api): rename OnlineUser to ServerOnlineUser for clarity
* feat(api): define OnlineUser type with SID and IP fields
* feat(server): implement server management handlers and database schema
* feat(api): add traffic log details filtering and enhance traffic log structures
* feat(api): migrate server and node data handling, update related structures and logic
* feat(server): implement server deletion logic with error handling
* feat(api): update log filtering to use ResetSubscribe type for subscription logs
* feat(api): standardize timestamp field across log structures
* feat(api): refactor cache key handling for server and user lists
* feat(api): enhance server status handling with protocol support and refactor related logic
* fix(traffic): adjust start date for traffic statistics and improve log deletion comment
* feat(api): implement daily traffic ranking for users and servers with error handling
* feat(api): update server total data response to use 'OnlineUsers' and implement daily traffic statistics logging
* feat(api): add log settings management with auto-clear and clear days configuration
* fix(log): correct category in log settings update query
* feat(routes): add handler for scheduled traffic statistics
* feat(model): add user counts struct and update queries for new and renewal users
* feat(api): add referral percentage and only first purchase fields to user model and requests
* feat(database): update user table to add referral percentage and only first purchase fields
* feat(api): add reset sort endpoints for server and node
* feat(api): add sort field to server model
* feat(api): implement sorting functionality for nodes and servers
* fix(database): add sort column to nodes table
* fix(model): enhance user statistics queries with new order and renewal order counts
* fix(log): update timestamp handling in login and registration logs
* fix(log): update sorting logic for server and user subscribe traffic logs
* fix(server): add server status handling based on last reported time
* fix(model): correct filter condition to use 'date' instead of 'data'
* fix(migration): add index for traffic log on timestamp, user_id, and subscribe_id
* fix(log): optimize user traffic rank data handling by using append instead of index assignment
* fix(filter): refactor node list creation to use append and remove duplicates from tags
* fix(node): add ServerId and Enabled fields to node update logic
* feat(tags): add endpoint to query all node tags
* fix(preview): add Preload parameter to FilterNodeList for improved data retrieval
* fix(log): date is empty
* feat(subscribe): add Language field to subscription models and update query logic
* feat(subscription): add Language parameter to GetSubscription request and update query logic
* fix(server): encode ServerKey in base64 and update last reported time for nodes
* feat: delete common GetSubscription
* feat(subscription): implement FilterList method for subscription queries and update related logic
* fix(subscribe): remove duplicate user agents in SubscribeHandler
* fix(push): initialize onlineUsers as a map in pushOnlineUsersLogic
* fix(reset): initialize subs as a map in clearCache method
* refactor(query): simplify node and tag filtering using InSet function
* feat(userlist): enhance GetServerUserListLogic with improved node and tag handling
* fix(userlist): correct node ID assignment and update query logic for tag filtering
* fix(userlist): correct node ID assignment in getServerUserListLogic
* refactor(query): streamline query construction for tag filtering
* fix(statistics): optimize server ranking data handling in QueryServerTotalDataLogic
* refactor(statistics): simplify server ranking data construction in QueryServerTotalDataLogic
* fix(statistics): correct server traffic data assignment in QueryServerTotalDataLogic
* fix(statistics): optimize yesterday's top 10 server traffic data assignment in QueryServerTotalDataLogic
* fix(middleware): remove duplicate elements from user agent list in PanDomainMiddleware
* feat(middleware): enhance user agent handling by querying client list in PanDomainMiddleware
* feat(client): subscribe_template
* feat(oauth): add user agent and IP logging to registration and login processes
* fix(balance): add timestamp to balance logs for payment, refund, and recharge transactions
* fix(log): correct comment for CommissionTypeRefund to improve clarity
* fix(log): replace magic number with constant for gift type in purchase checkout logic
* fix(log): rename OrderId to OrderNo for consistency in balance logging
* feat(log): add logging for balance, gift amount, and commission adjustments
* fix(user): correct placement of DeepCopy for user info update logic
* feat(log): add UserSubscribeId to FilterSubscribeLogRequest for enhanced filtering
* fix(purchase): streamline error handling and improve JSON marshaling for temporary orders
* fix(order): simplify commission handling and improve payload parsing logic
* fix(order): update commission calculation to actual payment amount minus gateway handling fee
* feat(payment): add support for CryptoSaaS payment platform and enhance configuration handling
* fix(balance): update QueryUserBalanceLog response structure to include balance log list
* fix(email): update task progress handling to use specific task ID for updates
* feat(quota): add quota task creation and querying endpoints with updated data structures
* fix(email): update task handling to use generic task model and improve error logging
* fix(order): improve error logging for database transaction and user cache updates
* feat(quota): enhance quota task management with new request structures and processing logic
* fix(quota): remove redundant quota task status endpoint from admin marketing routes
* fix(worker): update task completion status handling in worker logic
* fix(quota): update taskInfo to include current subscription count in quota logic
* doc(log): rename function for clarity and add cache cleanup comment
* fix(quota): update time handling in quota logic and correct subscriber ID query
* fix(quota): update time handling to use UnixMilli for start time in quota logic
* feat(protocol): add server protocol configuration query and enhance protocol options
* fix(quota): correct time range queries for start and expire times in quota logic
* fix(types): update plugin options to include 'none' in the plugin field
---------
Co-authored-by: Chang lue Tsen <tension@ppanel.dev>
309 lines
13 KiB
Go
309 lines
13 KiB
Go
package order
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/perfect-panel/server/internal/model/payment"
|
|
|
|
"github.com/perfect-panel/server/internal/model/subscribe"
|
|
"github.com/redis/go-redis/v9"
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
type Details struct {
|
|
Id int64 `gorm:"primaryKey"`
|
|
ParentId int64 `gorm:"type:bigint;default:null;comment:Parent Order Id"`
|
|
SubOrders []*Order `gorm:"foreignKey:ParentId;references:Id"`
|
|
UserId int64 `gorm:"type:bigint;not null;default:0;comment:User Id"`
|
|
OrderNo string `gorm:"type:varchar(255);not null;default:'';unique;comment:Order No"`
|
|
Type uint8 `gorm:"type:tinyint(1);not null;default:1;comment:Order Type: 1: Subscribe, 2: Renewal, 3: ResetTraffic, 4: Recharge"`
|
|
Quantity int64 `gorm:"type:bigint;not null;default:1;comment:Quantity"`
|
|
Price int64 `gorm:"type:int;not null;default:0;comment:Original price"`
|
|
Amount int64 `gorm:"type:int;not null;default:0;comment:Order Amount"`
|
|
Discount int64 `gorm:"type:int;not null;default:0;comment:Order Discount"`
|
|
Coupon string `gorm:"type:varchar(255);default:null;comment:Coupon"`
|
|
CouponDiscount int64 `gorm:"type:int;not null;default:0;comment:Coupon Discount"`
|
|
PaymentId int64 `gorm:"type:bigint;not null;default:0;comment:Payment Id"`
|
|
Payment *payment.Payment `gorm:"foreignKey:PaymentId;references:Id"`
|
|
Method string `gorm:"type:varchar(255);not null;default:'';comment:Payment Method"`
|
|
FeeAmount int64 `gorm:"type:int;not null;default:0;comment:Fee Amount"`
|
|
TradeNo string `gorm:"type:varchar(255);default:null;comment:Trade No"`
|
|
GiftAmount int64 `gorm:"type:int;not null;default:0;comment:User Gift Amount"`
|
|
Commission int64 `gorm:"type:int;not null;default:0;comment:Order Commission"`
|
|
Status uint8 `gorm:"type:tinyint(1);not null;default:1;comment:Order Status: 1: Pending, 2: Paid, 3: Failed"`
|
|
SubscribeId int64 `gorm:"type:bigint;not null;default:0;comment:Subscribe Id"`
|
|
SubscribeToken string `gorm:"type:varchar(255);default:null;comment:Renewal Subscribe Token"`
|
|
Subscribe *subscribe.Subscribe `gorm:"foreignKey:SubscribeId;references:Id"`
|
|
IsNew bool `gorm:"type:tinyint(1);not null;default:0;comment:Is New Order"`
|
|
CreatedAt time.Time `gorm:"<-:create;comment:Create Time"`
|
|
UpdatedAt time.Time `gorm:"comment:Update Time"`
|
|
}
|
|
|
|
type OrdersTotalWithDate struct {
|
|
Date string
|
|
AmountTotal int64
|
|
NewOrderAmount int64
|
|
RenewalOrderAmount int64
|
|
}
|
|
|
|
type customOrderLogicModel interface {
|
|
UpdateOrderStatus(ctx context.Context, orderNo string, status uint8, tx ...*gorm.DB) error
|
|
QueryOrderListByPage(ctx context.Context, page, size int, status uint8, user, subscribe int64, search string) (int64, []*Details, error)
|
|
FindOneDetails(ctx context.Context, id int64) (*Details, error)
|
|
FindOneDetailsByOrderNo(ctx context.Context, orderNo string) (*Details, error)
|
|
QueryMonthlyOrders(ctx context.Context, date time.Time) (OrdersTotal, error)
|
|
QueryDateOrders(ctx context.Context, date time.Time) (OrdersTotal, error)
|
|
QueryTotalOrders(ctx context.Context) (OrdersTotal, error)
|
|
QueryMonthlyUserCounts(ctx context.Context, date time.Time) (int64, int64, error)
|
|
QueryDateUserCounts(ctx context.Context, date time.Time) (int64, int64, error)
|
|
QueryTotalUserCounts(ctx context.Context) (int64, int64, error)
|
|
IsUserEligibleForNewOrder(ctx context.Context, userID int64) (bool, error)
|
|
QueryDailyOrdersList(ctx context.Context, date time.Time) ([]OrdersTotalWithDate, error)
|
|
QueryMonthlyOrdersList(ctx context.Context, date time.Time) ([]OrdersTotalWithDate, error)
|
|
}
|
|
|
|
// UserCounts User counts for new and renewal users
|
|
type UserCounts struct {
|
|
NewUsers int64 `gorm:"column:new_users"`
|
|
RenewalUsers int64 `gorm:"column:renewal_users"`
|
|
}
|
|
|
|
// NewModel returns a model for the database table.
|
|
func NewModel(conn *gorm.DB, c *redis.Client) Model {
|
|
return &customOrderModel{
|
|
defaultOrderModel: newOrderModel(conn, c),
|
|
}
|
|
}
|
|
|
|
// QueryOrderListByPage Query order list by page
|
|
func (m *customOrderModel) QueryOrderListByPage(ctx context.Context, page, size int, status uint8, user, subscribe int64, search string) (int64, []*Details, error) {
|
|
var list []*Details
|
|
var total int64
|
|
err := m.QueryNoCacheCtx(ctx, &list, func(conn *gorm.DB, v interface{}) error {
|
|
conn = conn.Model(&Order{})
|
|
if status > 0 {
|
|
conn = conn.Where("status = ?", status)
|
|
}
|
|
if user > 0 {
|
|
conn = conn.Where("user_id = ?", user)
|
|
}
|
|
if subscribe > 0 {
|
|
conn = conn.Where("subscribe_id = ?", subscribe)
|
|
}
|
|
if search != "" {
|
|
conn = conn.Where("order_no like ? or trade_no like ? or coupon like ?", "%"+search+"%", "%"+search+"%", "%"+search+"%")
|
|
}
|
|
return conn.Order("id desc").Preload("Subscribe").Preload("Payment").Count(&total).Offset((page - 1) * size).Limit(size).Find(v).Error
|
|
})
|
|
return total, list, err
|
|
}
|
|
|
|
// UpdateOrderStatus Update order status
|
|
func (m *customOrderModel) UpdateOrderStatus(ctx context.Context, orderNo string, status uint8, tx ...*gorm.DB) error {
|
|
orderInfo, err := m.FindOneByOrderNo(ctx, orderNo)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return m.ExecCtx(ctx, func(conn *gorm.DB) error {
|
|
if len(tx) > 0 {
|
|
conn = tx[0]
|
|
}
|
|
return conn.Model(&Order{}).Where("order_no = ?", orderNo).Update("status", status).Error
|
|
}, m.getCacheKeys(orderInfo)...)
|
|
}
|
|
|
|
// FindOneDetailsByOrderNo Find order details by order number
|
|
func (m *customOrderModel) FindOneDetailsByOrderNo(ctx context.Context, orderNo string) (*Details, error) {
|
|
var orderInfo Details
|
|
err := m.QueryNoCacheCtx(ctx, &orderInfo, func(conn *gorm.DB, v interface{}) error {
|
|
return conn.Model(&Order{}).Where("order_no = ?", orderNo).Preload("Subscribe").Preload("Payment").First(v).Error
|
|
})
|
|
return &orderInfo, err
|
|
}
|
|
|
|
func (m *customOrderModel) FindOneDetails(ctx context.Context, id int64) (*Details, error) {
|
|
var orderInfo Details
|
|
err := m.QueryNoCacheCtx(ctx, &orderInfo, func(conn *gorm.DB, v interface{}) error {
|
|
return conn.Model(&Order{}).
|
|
Where("id = ?", id).
|
|
Preload("Subscribe").
|
|
Preload("SubOrders").
|
|
First(v).Error
|
|
})
|
|
return &orderInfo, err
|
|
}
|
|
|
|
func (m *customOrderModel) QueryMonthlyOrders(ctx context.Context, date time.Time) (OrdersTotal, error) {
|
|
firstDay := time.Date(date.Year(), date.Month(), 1, 0, 0, 0, 0, date.Location())
|
|
lastDay := firstDay.AddDate(0, 1, 0).Add(-time.Nanosecond)
|
|
var result OrdersTotal
|
|
err := m.QueryNoCacheCtx(ctx, &result, func(conn *gorm.DB, v interface{}) error {
|
|
return conn.Model(&Order{}).
|
|
Where("status IN ? AND created_at BETWEEN ? AND ? AND method != ?", []int64{2, 5}, firstDay, lastDay, "balance").
|
|
Select(
|
|
"SUM(amount) as amount_total, " +
|
|
"SUM(CASE WHEN is_new = 1 THEN amount ELSE 0 END) as new_order_amount, " +
|
|
"SUM(CASE WHEN is_new = 0 THEN amount ELSE 0 END) as renewal_order_amount",
|
|
).
|
|
Scan(v).Error
|
|
})
|
|
return result, err
|
|
}
|
|
|
|
// QueryDateOrders Query orders by date
|
|
func (m *customOrderModel) QueryDateOrders(ctx context.Context, date time.Time) (OrdersTotal, error) {
|
|
start := date.Truncate(24 * time.Hour)
|
|
end := start.Add(24 * time.Hour).Add(-time.Nanosecond)
|
|
var result OrdersTotal
|
|
err := m.QueryNoCacheCtx(ctx, &result, func(conn *gorm.DB, v interface{}) error {
|
|
return conn.Model(&Order{}).
|
|
Where("status IN ? AND created_at BETWEEN ? AND ? AND method != ?", []int64{2, 5}, start, end, "balance").
|
|
Select(
|
|
"SUM(amount) as amount_total, " +
|
|
"SUM(CASE WHEN is_new = 1 THEN amount ELSE 0 END) as new_order_amount, " +
|
|
"SUM(CASE WHEN is_new = 0 THEN amount ELSE 0 END) as renewal_order_amount",
|
|
).
|
|
Scan(v).Error
|
|
})
|
|
return result, err
|
|
}
|
|
|
|
func (m *customOrderModel) QueryTotalOrders(ctx context.Context) (OrdersTotal, error) {
|
|
var result OrdersTotal
|
|
|
|
err := m.QueryNoCacheCtx(ctx, &result, func(conn *gorm.DB, _ interface{}) error {
|
|
return conn.Model(&Order{}).
|
|
Select(`
|
|
SUM(amount) AS amount_total,
|
|
SUM(CASE WHEN is_new = 1 THEN amount ELSE 0 END) AS new_order_amount,
|
|
SUM(CASE WHEN is_new = 0 THEN amount ELSE 0 END) AS renewal_order_amount
|
|
`).
|
|
Where("status IN ? AND method != ?", []int64{2, 5}, "balance").
|
|
Scan(&result).Error
|
|
})
|
|
|
|
return result, err
|
|
}
|
|
|
|
func (m *customOrderModel) QueryMonthlyUserCounts(ctx context.Context, date time.Time) (int64, int64, error) {
|
|
// 获取当月第一天零点
|
|
firstDay := time.Date(date.Year(), date.Month(), 1, 0, 0, 0, 0, date.Location())
|
|
// 获取下个月第一天零点(避免漏掉最后一天的订单)
|
|
nextMonth := firstDay.AddDate(0, 1, 0)
|
|
|
|
var counts UserCounts
|
|
|
|
// 执行查询
|
|
err := m.QueryNoCacheCtx(ctx, nil, func(conn *gorm.DB, _ interface{}) error {
|
|
return conn.Model(&Order{}).
|
|
Select(`
|
|
COUNT(DISTINCT CASE WHEN is_new = 1 THEN user_id END) AS new_users,
|
|
COUNT(DISTINCT CASE WHEN is_new = 0 THEN user_id END) AS renewal_users
|
|
`).
|
|
Where("status IN ? AND created_at >= ? AND created_at < ? AND method != ?",
|
|
[]int64{2, 5}, firstDay, nextMonth, "balance").
|
|
Scan(&counts).Error
|
|
})
|
|
|
|
return counts.NewUsers, counts.RenewalUsers, err
|
|
}
|
|
func (m *customOrderModel) QueryDateUserCounts(ctx context.Context, date time.Time) (int64, int64, error) {
|
|
// 当天 00:00:00
|
|
start := time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, date.Location())
|
|
// 下一天 00:00:00
|
|
nextDay := start.Add(24 * time.Hour)
|
|
|
|
var counts UserCounts
|
|
|
|
err := m.QueryNoCacheCtx(ctx, nil, func(conn *gorm.DB, _ interface{}) error {
|
|
return conn.Model(&Order{}).
|
|
Select(`
|
|
COUNT(DISTINCT CASE WHEN is_new = 1 THEN user_id END) AS new_users,
|
|
COUNT(DISTINCT CASE WHEN is_new = 0 THEN user_id END) AS renewal_users
|
|
`).
|
|
Where("status IN ? AND created_at >= ? AND created_at < ? AND method != ?",
|
|
[]int64{2, 5}, start, nextDay, "balance").
|
|
Scan(&counts).Error
|
|
})
|
|
|
|
return counts.NewUsers, counts.RenewalUsers, err
|
|
}
|
|
func (m *customOrderModel) QueryTotalUserCounts(ctx context.Context) (int64, int64, error) {
|
|
var counts UserCounts
|
|
|
|
err := m.QueryNoCacheCtx(ctx, nil, func(conn *gorm.DB, _ interface{}) error {
|
|
return conn.Model(&Order{}).
|
|
Where("status IN ? AND method != ?", []int64{2, 5}, "balance").
|
|
Select(`
|
|
COUNT(DISTINCT CASE WHEN is_new = 1 THEN user_id END) AS new_users,
|
|
COUNT(DISTINCT CASE WHEN is_new = 0 THEN user_id END) AS renewal_users
|
|
`).
|
|
Scan(&counts).Error
|
|
})
|
|
|
|
return counts.NewUsers, counts.RenewalUsers, err
|
|
}
|
|
|
|
func (m *customOrderModel) IsUserEligibleForNewOrder(ctx context.Context, userID int64) (bool, error) {
|
|
var count int64
|
|
err := m.QueryNoCacheCtx(ctx, nil, func(conn *gorm.DB, _ interface{}) error {
|
|
return conn.Model(&Order{}).
|
|
Where("user_id = ? AND status IN ?", userID, []int64{2, 5}).
|
|
Count(&count).Error
|
|
})
|
|
return count == 0, err
|
|
}
|
|
|
|
// QueryDailyOrdersList 查询当月每日订单统计
|
|
func (m *customOrderModel) QueryDailyOrdersList(ctx context.Context, date time.Time) ([]OrdersTotalWithDate, error) {
|
|
var results []OrdersTotalWithDate
|
|
|
|
err := m.QueryNoCacheCtx(ctx, &results, func(conn *gorm.DB, v interface{}) error {
|
|
// 当月 1 号 00:00:00
|
|
firstDay := time.Date(date.Year(), date.Month(), 1, 0, 0, 0, 0, date.Location())
|
|
// 第二天 00:00:00
|
|
nextDay := date.AddDate(0, 0, 1).Truncate(24 * time.Hour)
|
|
|
|
return conn.Model(&Order{}).
|
|
Select(`
|
|
DATE_FORMAT(created_at, '%Y-%m-%d') AS date,
|
|
SUM(amount) AS amount_total,
|
|
SUM(CASE WHEN is_new = 1 THEN amount ELSE 0 END) AS new_order_amount,
|
|
SUM(CASE WHEN is_new = 0 THEN amount ELSE 0 END) AS renewal_order_amount
|
|
`).
|
|
Where("status IN ? AND created_at >= ? AND created_at < ? AND method != ?",
|
|
[]int64{2, 5}, firstDay, nextDay, "balance").
|
|
Group("DATE_FORMAT(created_at, '%Y-%m-%d')").
|
|
Order("date ASC").
|
|
Scan(v).Error
|
|
})
|
|
return results, err
|
|
}
|
|
|
|
// QueryMonthlyOrdersList 查询过去 6 个月订单统计(包含当前月)
|
|
func (m *customOrderModel) QueryMonthlyOrdersList(ctx context.Context, date time.Time) ([]OrdersTotalWithDate, error) {
|
|
var results []OrdersTotalWithDate
|
|
|
|
err := m.QueryNoCacheCtx(ctx, &results, func(conn *gorm.DB, v interface{}) error {
|
|
// 六个月前(取月初)
|
|
start := time.Date(date.Year(), date.Month(), 1, 0, 0, 0, 0, date.Location()).AddDate(0, -5, 0)
|
|
// 下个月月初
|
|
end := time.Date(date.Year(), date.Month(), 1, 0, 0, 0, 0, date.Location()).AddDate(0, 1, 0)
|
|
|
|
return conn.Model(&Order{}).
|
|
Select(`
|
|
DATE_FORMAT(created_at, '%Y-%m') AS date,
|
|
SUM(amount) AS amount_total,
|
|
SUM(CASE WHEN is_new = 1 THEN amount ELSE 0 END) AS new_order_amount,
|
|
SUM(CASE WHEN is_new = 0 THEN amount ELSE 0 END) AS renewal_order_amount
|
|
`).
|
|
Where("status IN ? AND created_at >= ? AND created_at < ? AND method != ?",
|
|
[]int64{2, 5}, start, end, "balance").
|
|
Group("DATE_FORMAT(created_at, '%Y-%m')").
|
|
Order("date ASC").
|
|
Scan(v).Error
|
|
})
|
|
return results, err
|
|
}
|