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

重构支付接口，以动态支持多种产品类型，整合长短效套餐的购买支付逻辑；引入 decimal 类型的金额计算；

Browse Source
This commit is contained in:
luorijun
2025-05-20 17:14:07 +08:00
parent 689964e3ef
commit 6f1bc72912
45 changed files with 891 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
web/services/channel.go
View File

@@ -305,28 +305,33 @@ func findResource(q *q.Query, resourceId int32, userId int32, count int, now tim
return nil, ErrResourceInvalid
}
// 检查每日限额
used := 0
if now.Format("2006-01-02") == info.DailyLast.Format("2006-01-02") {
used = int(info.DailyUsed)
}
excess := used+count > int(info.DailyLimit)
if excess {
return nil, ErrResourceDailyLimit
}
// 检查时间或配额
// 检查套餐使用情况
switch info.Mode {
default:
return nil, ChannelServiceErr("不支持的套餐模式")
// 包时
case resource2.ModeTime:
// 检查过期时间
if info.Expire.Before(now) {
return nil, ErrResourceExpired
}
// 检查每日限额
used := 0
if now.Format("2006-01-02") == info.DailyLast.Format("2006-01-02") {
used = int(info.DailyUsed)
}
excess := used+count > int(info.DailyLimit)
if excess {
return nil, ErrResourceDailyLimit
}
// 包量
case resource2.ModeCount:
// 检查可用配额
if int(info.Quota)-int(info.Used) < count {
return nil, ErrResourceExhausted
}
default:
return nil, ChannelServiceErr("不支持的套餐模式")
}
return info, nil

455
web/services/resource.go
View File

