更新uniapp和platform

This commit is contained in:
hero920103 committed 2026-11-16 11:32:16 +08:00
1 parent 31ae07175d
commit 7f9a66da0f
47 files changed
+5207 -1974

No files matched your search

+27 -6
View File
@@ -31,12 +31,33 @@ type OrderSyncFunc func(ctx context.Context, order *models.PlatformPaymentOrder)
type PromoterResolveFunc func(ctx context.Context, order *models.PlatformPaymentOrder) (promoterID, promoterName, promoterType string, ok bool)
var (
orderSyncHook OrderSyncFunc
// 业务订单同步钩子可以有多个(产品订单、附件空间订单等),
// 逐个执行;任何一个失败都会保留 order_synced=0 由补偿任务重试。
orderSyncHooks []OrderSyncFunc
promoterResolve PromoterResolveFunc
)
// RegisterOrderSyncHook 注册业务订单同步钩子(在业务模块 init 时调用)
func RegisterOrderSyncHook(fn OrderSyncFunc) { orderSyncHook = fn }
// 支持多个模块分别注册,互不覆盖。
func RegisterOrderSyncHook(fn OrderSyncFunc) {
if fn != nil {
orderSyncHooks = append(orderSyncHooks, fn)
}
}
// runOrderSyncHooks 依次执行所有业务同步钩子,返回第一个错误(便于补偿重试)
func runOrderSyncHooks(ctx context.Context, order *models.PlatformPaymentOrder) error {
var firstErr error
for _, fn := range orderSyncHooks {
if fn == nil {
continue
}
if err := fn(ctx, order); err != nil && firstErr == nil {
firstErr = err
}
}
return firstErr
}
// RegisterPromoterResolver 注册推广方解析钩子
func RegisterPromoterResolver(fn PromoterResolveFunc) { promoterResolve = fn }
@@ -374,11 +395,11 @@ func applyChannelState(ctx context.Context, order *models.PlatformPaymentOrder,
LogStateChange(order.PayNo, models.PayStatusPaying, models.PayStatusPaid, operator, note)
// 1. 同步业务订单状态(钩子;失败保留 order_synced=0 由补偿任务重试)
if orderSyncHook == nil {
if len(orderSyncHooks) == 0 {
_, _ = models.Orm.QueryTable(new(models.PlatformPaymentOrder)).
Filter("id", order.ID).
Update(orm.Params{"order_synced": 1, "update_time": time.Now()})
} else if serr := orderSyncHook(ctx, order); serr != nil {
} else if serr := runOrderSyncHooks(ctx, order); serr != nil {
LogStateChange(order.PayNo, models.PayStatusPaid, models.PayStatusPaid, operator, "业务订单同步失败:"+serr.Error())
} else {
_, _ = models.Orm.QueryTable(new(models.PlatformPaymentOrder)).
@@ -559,7 +580,7 @@ func CloseExpiredOrders(ctx context.Context) (int, error) {
// SyncPendingOrders 重试同步「已支付但业务订单未更新」的支付单(补偿任务),返回处理数量
func SyncPendingOrders(ctx context.Context) (int, error) {
if orderSyncHook == nil {
if len(orderSyncHooks) == 0 {
return 0, nil
}
var orders []models.PlatformPaymentOrder
@@ -573,7 +594,7 @@ func SyncPendingOrders(ctx context.Context) (int, error) {
}
done := 0
for i := range orders {
if serr := orderSyncHook(ctx, &orders[i]); serr != nil {
if serr := runOrderSyncHooks(ctx, &orders[i]); serr != nil {
beelog.Warn("支付单 %s 业务订单同步重试失败: %v", orders[i].PayNo, serr)
continue
}