diff --git a/.env.example b/.env.example index 1076e28..c989193 100644 --- a/.env.example +++ b/.env.example @@ -43,7 +43,7 @@ DB_NAME=db.sqlite3 # ============================================ # 店铺: https://pancake.waffo.ai/store/opsxshell-pwsi6m4n # 包年一次性: PROD_1BIezCi932IbgCzRIV8hcJ (type=onetime, currency=CNY) -# 永久买断: PROD_0pcnzzT4nalEkkcdyIUoD5 (type=onetime, currency=USD) +# 永久买断: PROD_0pcnzzT4nalEkkcdyIUoD5 (type=onetime, currency=CNY) # 勿设置单一 WAFFO_CHECKOUT_URL,否则无法按档位分流商品 WAFFO_STORE_SLUG=opsxshell-pwsi6m4n WAFFO_PRODUCT_ID=PROD_0pcnzzT4nalEkkcdyIUoD5 @@ -51,7 +51,7 @@ WAFFO_PRODUCT_ID_YEARLY=PROD_1BIezCi932IbgCzRIV8hcJ WAFFO_PRODUCT_ID_PERPETUAL=PROD_0pcnzzT4nalEkkcdyIUoD5 WAFFO_CURRENCY=CNY WAFFO_CURRENCY_YEARLY=CNY -WAFFO_CURRENCY_PERPETUAL=USD +WAFFO_CURRENCY_PERPETUAL=CNY # test | live(test 时自动附加 test=true) WAFFO_ENVIRONMENT=test # 支付成功回跳(桌面端 deep link;CreateOrder/Checkout 的 return_url 可覆盖) diff --git a/backend/internal/service/payment/waffo.go b/backend/internal/service/payment/waffo.go index 4840979..4338abc 100644 --- a/backend/internal/service/payment/waffo.go +++ b/backend/internal/service/payment/waffo.go @@ -41,12 +41,7 @@ func LoadWaffoConfig() WaffoConfig { } currencyPerpetual := strings.TrimSpace(os.Getenv("WAFFO_CURRENCY_PERPETUAL")) if currencyPerpetual == "" { - // 永久默认 USD(与 pancake 商品一致);可用环境变量覆盖。 // Logan.Li - if currency == "CNY" { - currencyPerpetual = "USD" - } else { - currencyPerpetual = currency - } + currencyPerpetual = currency } defaultProduct := strings.TrimSpace(os.Getenv("WAFFO_PRODUCT_ID")) yearly := strings.TrimSpace(os.Getenv("WAFFO_PRODUCT_ID_YEARLY")) diff --git a/backend/internal/service/payment/waffo_test.go b/backend/internal/service/payment/waffo_test.go index c7574a1..17d87c6 100644 --- a/backend/internal/service/payment/waffo_test.go +++ b/backend/internal/service/payment/waffo_test.go @@ -37,14 +37,14 @@ func TestBuildCheckoutURL_YearlyOnetimeCNY(t *testing.T) { } } -func TestBuildCheckoutURL_PerpetualOnetimeUSD(t *testing.T) { +func TestBuildCheckoutURL_PerpetualOnetimeCNY(t *testing.T) { cfg := WaffoConfig{ StoreSlug: "opsxshell-pwsi6m4n", ProductIDYearly: "PROD_1BIezCi932IbgCzRIV8hcJ", ProductIDPerpetual: "PROD_0pcnzzT4nalEkkcdyIUoD5", Currency: "CNY", CurrencyYearly: "CNY", - CurrencyPerpetual: "USD", + CurrencyPerpetual: "CNY", Environment: "test", SuccessURL: "opsxshell://pro/activated", } @@ -63,7 +63,7 @@ func TestBuildCheckoutURL_PerpetualOnetimeUSD(t *testing.T) { if q.Get("type") != "onetime" { t.Fatalf("type=%s want onetime", q.Get("type")) } - if q.Get("currency") != "USD" { - t.Fatalf("currency=%s want USD", q.Get("currency")) + if q.Get("currency") != "CNY" { + t.Fatalf("currency=%s want CNY", q.Get("currency")) } }