csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix: 修复富友预下单报文格式错(1014) — XML根元素、小程序tradeType、termIP三处问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 6m27s
Details

Browse Source
This commit is contained in:
huang
2026-03-30 11:57:46 +08:00
parent f339fb1987
commit 0c82ae2b73
4 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/service/client_order/payment_provider.go
View File

@@ -46,14 +46,15 @@ func (w *wechatPaymentProvider) CreateJSAPIPayment(ctx context.Context, orderNo,
// fuiouPaymentProvider 富友支付适配器。
type fuiouPaymentProvider struct {
client *fuiou.Client
appID string
client *fuiou.Client
appID string
tradeType string
}
// CreateJSAPIPayment 创建富友 JSAPI 预下单。
func (f *fuiouPaymentProvider) CreateJSAPIPayment(ctx context.Context, orderNo, description, openID string, amount int) (*PaymentResult, error) {
amountStr := strconv.Itoa(amount)
resp, err := f.client.WxPreCreate(orderNo, amountStr, description, "", "JSAPI", f.appID, openID)
resp, err := f.client.WxPreCreate(orderNo, amountStr, description, "127.0.0.1", f.tradeType, f.appID, openID)
if err != nil {
return nil, errors.Wrap(errors.CodeFuiouPayFailed, err, "富友预下单失败")
}
@@ -69,9 +70,14 @@ func (f *fuiouPaymentProvider) CreateJSAPIPayment(ctx context.Context, orderNo,
}
// newPaymentProvider 根据支付配置创建支付提供者。
func (s *Service) newPaymentProvider(config *model.WechatConfig, appID string) (PaymentProvider, error) {
// appType: "official_account" 或 "miniapp"
func (s *Service) newPaymentProvider(config *model.WechatConfig, appID, appType string) (PaymentProvider, error) {
switch config.ProviderType {
case model.ProviderTypeFuiou:
tradeType := "JSAPI"
if appType == "miniapp" {
tradeType = "LETPAY"
}
client, err := fuiou.NewClient(
config.FyInsCd,
config.FyMchntCd,
@@ -85,7 +91,7 @@ func (s *Service) newPaymentProvider(config *model.WechatConfig, appID string) (
if err != nil {
return nil, errors.Wrap(errors.CodeFuiouPayFailed, err, "创建富友客户端失败")
}
return &fuiouPaymentProvider{client: client, appID: appID}, nil
return &fuiouPaymentProvider{client: client, appID: appID, tradeType: tradeType}, nil
default:
cache := wechat.NewRedisCache(s.redis)
paymentApp, err := wechat.NewPaymentAppFromConfig(config, appID, cache, s.logger)

2
internal/service/client_order/service.go
View File

@@ -174,7 +174,7 @@ func (s *Service) CreateOrder(ctx context.Context, customerID uint, req *dto.Cli
}
}()
paymentProvider, err := s.newPaymentProvider(activeConfig, appID)
paymentProvider, err := s.newPaymentProvider(activeConfig, appID, req.AppType)
if err != nil {
return nil, err
}