feat: 分层轮询、重置日前加密与激活前流量结算
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m37s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m37s
- 轮询配置新增套餐状态、资产状态、重置日前窗口与窗口内流量间隔(迁移 248),间隔三态:正数按间隔、0 不检查、空继承 - 配置按 priority, id 排序合并;在库与已销售无套餐未匹配时告警不入队 - 新增优先级整体重排、匹配预览、立即重算到期时间(异步只提前)、分层统计与重置日前加密统计接口 - 已切换日快照计量的卡流量按观测时间归属,激活前用量只记已结算 - 订单购买与实名激活补齐资产级激活锁,激活前对已切换卡结算一次流量,失败只告警不阻塞,结算不触发通道阈值判定
This commit is contained in:
@@ -50,6 +50,7 @@ type WechatConfigServiceInterface interface {
|
||||
}
|
||||
|
||||
type Service struct {
|
||||
preActivationSettler PreActivationSettler
|
||||
db *gorm.DB
|
||||
redis *redis.Client
|
||||
orderStore *postgres.OrderStore
|
||||
@@ -1176,6 +1177,8 @@ func (s *Service) createOrderWithWalletPayment(ctx context.Context, order *model
|
||||
var existingOrderID uint
|
||||
walletDebitAttempted := false
|
||||
|
||||
release := s.prepareActivation(ctx, order)
|
||||
defer release()
|
||||
err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
matchedOrderID, err := lockAndFindRecentWalletOrder(ctx, tx, order.IdempotencyKey)
|
||||
if err != nil {
|
||||
@@ -1239,6 +1242,8 @@ func (s *Service) createOrderWithActivation(ctx context.Context, order *model.Or
|
||||
if s.billCreation == nil {
|
||||
return errors.New(errors.CodeInternalError, "员工代收款建账能力未配置")
|
||||
}
|
||||
release := s.prepareActivation(ctx, order)
|
||||
defer release()
|
||||
return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
if err := tx.Create(order).Error; err != nil {
|
||||
return errors.Wrap(errors.CodeDatabaseError, err, "创建代购订单失败")
|
||||
@@ -1727,6 +1732,8 @@ func (s *Service) WalletPay(ctx context.Context, orderID uint, buyerType string,
|
||||
}
|
||||
return err
|
||||
}
|
||||
release := s.prepareActivation(ctx, order)
|
||||
defer release()
|
||||
agentWalletDebitAttempted := false
|
||||
defer func() {
|
||||
s.recordOrderFailure(ctx, constants.AuditActionOrderWalletPaid, "钱包支付订单失败", order, err)
|
||||
@@ -1974,6 +1981,8 @@ func (s *Service) HandlePaymentCallback(ctx context.Context, orderNo string, pay
|
||||
return err
|
||||
}
|
||||
|
||||
release := s.prepareActivation(ctx, order)
|
||||
defer release()
|
||||
now := time.Now()
|
||||
beforeOrder := *order
|
||||
shouldResumeAfterPayment := false
|
||||
@@ -2059,6 +2068,8 @@ func (s *Service) HandlePaymentRecordCallback(ctx context.Context, paymentNo str
|
||||
return errors.Wrap(errors.CodeDatabaseError, err, "查询订单失败")
|
||||
}
|
||||
|
||||
release := s.prepareActivation(ctx, order)
|
||||
defer release()
|
||||
now := time.Now()
|
||||
beforePayment := *payment
|
||||
beforeOrder := *order
|
||||
|
||||
Reference in New Issue
Block a user