This commit is contained in:
@@ -595,18 +595,25 @@ func (s *Service) createForceRechargeOrder(
|
||||
if err := s.paymentStore.CreateWithTx(ctx, tx, payment); err != nil {
|
||||
return errors.Wrap(errors.CodeDatabaseError, err, "创建支付记录失败")
|
||||
}
|
||||
return s.appendPaymentCreatedAudit(ctx, tx, payment, nil, rechargeOrder)
|
||||
if err := s.appendPaymentCreatedAudit(ctx, tx, payment, nil, rechargeOrder); err != nil {
|
||||
return err
|
||||
}
|
||||
return merchantpayment.RecordRoutingAttempt(ctx, tx, payment)
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
attempt, startedAt, err := s.startPaymentAttempt(ctx, payment, paymentIntegrationProvider(activeConfig), "client_force_recharge")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
paymentResult, err := paymentProvider.CreateJSAPIPayment(ctx, paymentNo, "余额充值", openID, int(rechargeOrder.Amount))
|
||||
if err != nil {
|
||||
if completeErr := s.completePaymentAttempt(ctx, attempt, startedAt, constants.IntegrationResultUnknown, "request_unknown", "支付预下单结果未知"); completeErr != nil {
|
||||
resultClass := constants.IntegrationResultUnknown
|
||||
if merchantpayment.ShouldDisableMerchant(err) {
|
||||
resultClass = constants.IntegrationResultFailed
|
||||
if disableErr := merchantpayment.DisableMerchantAfterExplicitFailure(ctx, s.db, payment, "payment_precreate_failed", time.Now()); disableErr != nil {
|
||||
return nil, disableErr
|
||||
}
|
||||
}
|
||||
if completeErr := s.completePaymentAttempt(ctx, attempt, startedAt, resultClass, "request_failed", "支付预下单结果已分类"); completeErr != nil {
|
||||
return nil, completeErr
|
||||
}
|
||||
if updateErr := s.markPaymentFailed(ctx, payment, "支付预下单失败,关闭支付记录"); updateErr != nil {
|
||||
@@ -1076,6 +1083,9 @@ func (s *Service) getOrBuildAlipayPaymentLink(
|
||||
if err := s.appendPaymentCreatedAudit(ctx, tx, newPayment, nil, nil); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := merchantpayment.RecordRoutingAttempt(ctx, tx, newPayment); err != nil {
|
||||
return err
|
||||
}
|
||||
payment = newPayment
|
||||
activeConfig = config
|
||||
return nil
|
||||
@@ -1094,6 +1104,11 @@ func (s *Service) getOrBuildAlipayPaymentLink(
|
||||
|
||||
wapURL, err := alipay.BuildWapPayURL(ctx, activeConfig, payment, subject)
|
||||
if err != nil {
|
||||
if created && merchantpayment.ShouldDisableMerchant(err) {
|
||||
if disableErr := merchantpayment.DisableMerchantAfterExplicitFailure(ctx, s.db, payment, "payment_precreate_failed", time.Now()); disableErr != nil {
|
||||
return nil, disableErr
|
||||
}
|
||||
}
|
||||
if created {
|
||||
_ = s.markPaymentFailed(ctx, payment, "支付宝支付链接生成失败,关闭支付记录")
|
||||
}
|
||||
@@ -1198,18 +1213,23 @@ func (s *Service) createAlipayForceRechargeOrder(
|
||||
if err := s.paymentStore.CreateWithTx(ctx, tx, payment); err != nil {
|
||||
return err
|
||||
}
|
||||
return s.appendPaymentCreatedAudit(ctx, tx, payment, nil, rechargeOrder)
|
||||
if err := s.appendPaymentCreatedAudit(ctx, tx, payment, nil, rechargeOrder); err != nil {
|
||||
return err
|
||||
}
|
||||
return merchantpayment.RecordRoutingAttempt(ctx, tx, payment)
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
wapURL, err := alipay.BuildWapPayURL(ctx, activeConfig, payment, "余额充值")
|
||||
if err != nil {
|
||||
if merchantpayment.ShouldDisableMerchant(err) {
|
||||
if disableErr := merchantpayment.DisableMerchantAfterExplicitFailure(ctx, s.db, payment, "payment_precreate_failed", time.Now()); disableErr != nil {
|
||||
return nil, disableErr
|
||||
}
|
||||
}
|
||||
if updateErr := s.markPaymentFailed(ctx, payment, "支付宝支付链接生成失败,关闭支付记录"); updateErr != nil {
|
||||
s.logger.Warn("标记支付宝支付单 failed 失败",
|
||||
zap.String("payment_no", paymentNo),
|
||||
zap.Error(updateErr),
|
||||
)
|
||||
s.logger.Warn("标记支付宝支付单 failed 失败", zap.String("payment_no", paymentNo), zap.Error(updateErr))
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
@@ -1530,26 +1550,29 @@ func (s *Service) PayOrder(ctx context.Context, customerID uint, orderID uint, r
|
||||
if err := s.paymentStore.CreateWithTx(skipCtx, tx, payment); err != nil {
|
||||
return errors.Wrap(errors.CodeDatabaseError, err, "创建支付记录失败")
|
||||
}
|
||||
if err := merchantpayment.RecordRoutingAttempt(skipCtx, tx, payment); err != nil {
|
||||
return err
|
||||
}
|
||||
return s.appendPaymentCreatedAudit(skipCtx, tx, payment, order, nil)
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
attempt, startedAt, err := s.startPaymentAttempt(skipCtx, payment, paymentIntegrationProvider(activeConfig), "client_order")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
paymentResult, err := paymentProvider.CreateJSAPIPayment(skipCtx, paymentNo, "套餐购买", openID, int(order.TotalAmount))
|
||||
if err != nil {
|
||||
if completeErr := s.completePaymentAttempt(skipCtx, attempt, startedAt, constants.IntegrationResultUnknown, "request_unknown", "支付预下单结果未知"); completeErr != nil {
|
||||
resultClass := constants.IntegrationResultUnknown
|
||||
if merchantpayment.ShouldDisableMerchant(err) {
|
||||
resultClass = constants.IntegrationResultFailed
|
||||
if disableErr := merchantpayment.DisableMerchantAfterExplicitFailure(skipCtx, s.db, payment, "payment_precreate_failed", time.Now()); disableErr != nil {
|
||||
return nil, disableErr
|
||||
}
|
||||
}
|
||||
if completeErr := s.completePaymentAttempt(skipCtx, attempt, startedAt, resultClass, "request_failed", "支付预下单结果已分类"); completeErr != nil {
|
||||
return nil, completeErr
|
||||
}
|
||||
if updateErr := s.markPaymentFailed(skipCtx, payment, "支付预下单失败,关闭支付记录"); updateErr != nil {
|
||||
s.logger.Warn("标记支付记录失败状态失败",
|
||||
zap.Uint("payment_id", payment.ID),
|
||||
zap.String("payment_no", paymentNo),
|
||||
zap.Error(updateErr),
|
||||
)
|
||||
return nil, updateErr
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user