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

重构交易处理逻辑，合并充值与购买流程，优化交易状态管理；更新相关数据结构和接口

Browse Source
This commit is contained in:
luorijun
2025-06-26 09:28:42 +08:00
parent 065a7c77c3
commit 7d0bd84649
18 changed files with 843 additions and 919 deletions
Download Patch File Download Diff File Expand all files Collapse all files

487
web/services/resource.go
View File

@@ -1,8 +1,6 @@
package services
import (
"context"
"database/sql"
"encoding/json"
"fmt"
"platform/pkg/u"
@@ -23,221 +21,68 @@ var Resource = &resourceService{}
type resourceService struct{}
func (s *resourceService) CreateResource(uid int32, now time.Time, ser *CreateResourceData) error {
func (s *resourceService) CreateResourceByBalance(uid int32, now time.Time, data *CreateResourceData) error {
return g.Redsync.WithLock(userBalanceKey(uid), func() error {
return q.Q.Transaction(func(q *q.Query) error {
// 检查用户
user, err := q.User.
Where(q.User.ID.Eq(uid)).
Take()
if err != nil {
return err
}
data, err := ser.ToData()
if err != nil {
return err
}
// 检查余额
var amount = user.Balance.Sub(data.GetAmount())
if amount.IsNegative() {
return ErrBalanceNotEnough
}
var name = data.GetName()
var amount = data.GetPrice()
// 保存套餐
resource, err := createResource(q, uid, now, data)
if err != nil {
return core.NewServErr("创建套餐失败", err)
}
// 保存交易信息
err = q.Q.Transaction(func(q *q.Query) error {
// 更新用户余额
_, err = q.User.
Where(q.User.ID.Eq(uid)).
UpdateSimple(q.User.Balance.Value(amount))
if err != nil {
return core.NewServErr("更新用户余额失败", err)
}
// 检查用户
user, err := q.User.
Where(q.User.ID.Eq(uid)).
Take()
if err != nil {
return err
}
// 生成账单
err = q.Bill.Create(bill2.NewForConsume(uid, Bill.GenNo(), data.GetSubject(), data.GetAmount(), resource))
if err != nil {
return core.NewServErr("生成账单失败", err)
}
// 检查余额
if user.Balance.Cmp(amount) < 0 {
return ErrBalanceNotEnough
}
return nil
})
})
}
func (s *resourceService) CreateResourceByTrade(uid int32, now time.Time, data *CreateResourceData, trade *m.Trade) error {
return q.Q.Transaction(func(q *q.Query) error {
// 保存套餐
resource, err := createResource(q, uid, now, data)
if err != nil {
return err
return core.NewServErr("创建套餐失败", err)
}
// 生成账单
bill := m.Bill{
UserID: uid,
ResourceID: &resource.ID,
BillNo: ID.GenReadable("bil"),
Info: u.P("购买套餐 - " + name),
Type: int32(bill2.TypeConsume),
Amount: amount,
}
err = q.Bill.
Omit(q.Bill.TradeID, q.Bill.RefundID).
Create(&bill)
err = q.Bill.Create(bill2.NewForConsume(uid, Bill.GenNo(), data.GetSubject(), data.GetAmount(), resource, trade))
if err != nil {
return err
}
// 更新用户余额
_, err = q.User.
Where(q.User.ID.Eq(uid)).
UpdateSimple(q.User.Balance.Value(user.Balance.Sub(amount)))
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, ser *PrepareResourceData) (*TradeCreateResult, error) {
name := ser.GetName()
amount := ser.GetPrice()
method := ser.PaymentMethod
platform := ser.PaymentPlatform
// 保存到数据库
var result *TradeCreateResult
err := q.Q.Transaction(func(q *q.Query) error {
var err error
// 生成交易订单
result, err = Trade.CreateTrade(q, uid, now, &TradeCreateData{
Subject: "购买套餐 - " + name,
Amount: amount,
ExpireAt: time.Now().Add(30 * time.Minute),
Type: trade2.TypeRecharge,
Method: method,
Platform: platform,
})
if err != nil {
return err
}
// 保存请求缓存
err = g.Redis.Set(context.Background(), resPrepareKey(result.TradeNo), &PrepareResourceCache{
Uid: uid,
TradeId: result.Trade.ID,
BillId: result.Bill.ID,
PrepareResourceData: ser,
}, 30*time.Minute).Err()
if err != nil {
return err
return core.NewServErr("生成账单失败", err)
}
return nil
})
if err != nil {
return nil, err
}
return result, nil
}
func (s *resourceService) CompleteResource(tradeNo string, now time.Time, opResult ...*TradeSuccessResult) error {
// 获取请求缓存
reqStr, err := g.Redis.Get(context.Background(), resPrepareKey(tradeNo)).Result()
if err != nil {
return core.NewBizErr("交易不存在或已过期")
}
cache := new(PrepareResourceCache)
if err := json.Unmarshal([]byte(reqStr), cache); err != nil {
return err
}
// 检查交易结果
var rs *TradeSuccessResult
if len(opResult) > 0 && opResult[0] != nil {
rs = opResult[0]
} else {
var err error
rs, err = Trade.CheckTradeIfCreated(&CheckTradeData{
TradeNo: tradeNo,
Method: cache.PaymentMethod,
})
if err != nil {
return err
}
}
data, err := cache.ToData()
if err != nil {
return err
}
// 保存交易信息
err = q.Q.Transaction(func(q *q.Query) error {
// 完成交易
_, err = Trade.OnTradeCreated(q, &OnTradeCreateData{
TradeNo: tradeNo,
TradeSuccessResult: *rs,
})
if err != nil {
return fmt.Errorf("完成交易失败: %w", err)
}
// 保存套餐
resource, err := createResource(q, cache.Uid, now, data)
if err != nil {
return fmt.Errorf("创建套餐失败: %w", err)
}
// 更新账单
_, err = q.Bill.Debug().
Where(q.Bill.ID.Eq(cache.BillId)).
Updates(&m.Bill{
ResourceID: &resource.ID,
})
if err != nil {
return fmt.Errorf("更新账单失败: %w", err)
}
// 删除缓存
err = g.Redis.Del(context.Background(), tradeNo).Err()
if err != nil {
return fmt.Errorf("删除缓存失败: %w", err)
}
return nil
})
if err != nil {
return err
}
return nil
}
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(PrepareResourceCache)
if err := json.Unmarshal([]byte(cacheStr), cache); err != nil {
return err
}
// 取消交易
if len(opRevoked) <= 0 {
err = Trade.CancelTrade(tradeNo, cache.PaymentMethod)
if err != nil {
return err
}
}
// 更新订单状态
err = Trade.OnTradeCanceled(q.Q, tradeNo, now)
if err != nil {
return err
}
return nil
}
func createResource(q *q.Query, uid int32, now time.Time, data CreateTypeResourceDataInter) (*m.Resource, error) {
func createResource(q *q.Query, uid int32, now time.Time, data *CreateResourceData) (*m.Resource, error) {
// 套餐基本信息
var resource = m.Resource{
@@ -245,51 +90,55 @@ func createResource(q *q.Query, uid int32, now time.Time, data CreateTypeResourc
ResourceNo: u.P(ID.GenReadable("res")),
Active: true,
}
switch data := data.(type) {
switch data.Type {
// 短效套餐
case *CreateShortResourceData:
var duration = time.Duration(data.Expire) * 24 * time.Hour
case resource2.TypeShort:
var short = data.Short
if short == nil {
return nil, core.NewBizErr("短效套餐数据不能为空")
}
var duration = time.Duration(short.Expire) * 24 * time.Hour
resource.Type = int32(resource2.TypeShort)
resource.Short = &m.ResourceShort{
Type: data.Mode,
Live: data.Live,
Quota: &data.Quota,
Type: short.Mode,
Live: short.Live,
Quota: &short.Quota,
Expire: u.P(orm.LocalDateTime(now.Add(duration))),
DailyLimit: data.DailyLimit,
DailyLimit: short.DailyLimit,
}
// 长效套餐
case *CreateLongResourceData:
var duration = time.Duration(data.Expire) * 24 * time.Hour
case resource2.TypeLong:
var long = data.Long
if long == nil {
return nil, core.NewBizErr("长效套餐数据不能为空")
}
var duration = time.Duration(long.Expire) * 24 * time.Hour
resource.Type = int32(resource2.TypeLong)
resource.Long = &m.ResourceLong{
Type: data.Mode,
Live: data.Live,
Quota: &data.Quota,
Type: long.Mode,
Live: long.Live,
Quota: &long.Quota,
Expire: u.P(orm.LocalDateTime(now.Add(duration))),
DailyLimit: data.DailyLimit,
DailyLimit: long.DailyLimit,
}
default:
return nil, fmt.Errorf("不支持的套餐类型")
return nil, core.NewBizErr("不支持的套餐类型")
}
err := q.Resource.Create(&resource)
if err != nil {
return nil, err
return nil, core.NewServErr("创建套餐失败", err)
}
return &resource, nil
}
func resPrepareKey(tradeNo string) string {
return fmt.Sprintf("resource:prepare:%s", tradeNo)
}
type CreateTypeResourceDataInter interface {
GetName() string
GetPrice() decimal.Decimal
type CreateResourceData struct {
Type resource2.Type `json:"type" validate:"required"`
Short *CreateShortResourceData `json:"short,omitempty"`
Long *CreateLongResourceData `json:"long,omitempty"`
}
type CreateShortResourceData struct {
@@ -303,7 +152,51 @@ type CreateShortResourceData struct {
price *decimal.Decimal
}
func (data *CreateShortResourceData) GetName() string {
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 (c *CreateResourceData) GetType() trade2.Type {
return trade2.TypePurchase
}
func (c *CreateResourceData) GetSubject() string {
switch c.Type {
case resource2.TypeShort:
return c.Short.GetSubject()
case resource2.TypeLong:
return c.Long.GetSubject()
}
panic("类型对应的数据为空")
}
func (c *CreateResourceData) GetAmount() decimal.Decimal {
switch c.Type {
case resource2.TypeShort:
return c.Short.GetAmount()
case resource2.TypeLong:
return c.Long.GetAmount()
}
panic("类型对应的数据为空")
}
func (c *CreateResourceData) Serialize() (string, error) {
bytes, err := json.Marshal(c)
return string(bytes), err
}
func (c *CreateResourceData) Deserialize(str string) error {
return json.Unmarshal([]byte(str), c)
}
func (data *CreateShortResourceData) GetSubject() string {
if data.name == "" {
var mode string
switch data.Mode {
@@ -317,7 +210,7 @@ func (data *CreateShortResourceData) GetName() string {
return data.name
}
func (data *CreateShortResourceData) GetPrice() decimal.Decimal {
func (data *CreateShortResourceData) GetAmount() decimal.Decimal {
if data.price == nil {
var factor int32
switch data.Mode {
@@ -340,18 +233,7 @@ func (data *CreateShortResourceData) GetPrice() decimal.Decimal {
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 {
func (data *CreateLongResourceData) GetSubject() string {
if data.name == "" {
var mode string
switch data.Mode {
@@ -365,7 +247,7 @@ func (data *CreateLongResourceData) GetName() string {
return data.name
}
func (data *CreateLongResourceData) GetPrice() decimal.Decimal {
func (data *CreateLongResourceData) GetAmount() decimal.Decimal {
if data.price == nil {
var factor int32 = 0
switch resource2.Mode(data.Mode) {
@@ -399,72 +281,85 @@ func (data *CreateLongResourceData) GetPrice() decimal.Decimal {
return *data.price
}
type CreateResourceData struct {
Type resource2.Type `json:"type" validate:"required"`
Short *CreateShortResourceData `json:"short,omitempty"`
Long *CreateLongResourceData `json:"long,omitempty"`
}
type ResourceOnTradeComplete struct{}
func (data *CreateResourceData) GetName() string {
switch data.Type {
case resource2.TypeShort:
return data.Short.GetName()
case resource2.TypeLong:
return data.Long.GetName()
default:
panic("未处理的 resource type 枚举值")
func (r ResourceOnTradeComplete) Check(t trade2.Type) (trade2.ProductInfo, bool) {
if t == trade2.TypePurchase {
return &CreateResourceData{}, true
}
return nil, false
}
func (data *CreateResourceData) GetPrice() decimal.Decimal {
switch data.Type {
case resource2.TypeShort:
return data.Short.GetPrice()
case resource2.TypeLong:
return data.Long.GetPrice()
default:
panic("未处理的 resource type 枚举值")
}
func (r ResourceOnTradeComplete) OnTradeComplete(info trade2.ProductInfo, trade *m.Trade) error {
return Resource.CreateResourceByTrade(trade.UserID, time.Time(*trade.CompletedAt), info.(*CreateResourceData), trade)
}
func (s *CreateResourceData) ToData() (CreateTypeResourceDataInter, error) {
switch s.Type {
case resource2.TypeShort:
return s.Short, nil
case resource2.TypeLong:
return s.Long, nil
}
return nil, fmt.Errorf("不支持的套餐类型")
}
type PrepareResourceData struct {
CreateResourceData
PaymentMethod trade2.Method `json:"payment_method" validate:"required"`
PaymentPlatform trade2.Platform `json:"payment_platform" validate:"required"`
}
type PrepareResourceCache struct {
Uid int32 `json:"uid"`
TradeId int32 `json:"trade_id"`
BillId int32 `json:"bill_id"`
*PrepareResourceData
}
func (c PrepareResourceCache) MarshalBinary() (data []byte, err error) {
data, err = json.Marshal(c)
if err != nil {
return nil, err
}
return data, nil
}
func (c PrepareResourceCache) UnmarshalBinary(data []byte) error {
if err := json.Unmarshal(data, &c); err != nil {
return err
}
return nil
}
// type CreateResourceData struct {
// Type resource2.Type `json:"type" validate:"required"`
// Short *CreateShortResourceData `json:"short,omitempty"`
// Long *CreateLongResourceData `json:"long,omitempty"`
// }
//
// func (data *CreateResourceData) GetSubject() string {
// switch data.Type {
// case resource2.TypeShort:
// return data.Short.GetSubject()
// case resource2.TypeLong:
// return data.Long.GetSubject()
// default:
// panic("未处理的 resource type 枚举值")
// }
// }
//
// func (data *CreateResourceData) GetAmount() decimal.Decimal {
// switch data.Type {
// case resource2.TypeShort:
// return data.Short.GetAmount()
// case resource2.TypeLong:
// return data.Long.GetAmount()
// default:
// panic("未处理的 resource type 枚举值")
// }
// }
//
// func (data *CreateResourceData) ToData() (CreateResourceData, error) {
// switch data.Type {
// case resource2.TypeShort:
// return data.Short, nil
// case resource2.TypeLong:
// return data.Long, nil
// }
//
// return nil, fmt.Errorf("不支持的套餐类型")
// }
//
// type PrepareResourceData struct {
// CreateResourceData
// PaymentMethod trade2.Method `json:"payment_method" validate:"required"`
// PaymentPlatform trade2.Platform `json:"payment_platform" validate:"required"`
// }
//
// type PrepareResourceCache struct {
// Uid int32 `json:"uid"`
// TradeId int32 `json:"trade_id"`
// BillId int32 `json:"bill_id"`
// *PrepareResourceData
// }
//
// func (c PrepareResourceCache) MarshalBinary() (data []byte, err error) {
// data, err = json.Marshal(c)
// if err != nil {
// return nil, err
// }
// return data, nil
// }
//
// func (c PrepareResourceCache) UnmarshalBinary(data []byte) error {
// if err := json.Unmarshal(data, &c); err != nil {
// return err
// }
// return nil
// }
type ResourceServiceErr string