Merge branch 'dev'

# Conflicts:
#	backend/internal/modules/payment/payment_start.go
#	deploy/docker-compose.dev.yml
#	frontend/src/features/admin/AdminPaymentsPage.tsx
#	scripts/dev.sh
This commit is contained in:
yml
2026-11-12 22:56:13 +08:00
550 changed files with 147390 additions and 1387 deletions
@@ -20,6 +20,11 @@ func (r *Repository) Start(ctx context.Context, userID uint64, orderID uint64, r
if err != nil {
return nil, err
}
return r.startPreparedPayment(ctx, payment, "租号订单 "+orderRow.OrderNo, orderRow.OrderNo, clientIP)
}
// startPreparedPayment 对已经创建或复用的支付单执行渠道下单、收银台复用或模拟支付。
func (r *Repository) startPreparedPayment(ctx context.Context, payment *model.PaymentOrder, body string, attach string, clientIP string) (*PaymentDTO, error) {
runtimeConfig, err := r.runtimeConfigForPayment(ctx, payment)
if err != nil {
return nil, ErrPaymentUnavailable
@@ -64,8 +69,8 @@ func (r *Repository) Start(ctx context.Context, userID uint64, orderID uint64, r
NotifyURL: runtimeConfig.NotifyURL,
JumpURL: runtimeConfig.JumpURL,
ClientIP: clientIP,
Body: "租号订单-" + orderRow.OrderNo,
Attach: orderRow.OrderNo,
Body: body,
Attach: attach,
})
if err != nil {
var raw map[string]string