Skip to content

新增 creem 支付 #1823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Oct 28, 2025
+1,109 −5
Merged

新增 creem 支付 #1823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
99b9a34
完成 后端 部分，webo hhok 待完善
littlewrite Sep 8, 2025
dc6fbff
前端部分，调试 完善
littlewrite Sep 8, 2025
a7d6a8b
完善 订单处理，以及 优化 ui
littlewrite Sep 16, 2025
7e46c43
Update controller/topup_creem.go
littlewrite Sep 27, 2025
a97dbdf
Update controller/topup_creem.go
littlewrite Sep 27, 2025
0c01fd4
Update controller/topup_creem.go
littlewrite Sep 27, 2025
0192585
Update model/topup.go
littlewrite Sep 27, 2025
95cb7fc
调整 优化代码细节
littlewrite Sep 27, 2025
6ccb404
完善了 翻译
littlewrite Sep 27, 2025
fade73d
Merge branch 'main' into feat_subscribe_sp1
littlewrite Sep 27, 2025
ac3baac
Merge branch 'main' into feat_subscribe_sp1
littlewrite Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions controller/topup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ func GetTopUpInfo(c *gin.Context) {
data := gin.H{
"enable_online_topup": operation_setting.PayAddress != "" && operation_setting.EpayId != "" && operation_setting.EpayKey != "",
"enable_stripe_topup": setting.StripeApiSecret != "" && setting.StripeWebhookSecret != "" && setting.StripePriceId != "",
"enable_creem_topup": setting.CreemApiKey != "" && setting.CreemProducts != "[]",
"creem_products": setting.CreemProducts,
"pay_methods": payMethods,
Comment on lines +54 to 56
Copy link
Contributor

@coderabbitai coderabbitai bot Sep 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion | 🟠 Major

🧩 Analysis chain

Compute enable_creem_topup from parsed products; return parsed products, not a JSON string.

Current check setting.CreemProducts != "[]" can be true for invalid JSON; returning a raw JSON string forces clients to re‑parse. Parse once, validate, and return typed JSON.

- "enable_creem_topup":  setting.CreemApiKey != "" && setting.CreemProducts != "[]",
- "creem_products":      setting.CreemProducts,
+ "enable_creem_topup":  setting.CreemApiKey != "" && len(creemProducts) > 0,
+ "creem_products":      creemProducts,

Add before building data:

// at top of GetTopUpInfo
var creemProducts []CreemProduct
if err := json.Unmarshal([]byte(setting.CreemProducts), &creemProducts); err != nil {
    creemProducts = nil
}

Add import:

import "encoding/json"

Please confirm the frontend expects an array, not a string.

🏁 Script executed:

#!/bin/bash
# Grep UI for 'creem_products' usage to confirm expected type
rg -nP -C2 '\bcreem_products\b'

Length of output: 963

Return creem_products as an array and update frontend parsing

  • In controller/topup.go, unmarshal setting.CreemProducts before building data and switch to:

     // parse once at top of GetTopUpInfo
 var creemProducts []CreemProduct
 if err := json.Unmarshal([]byte(setting.CreemProducts), &creemProducts); err != nil {
     creemProducts = nil
 }

 // when constructing response
- "enable_creem_topup": setting.CreemApiKey != "" && setting.CreemProducts != "[]",
- "creem_products":      setting.CreemProducts,
+ "enable_creem_topup": setting.CreemApiKey != "" && len(creemProducts) > 0,
+ "creem_products":      creemProducts,

    and add import "encoding/json" at the top.

  • In web/src/components/topup/index.jsx (around line 383), remove the JSON.parse and consume the array directly:

    - const products = JSON.parse(data.creem_products || '[]');
+ const products = data.creem_products || [];
  setCreemProducts(products);

This ensures the backend supplies a validated array and the UI no longer re-parses a JSON string.

🤖 Prompt for AI Agents 
In controller/topup.go around lines 53 to 55, the code currently returns
setting.CreemProducts as a raw JSON string; unmarshal setting.CreemProducts into
a Go slice (e.g., []string) before assembling the response, add import
"encoding/json" at the top of the file, handle unmarshal errors (return or log
and fall back to empty slice) and set "creem_products" in the response map to
that slice (not the original string); also update
web/src/components/topup/index.jsx (around line ~383) to remove JSON.parse usage
and consume the array directly from the backend.

"min_topup": operation_setting.MinTopUp,
"stripe_min_topup": setting.StripeMinTopUp,
Expand Down
Loading