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

添加支付宝和微信充值功能，重构交易处理逻辑，优化资源创建与支付链接生成

Browse Source
This commit is contained in:
luorijun
2025-04-18 16:22:38 +08:00
parent f6a97545c5
commit a7e59fb1d7
14 changed files with 939 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
web/services/resource.go
View File

@@ -18,56 +18,37 @@ var Resource = &resourceService{}
type resourceService struct{}
func (s *resourceService) PrepareResource(ctx context.Context, data *CreateResourceData, uid int32, tradeNo string, method int32) error {
func (s *resourceService) PrepareResource(ctx context.Context, data *CreateResourceData, uid int32, method TransactionMethod) (*TransactionPrepareResult, error) {
amount := data.GetPrice()
// 保存到数据库
var result *TransactionPrepareResult
err := q.Q.Transaction(func(q *q.Query) error {
// 创建交易订单
var trade = m.Trade{
UserID: uid,
InnerNo: tradeNo,
Subject: "购买套餐 - " + data.GetName(),
Method: method,
Type: 1,
Status: 0,
Amount: amount,
}
err := q.Trade.Create(&trade)
if err != nil {
return err
}
var err error
// 保存用户帐单
bill := m.Bill{
UserID: uid,
TradeID: trade.ID,
BillNo: ID.GenReadable("bil"),
Info: "购买套餐 - " + data.GetName(),
Type: 1,
Amount: -amount,
}
err = q.Bill.
Omit(q.Bill.ResourceID, q.Bill.RefundID).
Create(&bill)
// 生成交易订单
result, err = Transaction.PrepareTransaction(ctx, q, uid, &TransactionPrepareData{
Subject: "购买套餐 - " + data.GetName(),
Amount: amount,
ExpireAt: time.Now().Add(30 * time.Minute),
Type: TransactionTypePurchase,
Method: method,
})
if err != nil {
return err
}
// 保存请求缓存
cache := &CreateResourceCache{
reqStr, err := json.Marshal(&CreateResourceCache{
CreateResourceData: *data,
Uid: uid,
TradeId: trade.ID,
BillId: bill.ID,
}
reqStr, err := json.Marshal(cache)
TradeId: result.Trade.ID,
BillId: result.Bill.ID,
})
if err != nil {
return err
}
err = rds.Client.Set(ctx, tradeNo, reqStr, 30*time.Minute).Err()
err = rds.Client.Set(ctx, result.TradeNo, reqStr, 30*time.Minute).Err()
if err != nil {
return err
}
@@ -75,20 +56,19 @@ func (s *resourceService) PrepareResource(ctx context.Context, data *CreateResou
return nil
})
if err != nil {
return err
return nil, err
}
return nil
return result, nil
}
func (s *resourceService) CreateResourcePrepared(ctx context.Context, tradeNo string, outerTradeNo string, payment float64, at time.Time) error {
func (s *resourceService) CompleteResource(ctx context.Context, tradeNo string, rs *TransactionVerifyResult) error {
// 获取请求缓存
reqStr, err := rds.Client.Get(ctx, tradeNo).Result()
if err != nil {
return err
}
cache := new(CreateResourceCache)
if err := json.Unmarshal([]byte(reqStr), cache); err != nil {
return err
@@ -103,21 +83,7 @@ func (s *resourceService) CreateResourcePrepared(ctx context.Context, tradeNo st
return err
}
// 更新订单状态
_, err = q.Trade.Debug().
Select(q.Trade.OuterNo, q.Trade.Payment, q.Trade.Status, q.Trade.PaidAt).
Updates(&m.Trade{
ID: cache.TradeId,
OuterNo: outerTradeNo,
Payment: payment,
Status: 1,
PaidAt: common.LocalDateTime(at),
})
if err != nil {
return err
}
// 更新账单状态
// 更新账单
_, err = q.Bill.Debug().
Select(q.Bill.ResourceID).
Updates(&m.Bill{
@@ -128,6 +94,15 @@ func (s *resourceService) CreateResourcePrepared(ctx context.Context, tradeNo st
return err
}
// 完成交易
_, err = Transaction.CompleteTransaction(ctx, q, &TransactionCompleteData{
TradeNo: tradeNo,
TransactionVerifyResult: *rs,
})
if err != nil {
return err
}
// 删除缓存
err = rds.Client.Del(ctx, tradeNo).Err()
if err != nil {
@@ -143,10 +118,24 @@ func (s *resourceService) CreateResourcePrepared(ctx context.Context, tradeNo st
return nil
}
func (s *resourceService) CreateResourceImmediately(data *CreateResourceData, uid int32) error {
func (s *resourceService) CreateResource(data *CreateResourceData, uid int32) error {
// 保存交易信息
err := q.Q.Transaction(func(q *q.Query) error {
amount := data.GetPrice()
// 检查用户
user, err := q.User.
Where(q.User.ID.Eq(uid)).
Take()
if err != nil {
return err
}
// 检查余额
if user.Balance < amount {
return fiber.NewError(fiber.StatusBadRequest, "余额不足")
}
// 保存套餐
resource, err := createResource(data, uid)
@@ -170,6 +159,14 @@ func (s *resourceService) CreateResourceImmediately(data *CreateResourceData, ui
return err
}
// 更新用户余额
_, err = q.User.
Where(q.User.ID.Eq(uid)).
Update(q.User.Balance, user.Balance-amount)
if err != nil {
return err
}
return nil
})
if err != nil {
@@ -221,27 +218,10 @@ type CreateResourceCache struct {
}
func createResource(data *CreateResourceData, uid int32) (*m.Resource, error) {
amount := data.GetPrice()
// 检查用户
user, err := q.User.
Where(
q.User.ID.Eq(uid),
q.User.Status.Eq(1),
).
Take()
if err != nil {
return nil, err
}
// 检查余额
if user.Balance < amount {
return nil, fiber.NewError(fiber.StatusBadRequest, "余额不足")
}
// 创建套餐
resource := &m.Resource{
UserID: user.ID,
resource := m.Resource{
UserID: uid,
ResourceNo: ID.GenReadable("res"),
Active: true,
Type: 1,
@@ -253,38 +233,29 @@ func createResource(data *CreateResourceData, uid int32) (*m.Resource, error) {
DailyLimit: data.DailyLimit,
},
}
err = q.Resource.Create(resource)
err := q.Resource.Create(&resource)
if err != nil {
return nil, err
}
// 更新用户余额
user.Balance -= amount
_, err = q.User.
Where(q.User.ID.Eq(uid)).
Update(q.User.Balance, user.Balance)
if err != nil {
return nil, err
}
return resource, nil
return &resource, nil
}
func (s *resourceService) CancelResource(ctx context.Context, tradeNo string, at time.Time) error {
// 获取请求缓存
func (s *resourceService) CancelResource(ctx context.Context, tradeNo string, at time.Time, method TransactionMethod) error {
// 删除请求缓存
_, err := rds.Client.Del(ctx, tradeNo).Result()
if err != nil {
return err
}
// 取消交易
err = Transaction.RevokeTransaction(ctx, tradeNo, method)
if err != nil {
return err
}
// 更新订单状态
_, err = q.Trade.
Where(q.Trade.InnerNo.Eq(tradeNo)).
Select(q.Trade.Status, q.Trade.CancelAt).
Updates(m.Trade{
Status: 2,
CancelAt: common.LocalDateTime(at),
})
err = Transaction.FinishTransaction(ctx, q.Q, tradeNo, at)
if err != nil {
return err
}