From 326eec184fc8f9f29c89540410b8c19b8f62239e Mon Sep 17 00:00:00 2001 From: zhouyonggao <1971162852@qq.com> Date: Thu, 18 Dec 2025 15:23:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(api):=20=E5=A2=9E=E5=8A=A0=E8=90=A5?= =?UTF-8?q?=E9=94=80=E7=B3=BB=E7=BB=9F=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=8F=8A=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增MarketingSettlementType、MarketingPeriodType、MarketingSendMethod、MarketingRechargeType枚举映射 - 在导出接口中根据数据源区分结算方式,支持YMT和营销系统不同枚举转换 - 增加plan.send_method、code_batch.period_type和code_batch.recharge_type字段的枚举值转换 - 优化导出数据中相关字段的可读性,便于理解和使用枚举标签展示 --- server/internal/api/exports.go | 37 ++++++++++++++++++++++++++++-- server/internal/constants/enums.go | 33 ++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/server/internal/api/exports.go b/server/internal/api/exports.go index 2e7e09d..f71172d 100644 --- a/server/internal/api/exports.go +++ b/server/internal/api/exports.go @@ -1158,10 +1158,43 @@ func transformRow(ds string, fields []string, vals []string) []string { } continue } - // activity.settlement_type - 结算类型 + // activity.settlement_type / plan.settlement_type - 结算方式 if f == "activity.settlement_type" || f == "plan.settlement_type" { if n := parseIntVal(v); n >= 0 { - if label, ok := constants.YMTSettlementType[n]; ok { + if ds == "ymt" { + if label, ok := constants.YMTSettlementType[n]; ok { + vals[i] = label + } + } else { + if label, ok := constants.MarketingSettlementType[n]; ok { + vals[i] = label + } + } + } + continue + } + // plan.send_method - 发放方式 + if f == "plan.send_method" { + if n := parseIntVal(v); n >= 0 { + if label, ok := constants.MarketingSendMethod[n]; ok { + vals[i] = label + } + } + continue + } + // code_batch.period_type - 周期类型 + if f == "code_batch.period_type" { + if n := parseIntVal(v); n >= 0 { + if label, ok := constants.MarketingPeriodType[n]; ok { + vals[i] = label + } + } + continue + } + // code_batch.recharge_type - 充值类型 + if f == "code_batch.recharge_type" { + if n := parseIntVal(v); n >= 0 { + if label, ok := constants.MarketingRechargeType[n]; ok { vals[i] = label } } diff --git a/server/internal/constants/enums.go b/server/internal/constants/enums.go index 1fec3c0..1f2958b 100644 --- a/server/internal/constants/enums.go +++ b/server/internal/constants/enums.go @@ -88,6 +88,39 @@ var YMTSettlementType = map[int]string{ 4: "核销结算", } +// MarketingSettlementType 营销系统结算方式映射 +var MarketingSettlementType = map[int]string{ + 1: "发放结算", + 2: "打开结算", + 3: "打开成功结算", + 4: "领取结算", + 5: "领取成功结算", + 6: "使用结算", + 7: "使用成功结算", + 8: "官方绑定结算", + 9: "官方核销结算", +} + +// MarketingPeriodType 营销系统周期类型映射 +var MarketingPeriodType = map[int]string{ + 1: "不设置", + 2: "自动发放", + 3: "手动领取", +} + +// MarketingSendMethod 营销系统发放方式映射 +var MarketingSendMethod = map[int]string{ + 0: "", + 1: "邮件发放", + 2: "API调用", +} + +// MarketingRechargeType 营销系统充值类型映射 +var MarketingRechargeType = map[int]string{ + 1: "单个商品充值", + 2: "组合商品充值", +} + // ==================== 通用枚举 ==================== // ThirdPartyType 第三方类型映射