feat(currency): add currency configuration support and integrate into payment processing
This commit is contained in:
parent
780e71441d
commit
798fb9e245
34
initialize/currency.go
Normal file
34
initialize/currency.go
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
package initialize
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/perfect-panel/server/internal/config"
|
||||||
|
"github.com/perfect-panel/server/internal/svc"
|
||||||
|
"github.com/perfect-panel/server/pkg/logger"
|
||||||
|
"github.com/perfect-panel/server/pkg/tool"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Currency(ctx *svc.ServiceContext) {
|
||||||
|
// Retrieve system currency configuration
|
||||||
|
currency, err := ctx.SystemModel.GetCurrencyConfig(context.Background())
|
||||||
|
if err != nil {
|
||||||
|
logger.Errorf("[INIT] Failed to get currency configuration: %v", err.Error())
|
||||||
|
panic(fmt.Sprintf("[INIT] Failed to get currency configuration: %v", err.Error()))
|
||||||
|
}
|
||||||
|
// Parse currency configuration
|
||||||
|
configs := struct {
|
||||||
|
CurrencyUnit string
|
||||||
|
CurrencySymbol string
|
||||||
|
AccessKey string
|
||||||
|
}{}
|
||||||
|
tool.SystemConfigSliceReflectToStruct(currency, &configs)
|
||||||
|
|
||||||
|
ctx.Config.Currency = config.Currency{
|
||||||
|
Unit: configs.CurrencyUnit,
|
||||||
|
Symbol: configs.CurrencySymbol,
|
||||||
|
AccessKey: configs.AccessKey,
|
||||||
|
}
|
||||||
|
logger.Infof("[INIT] Currency configuration: %v", ctx.Config.Currency)
|
||||||
|
}
|
||||||
@ -15,6 +15,7 @@ func StartInitSystemConfig(svc *svc.ServiceContext) {
|
|||||||
Subscribe(svc)
|
Subscribe(svc)
|
||||||
Register(svc)
|
Register(svc)
|
||||||
Mobile(svc)
|
Mobile(svc)
|
||||||
|
Currency(svc)
|
||||||
if !svc.Config.Debug {
|
if !svc.Config.Debug {
|
||||||
Telegram(svc)
|
Telegram(svc)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -29,6 +29,7 @@ type Config struct {
|
|||||||
Invite InviteConfig `yaml:"Invite"`
|
Invite InviteConfig `yaml:"Invite"`
|
||||||
Telegram Telegram `yaml:"Telegram"`
|
Telegram Telegram `yaml:"Telegram"`
|
||||||
Log Log `yaml:"Log"`
|
Log Log `yaml:"Log"`
|
||||||
|
Currency Currency `yaml:"Currency"`
|
||||||
Administrator struct {
|
Administrator struct {
|
||||||
Email string `yaml:"Email" default:"admin@ppanel.dev"`
|
Email string `yaml:"Email" default:"admin@ppanel.dev"`
|
||||||
Password string `yaml:"Password" default:"password"`
|
Password string `yaml:"Password" default:"password"`
|
||||||
@ -241,3 +242,9 @@ type NodeDBConfig struct {
|
|||||||
Block string
|
Block string
|
||||||
Outbound string
|
Outbound string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type Currency struct {
|
||||||
|
Unit string `yaml:"Unit" default:"CNY"`
|
||||||
|
Symbol string `yaml:"Symbol" default:"USD"`
|
||||||
|
AccessKey string `yaml:"AccessKey" default:""`
|
||||||
|
}
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import (
|
|||||||
"github.com/perfect-panel/server/internal/model/log"
|
"github.com/perfect-panel/server/internal/model/log"
|
||||||
"github.com/perfect-panel/server/internal/report"
|
"github.com/perfect-panel/server/internal/report"
|
||||||
"github.com/perfect-panel/server/pkg/constant"
|
"github.com/perfect-panel/server/pkg/constant"
|
||||||
|
"github.com/perfect-panel/server/pkg/exchangeRate"
|
||||||
|
|
||||||
paymentPlatform "github.com/perfect-panel/server/pkg/payment"
|
paymentPlatform "github.com/perfect-panel/server/pkg/payment"
|
||||||
|
|
||||||
@ -21,12 +22,10 @@ import (
|
|||||||
"github.com/perfect-panel/server/internal/model/payment"
|
"github.com/perfect-panel/server/internal/model/payment"
|
||||||
"github.com/perfect-panel/server/internal/svc"
|
"github.com/perfect-panel/server/internal/svc"
|
||||||
"github.com/perfect-panel/server/internal/types"
|
"github.com/perfect-panel/server/internal/types"
|
||||||
"github.com/perfect-panel/server/pkg/exchangeRate"
|
|
||||||
"github.com/perfect-panel/server/pkg/logger"
|
"github.com/perfect-panel/server/pkg/logger"
|
||||||
"github.com/perfect-panel/server/pkg/payment/alipay"
|
"github.com/perfect-panel/server/pkg/payment/alipay"
|
||||||
"github.com/perfect-panel/server/pkg/payment/epay"
|
"github.com/perfect-panel/server/pkg/payment/epay"
|
||||||
"github.com/perfect-panel/server/pkg/payment/stripe"
|
"github.com/perfect-panel/server/pkg/payment/stripe"
|
||||||
"github.com/perfect-panel/server/pkg/tool"
|
|
||||||
"github.com/perfect-panel/server/pkg/xerr"
|
"github.com/perfect-panel/server/pkg/xerr"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
@ -261,6 +260,7 @@ func (l *PurchaseCheckoutLogic) stripePayment(config string, info *order.Order,
|
|||||||
// epayPayment processes EPay payment by generating a payment URL for redirect
|
// epayPayment processes EPay payment by generating a payment URL for redirect
|
||||||
// It handles currency conversion and creates a payment URL for external payment processing
|
// It handles currency conversion and creates a payment URL for external payment processing
|
||||||
func (l *PurchaseCheckoutLogic) epayPayment(config *payment.Payment, info *order.Order, returnUrl string) (string, error) {
|
func (l *PurchaseCheckoutLogic) epayPayment(config *payment.Payment, info *order.Order, returnUrl string) (string, error) {
|
||||||
|
var err error
|
||||||
// Parse EPay configuration from payment settings
|
// Parse EPay configuration from payment settings
|
||||||
epayConfig := &payment.EPayConfig{}
|
epayConfig := &payment.EPayConfig{}
|
||||||
if err := epayConfig.Unmarshal([]byte(config.Config)); err != nil {
|
if err := epayConfig.Unmarshal([]byte(config.Config)); err != nil {
|
||||||
@ -269,15 +269,18 @@ func (l *PurchaseCheckoutLogic) epayPayment(config *payment.Payment, info *order
|
|||||||
}
|
}
|
||||||
// Initialize EPay client with merchant credentials
|
// Initialize EPay client with merchant credentials
|
||||||
client := epay.NewClient(epayConfig.Pid, epayConfig.Url, epayConfig.Key, epayConfig.Type)
|
client := epay.NewClient(epayConfig.Pid, epayConfig.Url, epayConfig.Key, epayConfig.Type)
|
||||||
|
var amount float64
|
||||||
|
if l.svcCtx.Config.Currency.Unit != "CNY" {
|
||||||
// Convert order amount to CNY using current exchange rate
|
// Convert order amount to CNY using current exchange rate
|
||||||
amount, err := l.queryExchangeRate("CNY", info.Amount)
|
amount, err = l.queryExchangeRate("CNY", info.Amount)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
amount = float64(info.Amount) / float64(100)
|
||||||
|
}
|
||||||
|
|
||||||
// gateway mod
|
// gateway mod
|
||||||
|
|
||||||
isGatewayMod := report.IsGatewayMode()
|
isGatewayMod := report.IsGatewayMode()
|
||||||
|
|
||||||
// Build notification URL for payment status callbacks
|
// Build notification URL for payment status callbacks
|
||||||
@ -293,7 +296,6 @@ func (l *PurchaseCheckoutLogic) epayPayment(config *payment.Payment, info *order
|
|||||||
if !ok {
|
if !ok {
|
||||||
host = l.svcCtx.Config.Host
|
host = l.svcCtx.Config.Host
|
||||||
}
|
}
|
||||||
|
|
||||||
notifyUrl = "https://" + host
|
notifyUrl = "https://" + host
|
||||||
if isGatewayMod {
|
if isGatewayMod {
|
||||||
notifyUrl += "/api"
|
notifyUrl += "/api"
|
||||||
@ -316,6 +318,7 @@ func (l *PurchaseCheckoutLogic) epayPayment(config *payment.Payment, info *order
|
|||||||
// CryptoSaaSPayment processes CryptoSaaSPayment payment by generating a payment URL for redirect
|
// CryptoSaaSPayment processes CryptoSaaSPayment payment by generating a payment URL for redirect
|
||||||
// It handles currency conversion and creates a payment URL for external payment processing
|
// It handles currency conversion and creates a payment URL for external payment processing
|
||||||
func (l *PurchaseCheckoutLogic) CryptoSaaSPayment(config *payment.Payment, info *order.Order, returnUrl string) (string, error) {
|
func (l *PurchaseCheckoutLogic) CryptoSaaSPayment(config *payment.Payment, info *order.Order, returnUrl string) (string, error) {
|
||||||
|
var err error
|
||||||
// Parse EPay configuration from payment settings
|
// Parse EPay configuration from payment settings
|
||||||
epayConfig := &payment.CryptoSaaSConfig{}
|
epayConfig := &payment.CryptoSaaSConfig{}
|
||||||
if err := epayConfig.Unmarshal([]byte(config.Config)); err != nil {
|
if err := epayConfig.Unmarshal([]byte(config.Config)); err != nil {
|
||||||
@ -325,11 +328,17 @@ func (l *PurchaseCheckoutLogic) CryptoSaaSPayment(config *payment.Payment, info
|
|||||||
// Initialize EPay client with merchant credentials
|
// Initialize EPay client with merchant credentials
|
||||||
client := epay.NewClient(epayConfig.AccountID, epayConfig.Endpoint, epayConfig.SecretKey, epayConfig.Type)
|
client := epay.NewClient(epayConfig.AccountID, epayConfig.Endpoint, epayConfig.SecretKey, epayConfig.Type)
|
||||||
|
|
||||||
|
var amount float64
|
||||||
|
|
||||||
|
if l.svcCtx.Config.Currency.Unit != "CNY" {
|
||||||
// Convert order amount to CNY using current exchange rate
|
// Convert order amount to CNY using current exchange rate
|
||||||
amount, err := l.queryExchangeRate("CNY", info.Amount)
|
amount, err = l.queryExchangeRate("CNY", info.Amount)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
amount = float64(info.Amount) / float64(100)
|
||||||
|
}
|
||||||
|
|
||||||
// gateway mod
|
// gateway mod
|
||||||
isGatewayMod := report.IsGatewayMode()
|
isGatewayMod := report.IsGatewayMode()
|
||||||
@ -377,35 +386,18 @@ func (l *PurchaseCheckoutLogic) queryExchangeRate(to string, src int64) (amount
|
|||||||
return amount, nil
|
return amount, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Retrieve system currency configuration
|
|
||||||
currency, err := l.svcCtx.SystemModel.GetCurrencyConfig(l.ctx)
|
|
||||||
if err != nil {
|
|
||||||
l.Errorw("[PurchaseCheckout] GetCurrencyConfig error", logger.Field("error", err.Error()))
|
|
||||||
return 0, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "GetCurrencyConfig error: %s", err.Error())
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parse currency configuration
|
|
||||||
configs := struct {
|
|
||||||
CurrencyUnit string
|
|
||||||
CurrencySymbol string
|
|
||||||
AccessKey string
|
|
||||||
}{}
|
|
||||||
tool.SystemConfigSliceReflectToStruct(currency, &configs)
|
|
||||||
|
|
||||||
// Skip conversion if no exchange rate API key configured
|
// Skip conversion if no exchange rate API key configured
|
||||||
if configs.AccessKey == "" {
|
if l.svcCtx.Config.Currency.AccessKey == "" {
|
||||||
return amount, nil
|
return amount, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Convert currency if system currency differs from target currency
|
// Convert currency if system currency differs from target currency
|
||||||
if configs.CurrencyUnit != to {
|
result, err := exchangeRate.GetExchangeRete(l.svcCtx.Config.Currency.Unit, to, l.svcCtx.Config.Currency.AccessKey, 1)
|
||||||
result, err := exchangeRate.GetExchangeRete(configs.CurrencyUnit, to, configs.AccessKey, 1)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, err
|
return 0, err
|
||||||
}
|
}
|
||||||
amount = result * amount
|
l.svcCtx.ExchangeRate = result
|
||||||
}
|
return result * amount, nil
|
||||||
return amount, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// balancePayment processes balance payment with gift amount priority logic
|
// balancePayment processes balance payment with gift amount priority logic
|
||||||
|
|||||||
@ -97,7 +97,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
|
|||||||
Redis: rds,
|
Redis: rds,
|
||||||
Config: c,
|
Config: c,
|
||||||
Queue: NewAsynqClient(c),
|
Queue: NewAsynqClient(c),
|
||||||
ExchangeRate: 1.0,
|
ExchangeRate: 0,
|
||||||
GeoIP: geoIP,
|
GeoIP: geoIP,
|
||||||
//NodeCache: cache.NewNodeCacheClient(rds),
|
//NodeCache: cache.NewNodeCacheClient(rds),
|
||||||
AuthLimiter: authLimiter,
|
AuthLimiter: authLimiter,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user