fix(tenant): 收紧双站运营提号与录单边界
This commit is contained in:
@@ -97,19 +97,26 @@ func (r *Repository) RecordAdminPickupExport(
|
||||
}
|
||||
|
||||
func (r *Repository) adminPickupExportQuery(ctx context.Context) *gorm.DB {
|
||||
return r.db.WithContext(ctx).Table("admin_pickups AS p").
|
||||
Select(`p.id, p.pickup_no, p.listing_id, p.account_id, p.owner_id, p.admin_id,
|
||||
db := r.db.WithContext(ctx).Table("admin_pickups AS p").
|
||||
Select(`p.id, p.tenant_id, p.source_tenant_id, p.pickup_no, p.listing_id, p.account_id, p.owner_id, p.admin_id,
|
||||
p.operator, p.platform, p.third_party_order_no, p.shop_name, p.raw_shop_name,
|
||||
p.account_source, p.source_channel, p.settlement_mode,
|
||||
p.order_amount_cent, p.deposit_amount_cent, p.profit_amount_cent, p.settle_amount_cent,
|
||||
p.status, p.offline_settlement_status, p.remark, p.complete_remark,
|
||||
p.created_at, p.completed_at, p.cancelled_at,
|
||||
l.listing_no, a.title AS account_title, a.server_region, a.login_platform, owner.phone AS owner_phone,
|
||||
COALESCE(pickup_tenant.code, '') AS tenant_code,
|
||||
COALESCE(pickup_tenant.name, '') AS tenant_name,
|
||||
COALESCE(source_tenant.code, '') AS source_tenant_code,
|
||||
COALESCE(source_tenant.name, '') AS source_tenant_name,
|
||||
COALESCE((SELECT SUM(fa.profit_delta_cent) FROM admin_pickup_financial_adjustments AS fa WHERE fa.pickup_id = p.id), 0) AS profit_adjustment_cent,
|
||||
COALESCE((SELECT SUM(fa.settle_delta_cent) FROM admin_pickup_financial_adjustments AS fa WHERE fa.pickup_id = p.id), 0) AS settle_adjustment_cent`).
|
||||
Joins("JOIN rental_listings AS l ON l.id = p.listing_id").
|
||||
Joins("JOIN game_accounts AS a ON a.id = p.account_id").
|
||||
Joins("JOIN users AS owner ON owner.id = p.owner_id")
|
||||
Joins("JOIN users AS owner ON owner.id = p.owner_id").
|
||||
Joins("LEFT JOIN tenants AS pickup_tenant ON pickup_tenant.id = p.tenant_id").
|
||||
Joins("LEFT JOIN tenants AS source_tenant ON source_tenant.id = p.source_tenant_id")
|
||||
return pickupTenantScope(ctx, db, "p.tenant_id")
|
||||
}
|
||||
|
||||
func buildAdminPickupCSV(items []PickupDTO) ([]byte, error) {
|
||||
|
||||
Reference in New Issue
Block a user