Co-authored-by: multica-agent <github@multica.ai>
This commit is contained in:
@@ -378,13 +378,13 @@ func (m *customUserModel) QueryDailyUserStatisticsList(ctx context.Context, date
|
||||
// 子查询:统计每天的新用户订单数量
|
||||
newOrderSub := conn.Model(&order.Order{}).
|
||||
Select("DATE_FORMAT(created_at, '%Y-%m-%d') AS date, COUNT(DISTINCT user_id) AS new_order_users").
|
||||
Where("is_new = 1 AND created_at BETWEEN ? AND ? AND status IN ?", firstDay, date, []int64{2, 5}).
|
||||
Where("type = 1 AND created_at BETWEEN ? AND ? AND status IN ? AND method != ?", firstDay, date, []int64{2, 5}, "balance").
|
||||
Group("DATE_FORMAT(created_at, '%Y-%m-%d')")
|
||||
|
||||
// 子查询:统计每天的续费订单数量
|
||||
renewalOrderSub := conn.Model(&order.Order{}).
|
||||
Select("DATE_FORMAT(created_at, '%Y-%m-%d') AS date, COUNT(DISTINCT user_id) AS renewal_order_users").
|
||||
Where("is_new = 0 AND created_at BETWEEN ? AND ? AND status IN ?", firstDay, date, []int64{2, 5}).
|
||||
Where("type = 2 AND created_at BETWEEN ? AND ? AND status IN ? AND method != ?", firstDay, date, []int64{2, 5}, "balance").
|
||||
Group("DATE_FORMAT(created_at, '%Y-%m-%d')")
|
||||
|
||||
return conn.Model(&User{}).
|
||||
@@ -416,13 +416,13 @@ func (m *customUserModel) QueryMonthlyUserStatisticsList(ctx context.Context, da
|
||||
// 子查询:每月新订单用户数量
|
||||
newOrderSub := conn.Model(&order.Order{}).
|
||||
Select("DATE_FORMAT(created_at, '%Y-%m') AS date, COUNT(DISTINCT user_id) AS new_order_users").
|
||||
Where("is_new = 1 AND created_at >= ? AND status IN ?", sixMonthsAgo, []int64{2, 5}).
|
||||
Where("type = 1 AND created_at >= ? AND status IN ? AND method != ?", sixMonthsAgo, []int64{2, 5}, "balance").
|
||||
Group("DATE_FORMAT(created_at, '%Y-%m')")
|
||||
|
||||
// 子查询:每月续费订单用户数量
|
||||
renewalOrderSub := conn.Model(&order.Order{}).
|
||||
Select("DATE_FORMAT(created_at, '%Y-%m') AS date, COUNT(DISTINCT user_id) AS renewal_order_users").
|
||||
Where("is_new = 0 AND created_at >= ? AND status IN ?", sixMonthsAgo, []int64{2, 5}).
|
||||
Where("type = 2 AND created_at >= ? AND status IN ? AND method != ?", sixMonthsAgo, []int64{2, 5}, "balance").
|
||||
Group("DATE_FORMAT(created_at, '%Y-%m')")
|
||||
|
||||
return conn.Model(&User{}).
|
||||
|
||||
Reference in New Issue
Block a user