@@ -5,6 +5,8 @@ import (
"database/sql"
"encoding/json"
"fmt"
"github.com/gofiber/fiber/v2"
"github.com/shopspring/decimal"
bill2 "platform/web/domains/bill"
resource2 "platform/web/domains/resource"
trade2 "platform/web/domains/trade"
@@ -12,27 +14,97 @@ import (
"platform/web/globals/orm"
m "platform/web/models"
q "platform/web/queries"
"strings"
"time"
"github.com/gofiber/fiber/v2"
)
var Resource = &resourceService{}
type resourceService struct{}
func (s *resourceService) PrepareResource(ctx context.Context, data *CreateResourceData, uid int32, method trade2.Method) (*TransactionPrepareResult, error) {
func (s *resourceService) CreateResource(uid int32, now time.Time, ser *CreateResourceSerializer) error {
data, err := ser.ToData()
if err != nil {
return err
}
var name = data.GetName()
var amount = data.GetPrice()
// 保存交易信息
err = q.Q.Transaction(func(q *q.Query) error {
// 检查用户
user, err := q.User.
Where(q.User.ID.Eq(uid)).
Take()
if err != nil {
return err
}
// 检查余额
if user.Balance.Cmp(amount) < 0 {
return fiber.NewError(fiber.StatusBadRequest, "余额不足")
}
// 保存套餐
resource, err := createResource(q, uid, now, data)
if err != nil {
return err
}
// 生成账单
bill := m.Bill{
UserID: uid,
ResourceID: resource.ID,
BillNo: ID.GenReadable("bil"),
Info: "购买套餐 - " + name,
Type: int32(bill2.TypeConsume),
Amount: amount,
}
err = q.Bill.
Omit(q.Bill.TradeID, q.Bill.RefundID).
Create(&bill)
if err != nil {
return err
}
// 更新用户余额
_, err = q.User.UpdateSimple(q.User.Balance.Value(user.Balance.Sub(amount)))
if err != nil {
return err
}
if err != nil {
return err
}
return nil
}, &sql.TxOptions{Isolation: sql.LevelRepeatableRead})
if err != nil {
return err
}
return nil
}
func (s *resourceService) PrepareResource(uid int32, now time.Time, method trade2.Method, ser *CreateResourceSerializer) (*TransactionPrepareResult, error) {
data, err := ser.ToData()
if err != nil {
return nil, err
}
name := data.GetName()
amount := data.GetPrice()
// 保存到数据库
var result *TransactionPrepareResult
err := q.Q.Transaction(func(q *q.Query) error {
err = q.Q.Transaction(func(q *q.Query) error {
var err error
// 生成交易订单
result, err = Transaction.PrepareTransaction(ctx, q, uid, &TransactionPrepareData{
Subject: "购买套餐 - " + data.GetName(),
result, err = Transaction.PrepareTransaction(q, uid, now, &TransactionPrepareData{
Subject: "购买套餐 - " + name,
Amount: amount,
ExpireAt: time.Now().Add(30 * time.Minute),
Type: trade2.TypeRecharge,
@@ -43,16 +115,18 @@ func (s *resourceService) PrepareResource(ctx context.Context, data *CreateResou
}
// 保存请求缓存
reqStr, err := json.Marshal(&CreateResourceCache{
CreateResourceData: *data,
Uid: uid,
TradeId: result.Trade.ID,
BillId: result.Bill.ID,
})
if err != nil {
resourceSerializer := CreateResourceSerializer{}
if err := resourceSerializer.ByData(data); err != nil {
return err
}
err = g.Redis.Set(ctx, result.TradeNo, reqStr, 30*time.Minute).Err()
err = g.Redis.Set(context.Background(), result.TradeNo, &CreateResourceCache{
Uid: uid,
TradeId: result.Trade.ID,
BillId: result.Bill.ID,
Method: method,
CreateResourceSerializer: resourceSerializer,
}, 30*time.Minute).Err()
if err != nil {
return err
}
@@ -66,10 +140,10 @@ func (s *resourceService) PrepareResource(ctx context.Context, data *CreateResou
return result, nil
}
func (s *resourceService) CompleteResource(ctx context.Context, tradeNo string, rs *TransactionVerifyResult) error {
func (s *resourceService) CompleteResource(tradeNo string, now time.Time, opResult ...*TransactionVerifyResult) error {
// 获取请求缓存
reqStr, err := g.Redis.Get(ctx, tradeNo).Result()
reqStr, err := g.Redis.Get(context.Background(), tradeNo).Result()
if err != nil {
return err
}
@@ -78,11 +152,31 @@ func (s *resourceService) CompleteResource(ctx context.Context, tradeNo string,
return err
}
// 检查交易结果
var rs *TransactionVerifyResult
if len(opResult) > 0 {
rs = opResult[0]
} else {
var err error
rs, err = Transaction.VerifyTransaction(&TransactionVerifyData{
TradeNo: tradeNo,
Method: cache.Method,
})
if err != nil {
return err
}
}
data, err := cache.ToData()
if err != nil {
return err
}
// 保存交易信息
err = q.Q.Transaction(func(q *q.Query) error {
// 保存套餐
resource, err := createResource(q, &cache.CreateResourceData, cache.Uid)
resource, err := createResource(q, cache.Uid, now, data)
if err != nil {
return err
}
@@ -99,7 +193,7 @@ func (s *resourceService) CompleteResource(ctx context.Context, tradeNo string,
}
// 完成交易
_, err = Transaction.CompleteTransaction(ctx, q, &TransactionCompleteData{
_, err = Transaction.CompleteTransaction(q, &TransactionCompleteData{
TradeNo: tradeNo,
TransactionVerifyResult: *rs,
})
@@ -108,7 +202,7 @@ func (s *resourceService) CompleteResource(ctx context.Context, tradeNo string,
}
// 删除缓存
err = g.Redis.Del(ctx, tradeNo).Err()
err = g.Redis.Del(context.Background(), tradeNo).Err()
if err != nil {
return err
}
@@ -122,57 +216,27 @@ func (s *resourceService) CompleteResource(ctx context.Context, tradeNo string,
return nil
}
func (s *resourceService) CreateResource(data *CreateResourceData, uid int32) error {
func (s *resourceService) CancelResource(tradeNo string, now time.Time, opRevoked ...bool) error {
// 删除请求缓存
cacheStr, err := g.Redis.GetDel(context.Background(), tradeNo).Result()
if err != nil {
return err
}
cache := new(CreateResourceCache)
if err := json.Unmarshal([]byte(cacheStr), cache); err != nil {
return err
}
// 保存交易信息
err := q.Q.Transaction(func(q *q.Query) error {
amount := data.GetPrice()
// 检查用户
user, err := q.User.
Where(q.User.ID.Eq(uid)).
Take()
// 取消交易
if len(opRevoked) <= 0 {
err = Transaction.RevokeTransaction(tradeNo, cache.Method)
if err != nil {
return err
}
}
// 检查余额
if user.Balance < amount {
return fiber.NewError(fiber.StatusBadRequest, "余额不足")
}
// 保存套餐
resource, err := createResource(q, data, uid)
if err != nil {
return err
}
// 生成账单
bill := m.Bill{
UserID: uid,
ResourceID: resource.ID,
BillNo: ID.GenReadable("bil"),
Info: "购买套餐 - " + data.GetName(),
Type: int32(bill2.TypeConsume),
Amount: data.GetPrice(),
}
err = q.Bill.
Omit(q.Bill.TradeID, q.Bill.RefundID).
Create(&bill)
if err != nil {
return err
}
// 更新用户余额
_, err = q.User.
Where(q.User.ID.Eq(uid)).
UpdateSimple(q.User.Balance.Sub(amount))
if err != nil {
return err
}
return nil
}, &sql.TxOptions{Isolation: sql.LevelRepeatableRead})
// 更新订单状态
err = Transaction.FinishTransaction(q.Q, tradeNo, now)
if err != nil {
return err
}
@@ -180,81 +244,44 @@ func (s *resourceService) CreateResource(data *CreateResourceData, uid int32) er
return nil
}
type CreateResourceData struct {
Type int32 `json:"type" validate:"required"`
Live int32 `json:"live" validate:"required"`
Expire int32 `json:"expire" validate:"required"`
Quota int32 `json:"quota" validate:"required"`
DailyLimit int32 `json:"daily_limit" validate:"required"`
func createResource(q *q.Query, uid int32, now time.Time, data CreateResourceData) (*m.Resource, error) {
name string
price float64
}
func (data *CreateResourceData) GetName() string {
if data.name == "" {
sb := strings.Builder{}
sb.WriteString("短效动态")
switch data.Type {
case 1:
sb.WriteString("包时 ")
case 2:
sb.WriteString("包量 ")
}
sb.WriteString(fmt.Sprintf("%d 分钟", data.Live/60))
data.name = sb.String()
}
return data.name
}
func (data *CreateResourceData) GetPrice() float64 {
if data.price == 0 {
var count int
switch data.Type {
case 1:
count = int(data.DailyLimit)
case 2:
count = int(data.Quota)
}
seconds := int(data.Live)
if seconds == 180 {
seconds = 150
}
times := int(data.Expire)
if data.Type == 2 {
times = 1
}
data.price = float64(count*seconds*times) / 30000
}
return data.price
}
type CreateResourceCache struct {
CreateResourceData `json:"data"`
Uid int32 `json:"uid"`
TradeId int32 `json:"trade_id"`
BillId int32 `json:"bill_id"`
}
func createResource(q *q.Query, data *CreateResourceData, uid int32) (*m.Resource, error) {
// 创建套餐
resource := m.Resource{
// 套餐基本信息
var resource = m.Resource{
UserID: uid,
ResourceNo: ID.GenReadable("res"),
Active: true,
Type: int32(resource2.TypeShort),
Short: &m.ResourceShort{
Type: data.Type,
}
switch data := data.(type) {
// 短效套餐
case *CreateShortResourceData:
var duration = time.Duration(data.Expire) * 24 * time.Hour
resource.Type = int32(resource2.TypeShort)
resource.Short = &m.ResourceShort{
Type: data.Mode,
Live: data.Live,
Quota: data.Quota,
Expire: orm.LocalDateTime(time.Now().Add(time.Duration(data.Expire) * 24 * time.Hour)),
Expire: orm.LocalDateTime(now.Add(duration)),
DailyLimit: data.DailyLimit,
},
}
// 长效套餐
case *CreateLongResourceData:
var duration = time.Duration(data.Expire) * 24 * time.Hour
resource.Type = int32(resource2.TypeLong)
resource.Long = &m.ResourceLong{
Type: data.Mode,
Live: data.Live,
Quota: data.Quota,
Expire: orm.LocalDateTime(now.Add(duration)),
DailyLimit: data.DailyLimit,
}
default:
return nil, fmt.Errorf("不支持的套餐类型")
}
err := q.Resource.Create(&resource)
if err != nil {
return nil, err
@@ -263,24 +290,154 @@ func createResource(q *q.Query, data *CreateResourceData, uid int32) (*m.Resourc
return &resource, nil
}
func (s *resourceService) CancelResource(ctx context.Context, tradeNo string, at time.Time, method trade2.Method) error {
// 删除请求缓存
_, err := g.Redis.Del(ctx, tradeNo).Result()
if err != nil {
return err
}
type CreateResourceData interface {
GetName() string
GetPrice() decimal.Decimal
}
// 取消交易
err = Transaction.RevokeTransaction(ctx, tradeNo, method)
if err != nil {
return err
}
type CreateShortResourceData struct {
Live int32 `json:"live" validate:"required min=180"`
Mode int32 `json:"mode" validate:"required"`
Expire int32 `json:"expire"`
DailyLimit int32 `json:"daily_limit" validate:"min=2000"`
Quota int32 `json:"quota" validate:"min=10000"`
// 更新订单状态
err = Transaction.FinishTransaction(ctx, q.Q, tradeNo, at)
if err != nil {
return err
}
name string
price *decimal.Decimal
}
func (data *CreateShortResourceData) GetName() string {
if data.name == "" {
var mode string
switch data.Mode {
case 1:
mode = "包时"
case 2:
mode = "包量"
}
data.name = fmt.Sprintf("短效动态%s %d 天", mode, data.Live)
}
return data.name
}
func (data *CreateShortResourceData) GetPrice() decimal.Decimal {
if data.price == nil {
var factor int32
switch data.Mode {
case 1:
factor = data.DailyLimit * data.Expire
case 2:
factor = data.Quota
}
var base = data.Live
if base == 180 {
base = 150
}
var dec = decimal.Decimal{}.
Add(decimal.NewFromInt32(base * factor)).
Div(decimal.NewFromInt(30000))
data.price = &dec
}
return *data.price
}
type CreateLongResourceData struct {
Live int32 `json:"live" validate:"required oneof=1,4,8,12,24"`
Mode int32 `json:"mode" validate:"required oneof=1,2"`
Expire int32 `json:"expire"`
DailyLimit int32 `json:"daily_limit" validate:"min=100"`
Quota int32 `json:"quota" validate:"min=500"`
name string
price *decimal.Decimal
}
func (data *CreateLongResourceData) GetName() string {
if data.name == "" {
var mode string
switch data.Mode {
case 1:
mode = "包时"
case 2:
mode = "包量"
}
data.name = fmt.Sprintf("长效动态%s %d 天", mode, data.Live)
}
return data.name
}
func (data *CreateLongResourceData) GetPrice() decimal.Decimal {
if data.price == nil {
var factor int32 = 0
switch resource2.Mode(data.Mode) {
case resource2.ModeTime:
factor = data.Expire * data.DailyLimit
case resource2.ModeCount:
factor = data.Quota
}
var base int32
switch data.Live {
case 1:
base = 30
case 4:
base = 80
case 8:
base = 120
case 12:
base = 180
case 24:
base = 350
}
// data.price = big.NewRat(int64(base*factor), 100)
var dec = decimal.Decimal{}.
Add(decimal.NewFromInt32(base * factor)).
Div(decimal.NewFromInt(100))
data.price = &dec
}
return *data.price
}
type CreateResourceCache struct {
Uid int32 `json:"uid"`
TradeId int32 `json:"trade_id"`
BillId int32 `json:"bill_id"`
Method trade2.Method `json:"method"`
CreateResourceSerializer
}
type CreateResourceSerializer struct {
Type resource2.Type `json:"type" validate:"required"`
Short *CreateShortResourceData `json:"short,omitempty"`
Long *CreateLongResourceData `json:"long,omitempty"`
}
func (s *CreateResourceSerializer) ToData() (CreateResourceData, error) {
switch s.Type {
case resource2.TypeShort:
return s.Short, nil
case resource2.TypeLong:
return s.Long, nil
}
return nil, fmt.Errorf("不支持的套餐类型")
}
func (s *CreateResourceSerializer) ByData(data CreateResourceData) error {
switch data := data.(type) {
case *CreateShortResourceData:
s.Type = resource2.TypeShort
s.Short = data
case *CreateLongResourceData:
s.Type = resource2.TypeLong
s.Long = data
default:
return fmt.Errorf("不支持的套餐类型")
}
return nil
}

83
web/services/transaction.go
View File

@@ -3,6 +3,7 @@ package services
import (
"context"
"errors"
"github.com/shopspring/decimal"
"io"
"log/slog"
"net/http"
@@ -15,7 +16,6 @@ import (
"platform/web/globals/orm"
m "platform/web/models"
q "platform/web/queries"
"strconv"
"time"
"github.com/smartwalle/alipay/v3"
@@ -28,7 +28,7 @@ var Transaction = &transactionService{}
type transactionService struct {
}
func (s *transactionService) PrepareTransaction(ctx context.Context, q *q.Query, uid int32, data *TransactionPrepareData) (*TransactionPrepareResult, error) {
func (s *transactionService) PrepareTransaction(q *q.Query, uid int32, now time.Time, data *TransactionPrepareData) (*TransactionPrepareResult, error) {
var subject = data.Subject
var expire = data.ExpireAt
var tType = data.Type
@@ -38,12 +38,12 @@ func (s *transactionService) PrepareTransaction(ctx context.Context, q *q.Query,
// 实际支付金额，只在创建真实订单时使用
var amountReal = data.Amount
if env.RunMode == "debug" {
amountReal = 0.01
amountReal = decimal.NewFromFloat(0.01)
}
// 附加优惠券
if data.CouponCode != "" {
coupon, err := q.Coupon.WithContext(ctx).
coupon, err := q.Coupon.
Where(
q.Coupon.Code.Eq(data.CouponCode),
q.Coupon.Status.Eq(int32(coupon2.StatusUnused)),
@@ -57,7 +57,7 @@ func (s *transactionService) PrepareTransaction(ctx context.Context, q *q.Query,
}
var expireAt = time.Time(coupon.ExpireAt)
if !expireAt.IsZero() && expireAt.Before(time.Now()) {
if !expireAt.IsZero() && expireAt.Before(now) {
_, err = q.Coupon.
Where(q.Coupon.ID.Eq(coupon.ID)).
Update(q.Coupon.Status, coupon2.StatusExpired)
@@ -67,7 +67,7 @@ func (s *transactionService) PrepareTransaction(ctx context.Context, q *q.Query,
return nil, errors.New("优惠券已过期")
}
if data.Amount < coupon.MinAmount {
if amount.Cmp(coupon.MinAmount) < 0 {
return nil, errors.New("订单金额未达到使用优惠券的条件")
}
@@ -78,11 +78,11 @@ func (s *transactionService) PrepareTransaction(ctx context.Context, q *q.Query,
// 公开优惠券
case coupon.UserID == 0:
amount = amount - coupon.Amount
amount = amount.Sub(coupon.Amount)
// 指定用户的优惠券
case coupon.UserID == uid:
amount = amount - coupon.Amount
amount = amount.Sub(coupon.Amount)
if time.Time(coupon.ExpireAt).IsZero() {
_, err = q.Coupon.
Where(q.Coupon.ID.Eq(coupon.ID)).
@@ -95,7 +95,7 @@ func (s *transactionService) PrepareTransaction(ctx context.Context, q *q.Query,
}
// 生成订单号
tradeNo, err := ID.GenSerial(ctx)
tradeNo, err := ID.GenSerial(context.Background())
if err != nil {
return nil, err
}
@@ -113,7 +113,7 @@ func (s *transactionService) PrepareTransaction(ctx context.Context, q *q.Query,
ProductCode: "FAST_INSTANT_TRADE_PAY",
OutTradeNo: tradeNo,
Subject: subject,
TotalAmount: strconv.FormatFloat(amountReal, 'f', 2, 64),
TotalAmount: amountReal.StringFixed(2),
TimeExpire: expire.Format("2006-01-02 15:04:05"),
},
})
@@ -124,7 +124,7 @@ func (s *transactionService) PrepareTransaction(ctx context.Context, q *q.Query,
// 调用微信支付接口
case trade2.MethodWeChat:
resp, _, err := g.WechatPay.Native.Prepay(ctx, native.PrepayRequest{
resp, _, err := g.WechatPay.Native.Prepay(context.Background(), native.PrepayRequest{
Appid: &env.WechatPayAppId,
Mchid: &env.WechatPayMchId,
OutTradeNo: &tradeNo,
@@ -132,7 +132,7 @@ func (s *transactionService) PrepareTransaction(ctx context.Context, q *q.Query,
TimeExpire: &expire,
NotifyUrl: &env.WechatPayCallbackUrl,
Amount: &native.Amount{
Total: u.P(int64(amountReal * 100)),
Total: u.P(amountReal.Mul(decimal.NewFromInt(100)).Round(0).IntPart()),
},
})
if err != nil {
@@ -192,19 +192,19 @@ func (s *transactionService) PrepareTransaction(ctx context.Context, q *q.Query,
}, nil
}
func (s *transactionService) VerifyTransaction(ctx context.Context, data *TransactionVerifyData) (*TransactionVerifyResult, error) {
func (s *transactionService) VerifyTransaction(data *TransactionVerifyData) (*TransactionVerifyResult, error) {
var tradeNo = data.TradeNo
var method = data.Method
// 检查交易号是否存在
var transId string
var paidAt time.Time
var payment float64
var payment decimal.Decimal
switch method {
// 检查支付宝交易
case trade2.MethodAlipay:
resp, err := g.Alipay.TradeQuery(ctx, alipay.TradeQuery{
resp, err := g.Alipay.TradeQuery(context.Background(), alipay.TradeQuery{
OutTradeNo: tradeNo,
})
if err != nil {
@@ -219,7 +219,7 @@ func (s *transactionService) VerifyTransaction(ctx context.Context, data *Transa
}
transId = resp.TradeNo
payment, err = strconv.ParseFloat(resp.TotalAmount, 64)
payment, err = decimal.NewFromString(resp.TotalAmount)
if err != nil {
return nil, err
}
@@ -230,7 +230,7 @@ func (s *transactionService) VerifyTransaction(ctx context.Context, data *Transa
// 检查微信交易
case trade2.MethodWeChat:
resp, _, err := g.WechatPay.Native.QueryOrderByOutTradeNo(ctx, native.QueryOrderByOutTradeNoRequest{
resp, _, err := g.WechatPay.Native.QueryOrderByOutTradeNo(context.Background(), native.QueryOrderByOutTradeNoRequest{
OutTradeNo: &tradeNo,
Mchid: &env.WechatPayMchId,
})
@@ -242,7 +242,7 @@ func (s *transactionService) VerifyTransaction(ctx context.Context, data *Transa
}
transId = *resp.TransactionId
payment = float64(*resp.Amount.PayerTotal) / 100
payment = decimal.NewFromInt(*resp.Amount.PayerTotal).Div(decimal.NewFromInt(100))
paidAt, err = time.Parse(time.RFC3339, *resp.SuccessTime)
if err != nil {
return nil, err
@@ -260,14 +260,14 @@ func (s *transactionService) VerifyTransaction(ctx context.Context, data *Transa
}, nil
}
func (s *transactionService) CompleteTransaction(ctx context.Context, q *q.Query, data *TransactionCompleteData) (*TransactionCompleteResult, error) {
func (s *transactionService) CompleteTransaction(q *q.Query, data *TransactionCompleteData) (*TransactionCompleteResult, error) {
var transId = data.TransId
var tradeNo = data.TradeNo
var payment = data.Payment
var paidAt = data.Time
// 获取交易信息
trade, err := q.Trade.WithContext(ctx).
trade, err := q.Trade.
Where(q.Trade.InnerNo.Eq(tradeNo)).
First()
if err != nil {
@@ -275,19 +275,24 @@ func (s *transactionService) CompleteTransaction(ctx context.Context, q *q.Query
}
// 检查交易状态
if trade.Status != int32(trade2.StatusPending) {
return nil, nil
}
switch trade2.Status(trade.Status) {
// 更新交易状态
trade.Status = int32(trade2.StatusSuccess)
trade.OuterNo = transId
trade.Payment = payment
trade.PaidAt = orm.LocalDateTime(paidAt)
trade.PayURL = ""
_, err = q.Trade.WithContext(ctx).Updates(trade)
if err != nil {
return nil, err
// 如果已退款或取消，则返回错误
case trade2.StatusCanceled, trade2.StatusRefunded:
return nil, errors.New("交易已取消或已退款")
// 如果是未支付，则更新支付状态
case trade2.StatusPending:
trade.Status = int32(trade2.StatusSuccess)
trade.OuterNo = transId
trade.Payment = payment
trade.PaidAt = orm.LocalDateTime(paidAt)
trade.PayURL = ""
_, err = q.Trade.Updates(trade)
if err != nil {
return nil, err
}
case trade2.StatusSuccess:
}
return &TransactionCompleteResult{
@@ -295,12 +300,12 @@ func (s *transactionService) CompleteTransaction(ctx context.Context, q *q.Query
}, nil
}
func (s *transactionService) RevokeTransaction(ctx context.Context, tradeNo string, method trade2.Method) error {
func (s *transactionService) RevokeTransaction(tradeNo string, method trade2.Method) error {
switch method {
case trade2.MethodAlipay:
resp, err := g.Alipay.TradeCancel(ctx, alipay.TradeCancel{
resp, err := g.Alipay.TradeCancel(context.Background(), alipay.TradeCancel{
OutTradeNo: tradeNo,
})
if err != nil {
@@ -312,7 +317,7 @@ func (s *transactionService) RevokeTransaction(ctx context.Context, tradeNo stri
}
case trade2.MethodWeChat:
resp, err := g.WechatPay.Native.CloseOrder(ctx, native.CloseOrderRequest{
resp, err := g.WechatPay.Native.CloseOrder(context.Background(), native.CloseOrderRequest{
Mchid: &env.WechatPayMchId,
OutTradeNo: &tradeNo,
})
@@ -329,13 +334,13 @@ func (s *transactionService) RevokeTransaction(ctx context.Context, tradeNo stri
return nil
}
func (s *transactionService) FinishTransaction(ctx context.Context, q *q.Query, tradeNo string, time time.Time) error {
func (s *transactionService) FinishTransaction(q *q.Query, tradeNo string, now time.Time) error {
_, err := q.Trade.
Where(q.Trade.InnerNo.Eq(tradeNo)).
Select(q.Trade.Status, q.Trade.CancelAt, q.Trade.PayURL).
Updates(m.Trade{
Status: int32(trade2.StatusCanceled),
CancelAt: orm.LocalDateTime(time),
CancelAt: orm.LocalDateTime(now),
PayURL: "",
})
if err != nil {
@@ -347,7 +352,7 @@ func (s *transactionService) FinishTransaction(ctx context.Context, q *q.Query,
type TransactionPrepareData struct {
Subject string
Amount float64
Amount decimal.Decimal
ExpireAt time.Time
Type trade2.Type
Method trade2.Method
@@ -368,7 +373,7 @@ type TransactionVerifyData struct {
type TransactionVerifyResult struct {
TransId string
Payment float64
Payment decimal.Decimal
Time time.Time
}

7
web/services/user.go
View File

@@ -1,7 +1,6 @@
package services
import (
"context"
q "platform/web/queries"
)
@@ -9,12 +8,12 @@ var User = &userService{}
type userService struct{}
func (s *userService) RechargeConfirm(ctx context.Context, tradeNo string, verified *TransactionVerifyResult) error {
func (s *userService) RechargeConfirm(tradeNo string, verified *TransactionVerifyResult) error {
err := q.Q.Transaction(func(tx *q.Query) error {
// 更新交易状态
result, err := Transaction.CompleteTransaction(ctx, tx, &TransactionCompleteData{
result, err := Transaction.CompleteTransaction(tx, &TransactionCompleteData{
TradeNo: tradeNo,
TransactionVerifyResult: *verified,
})
@@ -31,7 +30,7 @@ func (s *userService) RechargeConfirm(ctx context.Context, tradeNo string, verif
_, err = tx.User.
Where(tx.User.ID.Eq(user.ID)).
UpdateSimple(tx.User.Balance.Add(result.Trade.Amount))
UpdateSimple(tx.User.Balance.Value(user.Balance.Add(result.Trade.Amount)))
if err != nil {
return err
}