feat: update transaction handling and order service logic

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
2026-02-04 14:57:49 +08:00
parent 25d3592fe4
commit 0fe4344b3b
2 changed files with 73 additions and 12 deletions

View File

@@ -238,14 +238,21 @@ func (s *order) Pay(
return nil, errorx.ErrStatusConflict.WithMsg("订单状态不可支付")
}
if form.Method == "balance" {
switch form.Method {
case "balance":
return s.payWithBalance(ctx, o)
case "alipay", "external":
// mock external: 标记已支付,避免前端卡住
if err := s.settleOrder(ctx, o, "external", ""); err != nil {
if _, ok := err.(*errorx.AppError); ok {
return nil, err
}
return nil, errorx.ErrDatabaseError.WithCause(err)
}
return &transaction_dto.OrderPayResponse{PayParams: "mock_pay_params"}, nil
default:
return nil, errorx.ErrBadRequest.WithMsg("unsupported payment method")
}
// External payment (mock) - normally returns URL/params
return &transaction_dto.OrderPayResponse{
PayParams: "mock_pay_params",
}, nil
}
// ProcessExternalPayment handles callback from payment gateway
@@ -308,13 +315,12 @@ func (s *order) settleOrder(ctx context.Context, o *models.Order, method, extern
// 2. Update Order Status
now := time.Now()
// snapshot := o.Snapshot // Preserve existing snapshot or update it with external ID
// TODO: Update snapshot with payment info
_, err := tx.Order.WithContext(ctx).Where(tx.Order.ID.Eq(o.ID)).Updates(&models.Order{
Status: consts.OrderStatusPaid,
PaidAt: now,
UpdatedAt: now,
})
if err != nil {
return err
}
@@ -355,7 +361,15 @@ func (s *order) settleOrder(ctx context.Context, o *models.Order, method, extern
fee := int64(float64(amount) * 0.10)
creatorIncome := amount - fee
// Credit Tenant Owner Balance (Net Income)
// Credit Tenant Owner Balance (Net Income) 并记录余额快照
owner, err := tx.User.WithContext(ctx).
Where(tx.User.ID.Eq(tenantOwnerID)).
First()
if err != nil {
return err
}
balanceBefore := owner.Balance
balanceAfter := balanceBefore + creatorIncome
_, err = tx.User.WithContext(ctx).
Where(tx.User.ID.Eq(tenantOwnerID)).
Update(tx.User.Balance, gorm.Expr("balance + ?", creatorIncome))
@@ -369,8 +383,8 @@ func (s *order) settleOrder(ctx context.Context, o *models.Order, method, extern
OrderID: o.ID,
Type: consts.TenantLedgerTypeDebitPurchase, // Income from purchase
Amount: creatorIncome,
BalanceBefore: 0, // TODO
BalanceAfter: 0, // TODO
BalanceBefore: balanceBefore,
BalanceAfter: balanceAfter,
FrozenBefore: 0,
FrozenAfter: 0,
IdempotencyKey: uuid.NewString(),