From 0a27a78d97fc0e65ade4f379613ab1830a506ddf Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 15 Apr 2026 14:58:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=BC=BA=E5=85=85?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E6=98=A0=E5=B0=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C0-based=20DB=20=E5=B8=B8=E9=87=8F=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E6=98=A0=E5=B0=84=E4=B8=BA=201-based=20=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus --- internal/service/client_order/service.go | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/internal/service/client_order/service.go b/internal/service/client_order/service.go index 43e4b47..98e5c6e 100644 --- a/internal/service/client_order/service.go +++ b/internal/service/client_order/service.go @@ -749,24 +749,30 @@ func buildClientPurchaseBusinessKey(customerID uint, assetInfo *dto.AssetResolve } func rechargeStatusToClientStatus(status int) int { + // DB 使用 0-based 常量（0=待支付, 1=已支付, 2=已关闭, 3=已退款） + // 对外透出 1-based（与 spec 约定一致）：1=待支付, 2=已支付, 3=已关闭, 4=已退款 switch status { - case 1: - return 0 - case 2, 3: + case model.RechargeOrderStatusPending: return 1 - default: + case model.RechargeOrderStatusPaid: return 2 + case model.RechargeOrderStatusClosed: + return 3 + default: + return 4 } } func clientRechargeStatusName(clientStatus int) string { switch clientStatus { - case 0: - return "待支付" case 1: + return "待支付" + case 2: return "已支付" - default: + case 3: return "已关闭" + default: + return "已退款" } }