feat(finance): count created pickups as paid

This commit is contained in:
yml2213
2026-08-10 14:12:55 +08:00
parent 6ddd7b664c
commit e3e980f114
2 changed files with 33 additions and 10 deletions
@@ -372,15 +372,22 @@ func (r *Repository) dailyItems(ctx context.Context, query DashboardQuery) ([]Fi
return items, nil return items, nil
} }
// dailyPaidOrders 统计普通租赁订单的成功支付,按实际支付完成时间归集 // dailyPaidOrders 按实际付款日统计普通租赁订单,并将创建的线下提号视为已付款成交
func (r *Repository) dailyPaidOrders(ctx context.Context, query DashboardQuery) ([]dailyPaidOrderRow, error) { func (r *Repository) dailyPaidOrders(ctx context.Context, query DashboardQuery) ([]dailyPaidOrderRow, error) {
items := make([]dailyPaidOrderRow, 0) items := make([]dailyPaidOrderRow, 0)
err := r.db.WithContext(ctx).Table("payment_orders AS po"). err := r.db.WithContext(ctx).Table(`(
Select(`DATE(po.paid_at) AS date, SELECT DATE(paid_at) AS date, COUNT(DISTINCT order_id) AS paid_order_count
COUNT(DISTINCT po.order_id) AS paid_order_count`). FROM payment_orders
Where("po.biz_type = ? AND po.status = ?", "order_pay", "paid"). WHERE biz_type = 'order_pay' AND status = 'paid' AND paid_at >= ? AND paid_at <= ?
Where("po.paid_at >= ? AND po.paid_at <= ?", query.StartDate, query.EndDate). GROUP BY DATE(paid_at)
Group("DATE(po.paid_at)"). UNION ALL
SELECT DATE(created_at) AS date, COUNT(id) AS paid_order_count
FROM admin_pickups
WHERE created_at >= ? AND created_at <= ?
GROUP BY DATE(created_at)
) AS daily_paid_orders`, query.StartDate, query.EndDate, query.StartDate, query.EndDate).
Select("date, SUM(paid_order_count) AS paid_order_count").
Group("date").
Scan(&items).Error Scan(&items).Error
return items, err return items, err
} }
@@ -11,7 +11,7 @@ import (
"gorm.io/gorm/logger" "gorm.io/gorm/logger"
) )
func TestDailyPaidOrdersUsePaidAtAndExcludeMohong(t *testing.T) { func TestDailyPaidOrdersUsePaidAtAndIncludeCreatedPickups(t *testing.T) {
db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{Logger: logger.Default.LogMode(logger.Silent)}) db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{Logger: logger.Default.LogMode(logger.Silent)})
if err != nil { if err != nil {
t.Fatalf("打开测试数据库失败: %v", err) t.Fatalf("打开测试数据库失败: %v", err)
@@ -25,6 +25,12 @@ func TestDailyPaidOrdersUsePaidAtAndExcludeMohong(t *testing.T) {
)`).Error; err != nil { )`).Error; err != nil {
t.Fatalf("创建支付单表失败: %v", err) t.Fatalf("创建支付单表失败: %v", err)
} }
if err := db.Exec(`CREATE TABLE admin_pickups (
id INTEGER PRIMARY KEY,
created_at DATETIME NOT NULL
)`).Error; err != nil {
t.Fatalf("创建提号表失败: %v", err)
}
loc := timeutil.ShanghaiLocation() loc := timeutil.ShanghaiLocation()
day := func(value int) time.Time { return time.Date(2026, 8, value, 10, 0, 0, 0, loc) } day := func(value int) time.Time { return time.Date(2026, 8, value, 10, 0, 0, 0, loc) }
@@ -42,6 +48,16 @@ func TestDailyPaidOrdersUsePaidAtAndExcludeMohong(t *testing.T) {
t.Fatalf("写入支付单失败: %v", err) t.Fatalf("写入支付单失败: %v", err)
} }
} }
for _, row := range [][]any{
{1, day(2)},
{2, day(2)},
{3, day(3)},
{4, day(1)},
} {
if err := db.Exec(`INSERT INTO admin_pickups (id, created_at) VALUES (?, ?)`, row...).Error; err != nil {
t.Fatalf("写入提号记录失败: %v", err)
}
}
repo := NewRepository(db) repo := NewRepository(db)
query := DashboardQuery{ query := DashboardQuery{
@@ -59,7 +75,7 @@ func TestDailyPaidOrdersUsePaidAtAndExcludeMohong(t *testing.T) {
for _, row := range result { for _, row := range result {
counts[row.Date] = row.PaidOrderCount counts[row.Date] = row.PaidOrderCount
} }
if counts["2026-08-02"] != 1 || counts["2026-08-03"] != 1 { if counts["2026-08-02"] != 3 || counts["2026-08-03"] != 2 {
t.Fatalf("每日已付款订单 = %#v, want 8月2日8月3日均为1", counts) t.Fatalf("每日已付款订单 = %#v, want 8月2日为3、8月3日为2", counts)
} }
} }