wanwu/sub2api
1
0
Fork 0
mirror of https://gitee.com/wanwujie/sub2api synced 2026-04-03 06:52:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1026 from touwaeriol/fix/group-quota-clear

Browse Source 
fix(billing): allow clearing group quota limits and treat 0 as zero-limit
This commit is contained in:
Wesley Liddick
2026-03-15 16:33:00 +08:00
committed by GitHub
parent cbe9e78977 5899784aa4
commit 10a6180e4a
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
backend/internal/service/admin_service.go
View File

@@ -832,7 +832,7 @@ func (s *adminServiceImpl) CreateGroup(ctx context.Context, input *CreateGroupIn
subscriptionType = SubscriptionTypeStandard subscriptionType = SubscriptionTypeStandard
} }
// 限额字段：0 和 nil 都表示"无限制" // 限额字段：nil/负数 表示"无限制"，0 表示"不允许用量"，正数表示具体限额
dailyLimit := normalizeLimit(input.DailyLimitUSD) dailyLimit := normalizeLimit(input.DailyLimitUSD)
weeklyLimit := normalizeLimit(input.WeeklyLimitUSD) weeklyLimit := normalizeLimit(input.WeeklyLimitUSD)
monthlyLimit := normalizeLimit(input.MonthlyLimitUSD) monthlyLimit := normalizeLimit(input.MonthlyLimitUSD)
@@ -944,9 +944,9 @@ func (s *adminServiceImpl) CreateGroup(ctx context.Context, input *CreateGroupIn
return group, nil return group, nil
} }
// normalizeLimit 将 0 或负数转换为 nil（表示无限制） // normalizeLimit 将负数转换为 nil（表示无限制），0 保留（表示限额为零）
func normalizeLimit(limit *float64) *float64 { func normalizeLimit(limit *float64) *float64 {
if limit == nil || *limit <= 0 { if limit == nil || *limit < 0 {
return nil return nil
} }
return limit return limit
@@ -1058,16 +1058,11 @@ func (s *adminServiceImpl) UpdateGroup(ctx context.Context, id int64, input *Upd
if input.SubscriptionType != "" { if input.SubscriptionType != "" {
group.SubscriptionType = input.SubscriptionType group.SubscriptionType = input.SubscriptionType
} }
// 限额字段：0 和 nil 都表示"无限制"，正数表示具体限额 // 限额字段：nil/负数 表示"无限制"，0 表示"不允许用量"，正数表示具体限额
if input.DailyLimitUSD != nil { // 前端始终发送这三个字段，无需 nil 守卫
group.DailyLimitUSD = normalizeLimit(input.DailyLimitUSD) group.DailyLimitUSD = normalizeLimit(input.DailyLimitUSD)
} group.WeeklyLimitUSD = normalizeLimit(input.WeeklyLimitUSD)
if input.WeeklyLimitUSD != nil { group.MonthlyLimitUSD = normalizeLimit(input.MonthlyLimitUSD)
group.WeeklyLimitUSD = normalizeLimit(input.WeeklyLimitUSD)
}
if input.MonthlyLimitUSD != nil {
group.MonthlyLimitUSD = normalizeLimit(input.MonthlyLimitUSD)
}
// 图片生成计费配置：负数表示清除（使用默认价格） // 图片生成计费配置：负数表示清除（使用默认价格）
if input.ImagePrice1K != nil { if input.ImagePrice1K != nil {
group.ImagePrice1K = normalizePrice(input.ImagePrice1K) group.ImagePrice1K = normalizePrice(input.ImagePrice1K)

10
frontend/src/views/admin/GroupsView.vue
View File

@@ -2382,6 +2382,11 @@ const handleCreateGroup = async () => {
sora_storage_quota_bytes: createQuotaGb ? Math.round(createQuotaGb * 1024 * 1024 * 1024) : 0, sora_storage_quota_bytes: createQuotaGb ? Math.round(createQuotaGb * 1024 * 1024 * 1024) : 0,
model_routing: convertRoutingRulesToApiFormat(createModelRoutingRules.value) model_routing: convertRoutingRulesToApiFormat(createModelRoutingRules.value)
} }
// v-model.number 清空输入框时产生 ""，转为 null 让后端设为无限制
const emptyToNull = (v: any) => v === '' ? null : v
requestData.daily_limit_usd = emptyToNull(requestData.daily_limit_usd)
requestData.weekly_limit_usd = emptyToNull(requestData.weekly_limit_usd)
requestData.monthly_limit_usd = emptyToNull(requestData.monthly_limit_usd)
await adminAPI.groups.create(requestData) await adminAPI.groups.create(requestData)
appStore.showSuccess(t('admin.groups.groupCreated')) appStore.showSuccess(t('admin.groups.groupCreated'))
closeCreateModal() closeCreateModal()
@@ -2465,6 +2470,11 @@ const handleUpdateGroup = async () => {
: editForm.fallback_group_id_on_invalid_request, : editForm.fallback_group_id_on_invalid_request,
model_routing: convertRoutingRulesToApiFormat(editModelRoutingRules.value) model_routing: convertRoutingRulesToApiFormat(editModelRoutingRules.value)
} }
// v-model.number 清空输入框时产生 ""，转为 null 让后端设为无限制
const emptyToNull = (v: any) => v === '' ? null : v
payload.daily_limit_usd = emptyToNull(payload.daily_limit_usd)
payload.weekly_limit_usd = emptyToNull(payload.weekly_limit_usd)
payload.monthly_limit_usd = emptyToNull(payload.monthly_limit_usd)
await adminAPI.groups.update(editingGroup.value.id, payload) await adminAPI.groups.update(editingGroup.value.id, payload)
appStore.showSuccess(t('admin.groups.groupUpdated')) appStore.showSuccess(t('admin.groups.groupUpdated'))
closeEditModal() closeEditModal()