lanhu/platform
2
0
Fork 0
Code Issues Actions Packages Releases 12 Activity

完善商福通支付接口，修复证书加载问题；数据库扩展支付平台字段并更新支付信息保存逻辑；日志中间件异步记录日志

Browse Source
This commit is contained in:
luorijun
2025-06-17 10:53:05 +08:00
parent 692106ae5c
commit a4e5fc2af5
19 changed files with 444 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

398
web/services/trade.go
View File

@@ -9,6 +9,7 @@ import (
"net/http"
"platform/pkg/env"
"platform/pkg/u"
"platform/web/core"
bill2 "platform/web/domains/bill"
coupon2 "platform/web/domains/coupon"
trade2 "platform/web/domains/trade"
@@ -29,11 +30,12 @@ var Trade = &tradeService{}
type tradeService struct {
}
func (s *tradeService) SendCreateTradeByQrcode(q *q.Query, uid int32, now time.Time, data *TradeCreateData) (*TradeCreateResult, error) {
func (s *tradeService) CreateTrade(q *q.Query, uid int32, now time.Time, data *TradeCreateData) (*TradeCreateResult, error) {
var subject = data.Subject
var expire = data.ExpireAt
var tType = data.Type
var method = data.Method
var platform = data.Platform
var amount = data.Amount
// 实际支付金额，只在创建真实订单时使用
@@ -103,11 +105,10 @@ func (s *tradeService) SendCreateTradeByQrcode(q *q.Query, uid int32, now time.T
// 创建支付订单
var payUrl string
var acquirer trade2.Acquirer
switch method {
switch {
// 调用支付宝支付接口
case trade2.MethodAlipay:
// 支付宝 + 电脑网站
case method == trade2.MethodAlipay && platform == trade2.PlatformDesktop:
resp, err := g.Alipay.TradePagePay(alipay.TradePagePay{
QRPayMode: "4",
QRCodeWidth: "196", // 二维码宽度需要-4，支付宝页面布局有问题
@@ -123,10 +124,9 @@ func (s *tradeService) SendCreateTradeByQrcode(q *q.Query, uid int32, now time.T
return nil, err
}
payUrl = resp.String()
acquirer = trade2.AcquirerAlipay
// 调用微信支付接口
case trade2.MethodWeChat:
// 微信 + 电脑网站
case method == trade2.MethodWeChat && platform == trade2.PlatformDesktop:
resp, _, err := g.WechatPay.Native.Prepay(context.Background(), native.PrepayRequest{
Appid: &env.WechatPayAppId,
Mchid: &env.WechatPayMchId,
@@ -142,10 +142,9 @@ func (s *tradeService) SendCreateTradeByQrcode(q *q.Query, uid int32, now time.T
return nil, err
}
payUrl = *resp.CodeUrl
acquirer = trade2.AcquirerWeChat
// 调用商福通接口
case trade2.MethodSft:
// 商福通 + 电脑网站
case method == trade2.MethodSft && platform == trade2.PlatformDesktop:
resp, err := g.SFTPay.PaymentScanPay(&g.PaymentScanPayReq{
MchOrderNo: tradeNo,
Subject: subject,
@@ -159,155 +158,9 @@ func (s *tradeService) SendCreateTradeByQrcode(q *q.Query, uid int32, now time.T
return nil, err
}
payUrl = u.Z(u.Z(resp.PayInfo).QrCodeUrl)
if payUrl == "" {
return nil, errors.New("支付接口未返回正确的二维码地址")
}
switch resp.PayType {
case g.SftAlipay:
acquirer = trade2.AcquirerAlipay
case g.SftWeChat:
acquirer = trade2.AcquirerWeChat
case g.SftUnionPay:
acquirer = trade2.AcquirerUnionPay
}
// 不支持的支付方式
default:
return nil, ErrTransactionNotSupported
}
// 保存交易订单
var billType bill2.Type
switch tType {
case trade2.TypeRecharge:
billType = bill2.TypeRecharge
case trade2.TypePurchase:
billType = bill2.TypeConsume
}
var trade = m.Trade{
UserID: uid,
InnerNo: tradeNo,
Subject: subject,
Method: int32(method),
Type: int32(tType),
Amount: amount,
PayURL: &payUrl,
Acquirer: int32(acquirer),
}
err = q.Trade.Create(&trade)
if err != nil {
return nil, err
}
// 保存用户帐单
var bill = m.Bill{
BillNo: ID.GenReadable("bil"),
UserID: uid,
TradeID: &trade.ID,
Info: &subject,
Type: int32(billType),
Amount: amount,
}
err = q.Bill.
Omit(q.Bill.ResourceID, q.Bill.RefundID).
Create(&bill)
if err != nil {
return nil, err
}
// 提交异步任务更新订单状态
_, err = g.Asynq.Enqueue(tasks.NewUpdateTrade(tradeNo, method))
if err != nil {
return nil, err
}
return &TradeCreateResult{
TradeNo: tradeNo,
PayURL: payUrl,
Bill: &bill,
Trade: &trade,
}, nil
}
func (s *tradeService) SendCreateTradeByRedirect(q *q.Query, uid int32, now time.Time, data *TradeCreateData) (*TradeCreateResult, error) {
var subject = data.Subject
var expire = data.ExpireAt
var tType = data.Type
var method = data.Method
var amount = data.Amount
// 实际支付金额，只在创建真实订单时使用
var amountReal = data.Amount
if env.RunMode == "debug" {
amountReal = decimal.NewFromFloat(0.01)
}
// 附加优惠券
if data.CouponCode != "" {
coupon, err := q.Coupon.
Where(
q.Coupon.Code.Eq(data.CouponCode),
q.Coupon.Status.Eq(int32(coupon2.StatusUnused)),
).
Take()
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, errors.New("优惠券不存在或已失效")
}
return nil, err
}
var expireAt = time.Time(u.Z(coupon.ExpireAt))
if !expireAt.IsZero() && expireAt.Before(now) {
_, err = q.Coupon.
Where(q.Coupon.ID.Eq(coupon.ID)).
Update(q.Coupon.Status, coupon2.StatusExpired)
if err != nil {
return nil, err
}
return nil, errors.New("优惠券已过期")
}
if amount.Cmp(coupon.MinAmount) < 0 {
return nil, errors.New("订单金额未达到使用优惠券的条件")
}
if coupon.UserID != nil {
switch *coupon.UserID {
// 指定用户的优惠券
case uid:
amount = amount.Sub(coupon.Amount)
if expireAt.IsZero() {
_, err = q.Coupon.
Where(q.Coupon.ID.Eq(coupon.ID)).
Update(q.Coupon.Status, int32(coupon2.StatusUsed))
if err != nil {
return nil, err
}
}
// 该优惠券不属于当前用户
default:
return nil, errors.New("优惠券不属于当前用户")
}
} else {
// 公开优惠券
amount = amount.Sub(coupon.Amount)
}
}
// 生成订单号
tradeNo, err := ID.GenSerial(context.Background())
if err != nil {
return nil, err
}
// 创建支付订单
var payUrl string
var acquirer trade2.Acquirer
switch method {
// 调用商福通接口
case trade2.MethodSftAlipay, trade2.MethodSftWeChat:
// 商福通 + 手机网站
case (method == trade2.MethodSftAlipay || method == trade2.MethodSftWeChat) && platform == trade2.PlatformMobile:
var payType g.SftPayType
if method == trade2.MethodSftAlipay {
payType = g.SftAlipay
@@ -328,24 +181,31 @@ func (s *tradeService) SendCreateTradeByRedirect(q *q.Query, uid int32, now time
return nil, err
}
payUrl = u.Z(u.Z(resp.PayInfo).PayUrl)
if payUrl == "" {
return nil, errors.New("支付接口未返回正确的二维码地址")
}
switch resp.PayType {
case g.SftAlipay:
acquirer = trade2.AcquirerAlipay
case g.SftWeChat:
acquirer = trade2.AcquirerWeChat
case g.SftUnionPay:
acquirer = trade2.AcquirerUnionPay
}
// 不支持的支付方式
default:
slog.Warn(ErrTransactionNotSupported.Error(), "method", method, "platform", platform)
return nil, ErrTransactionNotSupported
}
// 保存交易订单
var trade = m.Trade{
UserID: uid,
InnerNo: tradeNo,
Subject: subject,
Type: int32(tType),
Method: int32(method),
Platform: int32(platform),
Amount: amount,
PayURL: &payUrl,
}
err = q.Trade.Create(&trade)
if err != nil {
return nil, err
}
// 保存用户帐单
var billType bill2.Type
switch tType {
case trade2.TypeRecharge:
@@ -354,22 +214,6 @@ func (s *tradeService) SendCreateTradeByRedirect(q *q.Query, uid int32, now time
billType = bill2.TypeConsume
}
var trade = m.Trade{
UserID: uid,
InnerNo: tradeNo,
Subject: subject,
Method: int32(method),
Type: int32(tType),
Amount: amount,
PayURL: &payUrl,
Acquirer: int32(acquirer),
}
err = q.Trade.Create(&trade)
if err != nil {
return nil, err
}
// 保存用户帐单
var bill = m.Bill{
BillNo: ID.GenReadable("bil"),
UserID: uid,
@@ -378,6 +222,7 @@ func (s *tradeService) SendCreateTradeByRedirect(q *q.Query, uid int32, now time
Type: int32(billType),
Amount: amount,
}
err = q.Bill.
Omit(q.Bill.ResourceID, q.Bill.RefundID).
Create(&bill)
@@ -398,78 +243,12 @@ func (s *tradeService) SendCreateTradeByRedirect(q *q.Query, uid int32, now time
Trade: &trade,
}, nil
}
func (s *tradeService) VerifyCreateTrade(data *TradeVerifyData) (*TradeSuccessResult, error) {
var tradeNo = data.TradeNo
var method = data.Method
// 检查交易号是否存在
var transId string
var paidAt time.Time
var payment decimal.Decimal
switch method {
// 检查支付宝交易
case trade2.MethodAlipay:
resp, err := g.Alipay.TradeQuery(context.Background(), alipay.TradeQuery{
OutTradeNo: tradeNo,
})
if err != nil {
return nil, err
}
if resp.Code != alipay.CodeSuccess {
slog.Warn("支付宝交易查询失败", "code", resp.Code, "sub_code", resp.SubCode, "msg", resp.Msg)
return nil, errors.New("交易查询失败")
}
if resp.TradeStatus != alipay.TradeStatusSuccess {
return nil, ErrTransactionNotPaid
}
transId = resp.TradeNo
payment, err = decimal.NewFromString(resp.TotalAmount)
if err != nil {
return nil, err
}
paidAt, err = time.Parse("2006-01-02 15:04:05", resp.SendPayDate)
if err != nil {
return nil, err
}
// 检查微信交易
case trade2.MethodWeChat:
resp, _, err := g.WechatPay.Native.QueryOrderByOutTradeNo(context.Background(), native.QueryOrderByOutTradeNoRequest{
OutTradeNo: &tradeNo,
Mchid: &env.WechatPayMchId,
})
if err != nil {
return nil, err
}
if *resp.TradeState != "SUCCESS" {
return nil, ErrTransactionNotPaid
}
transId = *resp.TransactionId
payment = decimal.NewFromInt(*resp.Amount.PayerTotal).Div(decimal.NewFromInt(100))
paidAt, err = time.Parse(time.RFC3339, *resp.SuccessTime)
if err != nil {
return nil, err
}
// 不支持的支付方式
default:
return nil, ErrTransactionNotSupported
}
return &TradeSuccessResult{
TransId: transId,
Payment: payment,
Time: paidAt,
}, nil
}
func (s *tradeService) OnTradeCreated(q *q.Query, data *OnTradeCreateData) (*m.Trade, error) {
var transId = data.TransId
var tradeNo = data.TradeNo
var payment = data.Payment
var paidAt = data.Time
var acquirer = data.Acquirer
// 获取交易信息
trade, err := q.Trade.
@@ -491,6 +270,7 @@ func (s *tradeService) OnTradeCreated(q *q.Query, data *OnTradeCreateData) (*m.T
trade.Status = int32(trade2.StatusSuccess)
trade.OuterNo = &transId
trade.Payment = payment
trade.Acquirer = int32(acquirer)
trade.PaidAt = u.P(orm.LocalDateTime(paidAt))
trade.PayURL = u.P("")
_, err = q.Trade.Updates(trade)
@@ -574,12 +354,106 @@ func (s *tradeService) OnTradeRefunded(q *q.Query, tradeNo string, now time.Time
panic("todo")
}
func (s *tradeService) VerifyTrade(data *TradeVerifyData) (*TradeSuccessResult, error) {
var tradeNo = data.TradeNo
var method = data.Method
// 检查交易号是否存在
var transId string
var paidAt time.Time
var payment decimal.Decimal
switch method {
// 检查支付宝交易
case trade2.MethodAlipay:
resp, err := g.Alipay.TradeQuery(context.Background(), alipay.TradeQuery{
OutTradeNo: tradeNo,
})
if err != nil {
return nil, err
}
if resp.Code != alipay.CodeSuccess {
slog.Warn("支付宝交易查询失败", "code", resp.Code, "sub_code", resp.SubCode, "msg", resp.Msg)
return nil, errors.New("交易查询失败")
}
if resp.TradeStatus != alipay.TradeStatusSuccess {
return nil, ErrTransactionNotPaid
}
transId = resp.TradeNo
payment, err = decimal.NewFromString(resp.TotalAmount)
if err != nil {
return nil, err
}
paidAt, err = time.Parse("2006-01-02 15:04:05", resp.SendPayDate)
if err != nil {
return nil, err
}
// 检查微信交易
case trade2.MethodWeChat:
resp, _, err := g.WechatPay.Native.QueryOrderByOutTradeNo(context.Background(), native.QueryOrderByOutTradeNoRequest{
OutTradeNo: &tradeNo,
Mchid: &env.WechatPayMchId,
})
if err != nil {
return nil, err
}
if *resp.TradeState != "SUCCESS" {
return nil, ErrTransactionNotPaid
}
transId = *resp.TransactionId
payment = decimal.NewFromInt(*resp.Amount.PayerTotal).Div(decimal.NewFromInt(100))
paidAt, err = time.Parse(time.RFC3339, *resp.SuccessTime)
if err != nil {
return nil, err
}
// 检查商福通交易
case trade2.MethodSft, trade2.MethodSftAlipay, trade2.MethodSftWeChat:
resp, err := g.SFTPay.QueryTrade(&g.QueryTradeReq{
MchOrderNo: &tradeNo,
})
if err != nil {
return nil, err
}
if resp.State != g.SftTradeSuccess {
return nil, ErrTransactionNotPaid
}
if resp.PayOrderId == nil {
return nil, errors.New("商福通交易号不存在")
}
if resp.PayTime == nil {
return nil, errors.New("商福通交易时间不存在")
}
transId = *resp.PayOrderId
payment = decimal.NewFromInt(resp.Amount).Div(decimal.NewFromInt(100))
paidAt, err = time.Parse("2006-01-02 15:04:05", *resp.PayTime)
if err != nil {
return nil, err
}
// 不支持的支付方式
default:
return nil, ErrTransactionNotSupported
}
return &TradeSuccessResult{
TransId: transId,
Payment: payment,
Time: paidAt,
}, nil
}
type TradeCreateData struct {
Subject string
Amount decimal.Decimal
ExpireAt time.Time
Type trade2.Type
Method trade2.Method
Platform trade2.Platform
CouponCode string
}
@@ -596,9 +470,10 @@ type TradeVerifyData struct {
}
type TradeSuccessResult struct {
TransId string
Payment decimal.Decimal
Time time.Time
TransId string
Payment decimal.Decimal
Time time.Time
Acquirer trade2.Acquirer
}
type OnTradeCreateData struct {
@@ -606,13 +481,6 @@ type OnTradeCreateData struct {
TradeSuccessResult
}
type TradePlatform int
const (
TradePlatformDesktop TradePlatform = iota + 1 // 桌面端
TradePlatformMobile // 移动端
)
type TradeErr string
func (e TradeErr) Error() string {
@@ -620,6 +488,6 @@ func (e TradeErr) Error() string {
}
var (
ErrTransactionNotPaid = TradeErr("交易未支付")
ErrTransactionNotSupported = TradeErr("不支持的支付方式")
ErrTransactionNotPaid = core.NewBizErr("交易未支付")
ErrTransactionNotSupported = core.NewBizErr("不支持的支付方式")
)