refactor: 更新项目引用路径从perfect-panel/ppanel-server到perfect-panel/server
feat: 添加版本和构建时间变量 fix: 修正短信队列类型注释错误 style: 清理未使用的代码和测试文件 docs: 更新安装文档中的下载链接 chore: 迁移数据库脚本添加日志和订阅配置
This commit is contained in:
@@ -5,7 +5,7 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"github.com/perfect-panel/ppanel-server/pkg/cache"
|
||||
"github.com/perfect-panel/server/pkg/cache"
|
||||
"github.com/redis/go-redis/v9"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
+120
-36
@@ -4,9 +4,9 @@ import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"github.com/perfect-panel/ppanel-server/internal/model/payment"
|
||||
"github.com/perfect-panel/server/internal/model/payment"
|
||||
|
||||
"github.com/perfect-panel/ppanel-server/internal/model/subscribe"
|
||||
"github.com/perfect-panel/server/internal/model/subscribe"
|
||||
"github.com/redis/go-redis/v9"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
@@ -40,6 +40,13 @@ type Details struct {
|
||||
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)
|
||||
@@ -47,11 +54,19 @@ type customOrderLogicModel interface {
|
||||
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)
|
||||
QueryPendingOrders(ctx context.Context) ([]*Order, 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.
|
||||
@@ -156,51 +171,78 @@ func (m *customOrderModel) QueryDateOrders(ctx context.Context, date time.Time)
|
||||
|
||||
func (m *customOrderModel) QueryTotalOrders(ctx context.Context) (OrdersTotal, error) {
|
||||
var result OrdersTotal
|
||||
err := m.QueryNoCacheCtx(ctx, &result, func(conn *gorm.DB, v interface{}) error {
|
||||
|
||||
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").
|
||||
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
|
||||
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())
|
||||
lastDay := firstDay.AddDate(0, 1, -1)
|
||||
// 获取下个月第一天零点（避免漏掉最后一天的订单）
|
||||
nextMonth := firstDay.AddDate(0, 1, 0)
|
||||
|
||||
var newUsers int64
|
||||
var renewalUsers int64
|
||||
var counts UserCounts
|
||||
|
||||
// 执行查询
|
||||
err := m.QueryNoCacheCtx(ctx, nil, func(conn *gorm.DB, _ interface{}) error {
|
||||
return conn.Model(&Order{}).
|
||||
Where("status IN ? AND created_at BETWEEN ? AND ? AND method != ?", []int64{2, 5}, firstDay, lastDay, "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").
|
||||
Row().Scan(&newUsers, &renewalUsers)
|
||||
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 newUsers, renewalUsers, err
|
||||
|
||||
return counts.NewUsers, counts.RenewalUsers, err
|
||||
}
|
||||
|
||||
func (m *customOrderModel) QueryDateUserCounts(ctx context.Context, date time.Time) (int64, int64, error) {
|
||||
start := date.Truncate(24 * time.Hour)
|
||||
end := start.Add(24 * time.Hour).Add(-time.Nanosecond)
|
||||
// 当天 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
|
||||
|
||||
var newUsers int64
|
||||
var renewalUsers int64
|
||||
err := m.QueryNoCacheCtx(ctx, nil, func(conn *gorm.DB, _ interface{}) error {
|
||||
return conn.Model(&Order{}).
|
||||
Where("status IN ? AND created_at BETWEEN ? AND ? AND method != ?", []int64{2, 5}, start, end, "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").
|
||||
Row().Scan(&newUsers, &renewalUsers)
|
||||
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 newUsers, renewalUsers, err
|
||||
|
||||
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) {
|
||||
@@ -213,12 +255,54 @@ func (m *customOrderModel) IsUserEligibleForNewOrder(ctx context.Context, userID
|
||||
return count == 0, err
|
||||
}
|
||||
|
||||
func (m *customOrderModel) QueryPendingOrders(ctx context.Context) ([]*Order, error) {
|
||||
var orderInfo []*Order
|
||||
err := m.QueryNoCacheCtx(ctx, &orderInfo, func(conn *gorm.DB, v interface{}) error {
|
||||
// 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{}).
|
||||
Where("status = ?", 1).
|
||||
Find(v).Error
|
||||
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 orderInfo, err
|
||||
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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user