diff --git a/server/internal/constants/enums.go b/server/internal/constants/enums.go index bb4dd90..1fec3c0 100644 --- a/server/internal/constants/enums.go +++ b/server/internal/constants/enums.go @@ -96,12 +96,12 @@ var ThirdPartyType = map[int]string{ 2: "内部供应商", } -// OrderCashReceiveStatus 红包领取状态映射 +// OrderCashReceiveStatus 红包领取状态映射(1 待领取 2 领取中 3 领取成功 4 领取失败) var OrderCashReceiveStatus = map[int]string{ - 0: "待领取", - 1: "领取中", - 2: "领取成功", - 3: "领取失败", + 1: "待领取", + 2: "领取中", + 3: "领取成功", + 4: "领取失败", } // OrderCashChannel 红包渠道映射 diff --git a/server/internal/exporter/sqlbuilder.go b/server/internal/exporter/sqlbuilder.go index 5fb01d7..0755494 100644 --- a/server/internal/exporter/sqlbuilder.go +++ b/server/internal/exporter/sqlbuilder.go @@ -168,7 +168,12 @@ func BuildSQL(req BuildRequest, whitelist map[string]bool) (string, []interface{ } } if t == "order_cash" && f == "receive_status" { - cols = append(cols, "CASE `order_cash`.receive_status WHEN 0 THEN '待领取' WHEN 1 THEN '领取中' WHEN 2 THEN '领取成功' WHEN 3 THEN '领取失败' ELSE '' END AS `order_cash.receive_status`") + // 营销与易码通枚举不同,按数据源分别映射 + if req.Datasource == "ymt" { + cols = append(cols, "CASE `order_cash`.receive_status WHEN 1 THEN '待领取' WHEN 2 THEN '领取中' WHEN 3 THEN '领取成功' WHEN 4 THEN '领取失败' ELSE '' END AS `order_cash.receive_status`") + } else { + cols = append(cols, "CASE `order_cash`.receive_status WHEN 0 THEN '待领取' WHEN 1 THEN '领取中' WHEN 2 THEN '领取成功' WHEN 3 THEN '领取失败' ELSE '' END AS `order_cash.receive_status`") + } continue } // YMT 的 order_cash 表无 is_confirm 字段,输出占位常量