Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Failing after 8m39s
- 迁移 000259~000265:套餐记录沉默期字段与扫描索引、套餐默认沉默期、延期政策/流水/订单/批次/明细 5 张表、默认政策与系统配置(总开关默认关闭)、企微审批白名单、卡与设备出库时间及出库记录 - 沉默期设置(订单发放、自动购包、钱包续费)、后台购买时调整(超默认值按政策免审或企微审批)、统一判定与激活闸门、排队与孤儿扫描跳过过期套餐、过期套餐禁止退款、每 10 分钟扫描 - 总开关专用接口与打开前 4 项检查;延期政策;延期资格与计费;H5 自助与后台二维码在线支付(商户池路由)、支付回调与查单恢复、线下登记、特殊/批量延期、异常重试与原路退款;沉默期审批场景与终态处理 - 换货沉默期流水与出库时间;卡/设备列表、详情、导出与出库记录接口;延期订单与即将过期套餐列表及导出;财务流水纳入延期支付 - 沉默期与出库时间回填工具 cmd/silence-backfill;前端接口变更说明 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
112 lines
4.4 KiB
Go
112 lines
4.4 KiB
Go
package packagesilence
|
||
|
||
import (
|
||
"context"
|
||
"time"
|
||
|
||
"go.uber.org/zap"
|
||
|
||
agentrechargeApp "github.com/break/junhong_cmp_fiber/internal/application/agentrecharge"
|
||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||
"github.com/break/junhong_cmp_fiber/internal/store/postgres"
|
||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||
"github.com/break/junhong_cmp_fiber/pkg/errors"
|
||
)
|
||
|
||
// recoveryMinimumAge 是待支付订单进入查单恢复的最短等待时间,避免与客户正在支付的回调竞争。
|
||
const recoveryMinimumAge = time.Minute
|
||
|
||
// RecoverResult 是一轮延期订单恢复的结果。
|
||
type RecoverResult struct {
|
||
Confirmed int
|
||
Closed int
|
||
Refunded int
|
||
}
|
||
|
||
// Recover 收敛延期订单(技术方案 §7.1、§8.4):
|
||
// - 待支付订单:按冻结商户查单,已支付走支付确认,渠道明确关闭或订单不存在且已过支付截止的关闭;
|
||
// - 执行异常且已支付的在线订单:按冻结商户原路退款(渠道请求号固定,重复提交幂等)。
|
||
//
|
||
// 不受总开关影响:应急关闭后进行中的支付也要处理完。
|
||
func (s *ExtensionService) Recover(ctx context.Context) (RecoverResult, error) {
|
||
result := RecoverResult{}
|
||
now := s.now()
|
||
orders, err := postgres.NewPackageSilenceOrderStore(s.db).ListPendingPayment(ctx, now.Add(-recoveryMinimumAge), constants.SilenceOrderRecoverBatchSize)
|
||
if err != nil {
|
||
return result, errors.Wrap(errors.CodeDatabaseError, err, "查询待支付延期订单失败")
|
||
}
|
||
for index := range orders {
|
||
order := &orders[index]
|
||
state, err := s.recoverPending(ctx, order, now)
|
||
if err != nil {
|
||
s.logger.Warn("延期订单查单恢复失败,下一轮重试", zap.String("order_no", order.OrderNo), zap.Error(err))
|
||
continue
|
||
}
|
||
switch state {
|
||
case agentrechargeApp.OnlinePaymentStatePaid:
|
||
result.Confirmed++
|
||
case agentrechargeApp.OnlinePaymentStateClosed:
|
||
result.Closed++
|
||
}
|
||
}
|
||
var exceptions []model.PackageSilenceExtensionOrder
|
||
if err := s.db.WithContext(ctx).Where("status = ? AND paid_payment_id IS NOT NULL AND payment_method <> ?",
|
||
constants.SilenceOrderStatusException, model.PaymentByOffline).
|
||
Order("id ASC").Limit(constants.SilenceOrderRecoverBatchSize).Find(&exceptions).Error; err != nil {
|
||
return result, errors.Wrap(errors.CodeDatabaseError, err, "查询待退款的异常延期订单失败")
|
||
}
|
||
for index := range exceptions {
|
||
if err := s.refundOrder(ctx, exceptions[index].ID, "延期执行异常原路退款"); err != nil {
|
||
s.logger.Warn("延期异常订单原路退款失败,下一轮重试", zap.String("order_no", exceptions[index].OrderNo), zap.Error(err))
|
||
continue
|
||
}
|
||
result.Refunded++
|
||
}
|
||
return result, nil
|
||
}
|
||
|
||
func (s *ExtensionService) recoverPending(ctx context.Context, order *model.PackageSilenceExtensionOrder, now time.Time) (string, error) {
|
||
var payments []model.Payment
|
||
if err := s.db.WithContext(ctx).Where("order_type = ? AND order_id = ? AND status = ?", constants.PaymentOrderTypeSilenceExtension, order.ID, model.PaymentRecordStatusPending).
|
||
Order("id DESC").Find(&payments).Error; err != nil {
|
||
return "", errors.Wrap(errors.CodeDatabaseError, err, "查询延期支付单失败")
|
||
}
|
||
expired := order.ExpireAt != nil && now.After(*order.ExpireAt)
|
||
if len(payments) == 0 {
|
||
if expired {
|
||
return agentrechargeApp.OnlinePaymentStateClosed, s.closeOrder(ctx, order.ID, constants.SilenceExtensionOrderCloseReasonTimeout)
|
||
}
|
||
return agentrechargeApp.OnlinePaymentStatePending, nil
|
||
}
|
||
allClosed := true
|
||
for index := range payments {
|
||
payment := &payments[index]
|
||
state, query, err := s.queryPayment(ctx, payment)
|
||
if err != nil {
|
||
return "", err
|
||
}
|
||
switch state {
|
||
case agentrechargeApp.OnlinePaymentStatePaid:
|
||
paidAt := now
|
||
if query.PaidAt != nil {
|
||
paidAt = *query.PaidAt
|
||
}
|
||
return state, s.ConfirmPayment(ctx, PaymentConfirmCommand{
|
||
PaymentNo: payment.PaymentNo, ThirdPartyTradeNo: query.ThirdPartyTradeNo, Amount: query.Amount, PaidAt: paidAt,
|
||
})
|
||
case agentrechargeApp.OnlinePaymentStateClosed:
|
||
case agentrechargeApp.OnlinePaymentStateNotFound:
|
||
// 渠道没有这笔订单:过支付截止后已不可能再支付,按关闭处理;未过期时可能尚未同步,继续等待。
|
||
if !expired {
|
||
allClosed = false
|
||
}
|
||
default:
|
||
allClosed = false
|
||
}
|
||
}
|
||
if allClosed {
|
||
return agentrechargeApp.OnlinePaymentStateClosed, s.closeOrder(ctx, order.ID, constants.SilenceExtensionOrderCloseReasonTimeout)
|
||
}
|
||
return agentrechargeApp.OnlinePaymentStatePending, nil
|
||
}
|