shanshanzhong147
0bd7560b64
Bug 4: resolveRenewalActivationSubscription - add fallback by user_id+subscribe_id with SELECT FOR UPDATE when token lookup fails Bug 5: appleIAPNotifyLogic - return error on product ID mapping failure instead of silently dropping the notification Bug 6: NewPurchase fallback query - wrap in transaction with SELECT FOR UPDATE to prevent concurrent duplicate subscription creation Bug 7: appleIAPNotifyLogic - fix UserId=0 by reverse-lookup from original purchase order; create renewal audit order record for DID_RENEW/SUBSCRIBED notifications Bug 8: UpdateOrderStatus - pre-delete cache before DB write (double-delete) to close TOCTOU window between DB update and cache invalidation Bug 9: validateNewUserOnlyEligibilityAtActivation - add Redis distributed lock on user_id to serialise concurrent new-user-only order activations Co-authored-by: multica-agent <github@multica.ai>
340 lines
14 KiB
Go
340 lines
14 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)
|
|
// FindPendingIAPOrders 查询待对账的 Apple IAP 订单
|
|
// minAge: 订单创建时间距今最短时长（避免扫到刚创建的）
|
|
// maxAge: 订单创建时间距今最长时长（超出此范围由日终对账处理）
|
|
// requireTradeNo: true=只查 trade_no 非空的（第二层），false=全部（第三层）
|
|
FindPendingIAPOrders(ctx context.Context, minAge, maxAge time.Duration, requireTradeNo bool) ([]*Order, 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 with state guard to prevent backward transitions
|
|
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
|
|
}
|
|
keys := m.getCacheKeys(orderInfo)
|
|
// Pre-delete: evict cache before the DB write so concurrent reads during the update
|
|
// window go to DB instead of getting a stale cached status (double-delete pattern).
|
|
_ = m.DelCacheCtx(ctx, keys...)
|
|
return m.ExecCtx(ctx, func(conn *gorm.DB) error {
|
|
if len(tx) > 0 {
|
|
conn = tx[0]
|
|
}
|
|
result := conn.Model(&Order{}).Where("order_no = ? AND status < ?", orderNo, status).Update("status", status)
|
|
if result.Error != nil {
|
|
return result.Error
|
|
}
|
|
if result.RowsAffected == 0 {
|
|
// Order already at or past the target status — idempotent success
|
|
return nil
|
|
}
|
|
return nil
|
|
}, keys...)
|
|
}
|
|
|
|
// 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 type = 1 THEN amount ELSE 0 END) as new_order_amount, " +
|
|
"SUM(CASE WHEN type = 2 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) {
|
|
dateStr := date.Format("2006-01-02")
|
|
var result OrdersTotal
|
|
err := m.QueryNoCacheCtx(ctx, &result, func(conn *gorm.DB, v interface{}) error {
|
|
return conn.Model(&Order{}).
|
|
Where("status IN ? AND DATE_FORMAT(created_at, '%Y-%m-%d') = ? AND method != ?", []int64{2, 5}, dateStr, "balance").
|
|
Select(
|
|
"SUM(amount) as amount_total, " +
|
|
"SUM(CASE WHEN type = 1 THEN amount ELSE 0 END) as new_order_amount, " +
|
|
"SUM(CASE WHEN type = 2 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 type = 1 THEN amount ELSE 0 END) AS new_order_amount,
|
|
SUM(CASE WHEN type = 2 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 type = 1 THEN user_id END) AS new_users,
|
|
COUNT(DISTINCT CASE WHEN type = 2 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) {
|
|
dateStr := date.Format("2006-01-02")
|
|
|
|
var counts UserCounts
|
|
|
|
err := m.QueryNoCacheCtx(ctx, nil, func(conn *gorm.DB, _ interface{}) error {
|
|
return conn.Model(&Order{}).
|
|
Select(`
|
|
COUNT(DISTINCT CASE WHEN type = 1 THEN user_id END) AS new_users,
|
|
COUNT(DISTINCT CASE WHEN type = 2 THEN user_id END) AS renewal_users
|
|
`).
|
|
Where("status IN ? AND DATE_FORMAT(created_at, '%Y-%m-%d') = ? AND method != ?",
|
|
[]int64{2, 5}, dateStr, "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 type = 1 THEN user_id END) AS new_users,
|
|
COUNT(DISTINCT CASE WHEN type = 2 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 := time.Date(date.Year(), date.Month(), date.Day()+1, 0, 0, 0, 0, date.Location())
|
|
|
|
return conn.Model(&Order{}).
|
|
Select(`
|
|
DATE_FORMAT(created_at, '%Y-%m-%d') AS date,
|
|
SUM(amount) AS amount_total,
|
|
SUM(CASE WHEN type = 1 THEN amount ELSE 0 END) AS new_order_amount,
|
|
SUM(CASE WHEN type = 2 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
|
|
}
|
|
|
|
// FindPendingIAPOrders 查询待对账的 Apple IAP 待支付订单
|
|
func (m *customOrderModel) FindPendingIAPOrders(ctx context.Context, minAge, maxAge time.Duration, requireTradeNo bool) ([]*Order, error) {
|
|
var list []*Order
|
|
now := time.Now()
|
|
err := m.QueryNoCacheCtx(ctx, &list, func(conn *gorm.DB, v interface{}) error {
|
|
q := conn.Model(&Order{}).
|
|
Where("method = ? AND status = ? AND created_at < ? AND created_at > ?",
|
|
"apple_iap", 1, now.Add(-minAge), now.Add(-maxAge)).
|
|
Order("created_at ASC").
|
|
Limit(100)
|
|
if requireTradeNo {
|
|
q = q.Where("trade_no != '' AND trade_no IS NOT NULL")
|
|
}
|
|
return q.Find(&list).Error
|
|
})
|
|
return list, 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 type = 1 THEN amount ELSE 0 END) AS new_order_amount,
|
|
SUM(CASE WHEN type = 2 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
|
|
}
|