相关问题优化以及新功能开发

迁移 155- 157

pkg/constants/constants.go

@@ -67,6 +67,9 @@ const (
 	TaskTypePackageQueueActivation = "package:queue:activation" // 主套餐排队激活
 	TaskTypePackageDataReset       = "package:data:reset"       // 套餐流量重置
 
+	// 订单套餐失效任务类型
+	TaskTypeOrderPackageInvalidate = "order:package:invalidate" // 批量失效订单套餐
+
 	// 订单超时任务类型
 	TaskTypeOrderExpire               = "order:expire"                      // 订单超时自动取消
 	TaskTypeAutoPurchaseAfterRecharge = "task:auto_purchase_after_recharge" // 充值后自动购包
@@ -194,6 +197,7 @@ const (
 	QueuePackageFirstActivation = TaskTypePackageFirstActivation    // 首次实名激活任务队列
 	QueuePackageQueueActivation = TaskTypePackageQueueActivation    // 主套餐排队激活任务队列
 	QueuePackageDataReset       = TaskTypePackageDataReset          // 套餐流量重置任务队列
+	QueueOrderPackageInvalidate = TaskTypeOrderPackageInvalidate    // 批量失效订单套餐任务队列
 	QueueOrderExpire            = TaskTypeOrderExpire               // 订单超时取消任务队列
 	QueueAutoPurchase           = TaskTypeAutoPurchaseAfterRecharge // 充值后自动购包任务队列
 	QueueAlertCheck             = TaskTypeAlertCheck                // 告警检查任务队列
@@ -244,6 +248,8 @@ func QueueForTaskType(taskType string) string {
 		return QueuePackageQueueActivation
 	case TaskTypePackageDataReset:
 		return QueuePackageDataReset
+	case TaskTypeOrderPackageInvalidate:
+		return QueueOrderPackageInvalidate
 	case TaskTypeOrderExpire:
 		return QueueOrderExpire
 	case TaskTypeAutoPurchaseAfterRecharge:
@@ -268,6 +274,7 @@ func DefaultTaskQueueWeights() map[string]int {
 		QueueAutoPurchase:           5,
 		QueuePackageFirstActivation: 5,
 		QueuePackageQueueActivation: 5,
+		QueueOrderPackageInvalidate: 5,
 		QueueOrderExpire:            4,
 		QueueEmailSend:              4,
 		QueueExportDispatch:         4,

pkg/constants/iot.go

@@ -60,9 +60,11 @@ const (
 	GatewayCardStatusReady             = "准备"     // 网关卡状态：准备
 	GatewayCardStatusNormal            = "正常"     // 网关卡状态：正常
 	GatewayCardStatusStopped           = "停机"     // 网关卡状态：停机
-	GatewayCardExtendPendingActivation = "待激活"    // 网关扩展状态：待激活
-	GatewayCardExtendMachineSeparated  = "机卡分离停机" // 网关扩展状态：机卡分离停机
+	GatewayCardExtendPendingActivation     = "待激活"    // 网关扩展状态：待激活
+	GatewayCardExtendMachineSeparated      = "机卡分离停机" // 网关扩展状态：机卡分离停机
 	GatewayCardStartExtendMachineSeparated = "2"         // 机卡分离复机时上传给运营商的 extend 值
+	GatewayCardExtendRiskStop              = "风险停机"   // 网关扩展状态：运营商风险停机（独立卡不允许复机）
+	GatewayCardExtendCancelled             = "已销户"    // 网关扩展状态：已销户（独立卡不允许复机）
 )
 
 // IoT 卡停机原因

pkg/openapi/handlers.go

@@ -64,6 +64,7 @@ func BuildDocHandlers() *bootstrap.Handlers {
 		WechatConfig:                admin.NewWechatConfigHandler(nil),
 		AgentRecharge:               admin.NewAgentRechargeHandler(nil, nil),
 		Refund:                      admin.NewRefundHandler(nil),
+		OrderPackageInvalidate:      admin.NewOrderPackageInvalidateHandler(nil),
 		ClientWechat:                app.NewClientWechatHandler(nil, nil, nil),
 		SuperAdmin:                  admin.NewSuperAdminHandler(nil),
 		AgentOpenAPI:                openapiHandler.NewHandler(nil, nil),

pkg/queue/handler.go

@@ -65,6 +65,7 @@ func (h *Handler) RegisterHandlers() *asynq.ServeMux {
 
 	h.registerIotCardImportHandler()
 	h.registerDeviceImportHandler()
+	h.registerOrderPackageInvalidateHandler()
 	h.registerExportHandlers()
 	h.registerCommissionStatsHandlers()
 	h.registerCommissionCalculationHandler()
@@ -97,6 +98,18 @@ func (h *Handler) registerIotCardImportHandler() {
 	h.logger.Info("注册 IoT 卡导入任务处理器", zap.String("task_type", constants.TaskTypeIotCardImport))
 }
 
+func (h *Handler) registerOrderPackageInvalidateHandler() {
+	orderPkgHandler := task.NewOrderPackageInvalidateHandler(
+		h.workerResult.Stores.OrderPackageInvalidateTask,
+		h.workerResult.Stores.Order,
+		h.workerResult.Stores.PackageUsage,
+		h.storage,
+		h.logger,
+	)
+	h.mux.HandleFunc(constants.TaskTypeOrderPackageInvalidate, orderPkgHandler.Handle)
+	h.logger.Info("注册订单套餐批量失效任务处理器", zap.String("task_type", constants.TaskTypeOrderPackageInvalidate))
+}
+
 func (h *Handler) registerDeviceImportHandler() {
 	deviceImportHandler := task.NewDeviceImportHandler(
 		h.db,

pkg/queue/types.go

@@ -46,8 +46,9 @@ type WorkerStores struct {
 	AgentWalletTransaction    *postgres.AgentWalletTransactionStore
 	AssetWallet               *postgres.AssetWalletStore
 	AssetIdentifier           *postgres.AssetIdentifierStore
-	PersonalCustomer          *postgres.PersonalCustomerStore
-	PersonalCustomerPhone     *postgres.PersonalCustomerPhoneStore
+	PersonalCustomer           *postgres.PersonalCustomerStore
+	PersonalCustomerPhone      *postgres.PersonalCustomerPhoneStore
+	OrderPackageInvalidateTask *postgres.OrderPackageInvalidateTaskStore
 }
 
 // WorkerServices Worker 侧所有 Service 的集合