huang
8980e6d999
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m11s
问题一：protect 轮询任务从未被调度器初始化入队 PollingConfig 新增 protect_check_interval 字段（NULL=不参与）， 调度器 initCardsBatch/initCardPolling/requeueCard 补全 protect 队列 初始化逻辑，IotCard 新增 last_protect_check_at 记录上次检查时间。 迁移文件：000102_add_polling_protect_fields 问题二：设备套餐流量耗尽时绑定卡未被停机 UsageService.checkAndTriggerSuspension 新增 carrier_type=device 分支， 通过 DeviceSimBindingStore.ListByDeviceID 查询绑定卡，对每张卡异步 触发 CheckAndStopCard，同步注入 Bootstrap 依赖。 问题三：主套餐过期后不立即停机，依赖下次轮询兜底 PackageActivationHandler.processExpiredPackage 在 updateCarrierSuspended Status 后，若载体无后续生效套餐，立即异步调用 CheckAndStopCard（iot_card 类型直接触发，device 类型遍历绑定卡），消除停机延迟窗口。 Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
124 lines
3.7 KiB
Go
124 lines
3.7 KiB
Go
package bootstrap
|
|
|
|
import (
|
|
"github.com/break/junhong_cmp_fiber/internal/service/commission_calculation"
|
|
"github.com/break/junhong_cmp_fiber/internal/service/commission_stats"
|
|
iotCardSvc "github.com/break/junhong_cmp_fiber/internal/service/iot_card"
|
|
orderSvc "github.com/break/junhong_cmp_fiber/internal/service/order"
|
|
packagepkg "github.com/break/junhong_cmp_fiber/internal/service/package"
|
|
pollingSvc "github.com/break/junhong_cmp_fiber/internal/service/polling"
|
|
"github.com/break/junhong_cmp_fiber/pkg/queue"
|
|
)
|
|
|
|
type workerServices struct {
|
|
CommissionCalculation *commission_calculation.Service
|
|
CommissionStats *commission_stats.Service
|
|
UsageService *packagepkg.UsageService
|
|
ActivationService *packagepkg.ActivationService
|
|
ResetService *packagepkg.ResetService
|
|
AlertService *pollingSvc.AlertService
|
|
CleanupService *pollingSvc.CleanupService
|
|
}
|
|
|
|
func initWorkerServices(stores *queue.WorkerStores, deps *WorkerDependencies) *queue.WorkerServices {
|
|
commissionStatsService := commission_stats.New(stores.ShopSeriesCommissionStats)
|
|
|
|
commissionCalculationService := commission_calculation.New(
|
|
deps.DB,
|
|
stores.CommissionRecord,
|
|
stores.Shop,
|
|
stores.ShopPackageAllocation,
|
|
stores.ShopSeriesAllocation,
|
|
stores.PackageSeries,
|
|
stores.IotCard,
|
|
stores.Device,
|
|
stores.AgentWallet,
|
|
stores.AgentWalletTransaction,
|
|
stores.Order,
|
|
stores.OrderItem,
|
|
stores.Package,
|
|
stores.ShopSeriesCommissionStats,
|
|
commissionStatsService,
|
|
deps.Logger,
|
|
)
|
|
|
|
usageService := packagepkg.NewUsageService(
|
|
deps.DB,
|
|
deps.Redis,
|
|
stores.PackageUsage,
|
|
stores.PackageUsageDailyRecord,
|
|
stores.DeviceSimBinding,
|
|
deps.Logger,
|
|
)
|
|
|
|
activationService := packagepkg.NewActivationService(
|
|
deps.DB,
|
|
deps.Redis,
|
|
stores.PackageUsage,
|
|
stores.Package,
|
|
stores.PackageUsageDailyRecord,
|
|
deps.Logger,
|
|
)
|
|
|
|
resetService := packagepkg.NewResetService(
|
|
deps.DB,
|
|
deps.Redis,
|
|
stores.PackageUsage,
|
|
deps.Logger,
|
|
)
|
|
|
|
alertService := pollingSvc.NewAlertService(
|
|
stores.PollingAlertRule,
|
|
stores.PollingAlertHistory,
|
|
deps.Redis,
|
|
deps.Logger,
|
|
)
|
|
|
|
cleanupService := pollingSvc.NewCleanupService(
|
|
stores.DataCleanupConfig,
|
|
stores.DataCleanupLog,
|
|
deps.Logger,
|
|
)
|
|
|
|
// 初始化订单服务（仅用于超时自动取消，不需要微信支付和队列客户端）
|
|
orderService := orderSvc.New(
|
|
deps.DB,
|
|
deps.Redis,
|
|
stores.Order,
|
|
stores.OrderItem,
|
|
stores.AgentWallet,
|
|
stores.AssetWallet,
|
|
nil, // purchaseValidationService: 超时取消不需要
|
|
stores.ShopPackageAllocation,
|
|
stores.ShopSeriesAllocation,
|
|
stores.IotCard,
|
|
stores.Device,
|
|
stores.PackageSeries,
|
|
stores.PackageUsage,
|
|
stores.Package,
|
|
nil, // wechatConfigService: 超时取消不需要
|
|
nil, // wechatPayment: 超时取消不需要
|
|
nil, // queueClient: 超时取消不触发分佣
|
|
deps.Logger,
|
|
)
|
|
|
|
// 创建停复机服务并注入回调：流量耗尽自动停机、套餐激活/重置/支付后自动复机
|
|
stopResumeService := iotCardSvc.NewStopResumeService(deps.DB, deps.Redis, stores.IotCard, stores.DeviceSimBinding, deps.GatewayClient, deps.Logger)
|
|
usageService.SetStopResumeCallback(stopResumeService)
|
|
activationService.SetResumeCallback(stopResumeService)
|
|
orderService.SetResumeCallback(stopResumeService)
|
|
resetService.SetResumeCallback(stopResumeService)
|
|
|
|
return &queue.WorkerServices{
|
|
CommissionCalculation: commissionCalculationService,
|
|
CommissionStats: commissionStatsService,
|
|
UsageService: usageService,
|
|
ActivationService: activationService,
|
|
ResetService: resetService,
|
|
AlertService: alertService,
|
|
CleanupService: cleanupService,
|
|
StopResumeService: stopResumeService,
|
|
OrderExpirer: orderService,
|
|
}
|
|
}
|