From b8f2d70c3ef17a7db04161c74089de8c0990cd47 Mon Sep 17 00:00:00 2001 From: zhouyonggao <1971162852@qq.com> Date: Thu, 18 Dec 2025 14:09:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(api):=20=E4=BF=AE=E5=A4=8D=E8=90=A5?= =?UTF-8?q?=E9=94=80=E7=B3=BB=E7=BB=9F=E9=9D=9E=E7=9B=B4=E5=85=85=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在导出字段中过滤非直充类型时增加移除account字段 - 调整日志信息，说明非直充类型不导出充值时间、卡密和账号 - 元数据处理中营销系统非直充类型字段显示控制新增account字段 - 保证直充类型(type=1)才显示recharge_time、card_code和account字段 --- server/internal/api/exports.go | 6 +++--- server/internal/api/metadata.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/internal/api/exports.go b/server/internal/api/exports.go index 0b17f6c..9e1f08a 100644 --- a/server/internal/api/exports.go +++ b/server/internal/api/exports.go @@ -248,19 +248,19 @@ func (a *ExportsAPI) create(w http.ResponseWriter, r *http.Request) { } filtered = deduped } - // 营销系统：非直充类型(type!=1)时移除recharge_time和card_code字段 + // 营销系统：非直充类型(type!=1)时移除recharge_time、card_code、account字段 if ds == "marketing" && tv != 1 { deduped := make([]string, 0, len(filtered)) removed := []string{} for _, tf := range filtered { - if tf == "order.recharge_time" || tf == "order.card_code" { + if tf == "order.recharge_time" || tf == "order.card_code" || tf == "order.account" { removed = append(removed, tf) continue } deduped = append(deduped, tf) } if len(removed) > 0 { - logging.JSON("INFO", map[string]interface{}{"event": "fields_filtered_non_direct_charge", "removed": removed, "reason": "非直充类型不导出充值时间和卡密"}) + logging.JSON("INFO", map[string]interface{}{"event": "fields_filtered_non_direct_charge", "removed": removed, "reason": "非直充类型不导出充值时间、卡密和账号"}) } filtered = deduped } diff --git a/server/internal/api/metadata.go b/server/internal/api/metadata.go index 41781d9..1482cf8 100644 --- a/server/internal/api/metadata.go +++ b/server/internal/api/metadata.go @@ -25,9 +25,9 @@ func MetadataHandler(meta, marketing, ymt *sql.DB) http.Handler { if f.Hidden { continue } - // 营销系统：recharge_time和card_code字段只在直充类型(type=1)时才显示 + // 营销系统：recharge_time、card_code、account字段只在直充类型(type=1)时才显示 if ds == "marketing" && ot != "1" { - if f.Key == "order.recharge_time" || f.Key == "order.card_code" { + if f.Key == "order.recharge_time" || f.Key == "order.card_code" || f.Key == "order.account" { continue } }