From fe77d9ca728622b0737880d539ab4675e738fc1e Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 16 Mar 2026 15:43:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B3=A8=E5=86=8C=20AssetWallet=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=88=B0=20Bootstrap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode) Co-authored-by: Sisyphus --- internal/bootstrap/handlers.go | 1 + internal/bootstrap/services.go | 7 +++++-- internal/bootstrap/stores.go | 16 ++++++++-------- internal/bootstrap/types.go | 1 + internal/bootstrap/worker_services.go | 2 +- internal/bootstrap/worker_stores.go | 6 +++--- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/internal/bootstrap/handlers.go b/internal/bootstrap/handlers.go index eaf5951..fe21ca7 100644 --- a/internal/bootstrap/handlers.go +++ b/internal/bootstrap/handlers.go @@ -56,5 +56,6 @@ func initHandlers(svc *services, deps *Dependencies) *Handlers { PollingCleanup: admin.NewPollingCleanupHandler(svc.PollingCleanup), PollingManualTrigger: admin.NewPollingManualTriggerHandler(svc.PollingManualTrigger), Asset: admin.NewAssetHandler(svc.Asset, svc.Device, svc.StopResumeService), + AssetWallet: admin.NewAssetWalletHandler(svc.AssetWallet), } } diff --git a/internal/bootstrap/services.go b/internal/bootstrap/services.go index 372d896..1cc6e1c 100644 --- a/internal/bootstrap/services.go +++ b/internal/bootstrap/services.go @@ -13,6 +13,7 @@ import ( commissionWithdrawalSettingSvc "github.com/break/junhong_cmp_fiber/internal/service/commission_withdrawal_setting" assetSvc "github.com/break/junhong_cmp_fiber/internal/service/asset" + assetWalletSvc "github.com/break/junhong_cmp_fiber/internal/service/asset_wallet" deviceSvc "github.com/break/junhong_cmp_fiber/internal/service/device" deviceImportSvc "github.com/break/junhong_cmp_fiber/internal/service/device_import" enterpriseSvc "github.com/break/junhong_cmp_fiber/internal/service/enterprise" @@ -79,6 +80,7 @@ type services struct { PollingCleanup *pollingSvc.CleanupService PollingManualTrigger *pollingSvc.ManualTriggerService Asset *assetSvc.Service + AssetWallet *assetWalletSvc.Service StopResumeService *iotCardSvc.StopResumeService } @@ -140,8 +142,8 @@ func initServices(s *stores, deps *Dependencies) *services { ShopSeriesGrant: shopSeriesGrantSvc.New(deps.DB, s.ShopSeriesAllocation, s.ShopPackageAllocation, s.ShopPackageAllocationPriceHistory, s.Shop, s.Package, s.PackageSeries, deps.Logger), CommissionStats: commissionStatsSvc.New(s.ShopSeriesCommissionStats), PurchaseValidation: purchaseValidation, - Order: orderSvc.New(deps.DB, deps.Redis, s.Order, s.OrderItem, s.AgentWallet, s.CardWallet, purchaseValidation, s.ShopPackageAllocation, s.ShopSeriesAllocation, s.IotCard, s.Device, s.PackageSeries, s.PackageUsage, s.Package, deps.WechatPayment, deps.QueueClient, deps.Logger), - Recharge: rechargeSvc.New(deps.DB, s.CardRecharge, s.CardWallet, s.CardWalletTransaction, s.IotCard, s.Device, s.ShopSeriesAllocation, s.PackageSeries, s.CommissionRecord, deps.Logger), + Order: orderSvc.New(deps.DB, deps.Redis, s.Order, s.OrderItem, s.AgentWallet, s.AssetWallet, purchaseValidation, s.ShopPackageAllocation, s.ShopSeriesAllocation, s.IotCard, s.Device, s.PackageSeries, s.PackageUsage, s.Package, deps.WechatPayment, deps.QueueClient, deps.Logger), + Recharge: rechargeSvc.New(deps.DB, s.AssetRecharge, s.AssetWallet, s.AssetWalletTransaction, s.IotCard, s.Device, s.ShopSeriesAllocation, s.PackageSeries, s.CommissionRecord, deps.Logger), PollingConfig: pollingSvc.NewConfigService(s.PollingConfig), PollingConcurrency: pollingSvc.NewConcurrencyService(s.PollingConcurrencyConfig, deps.Redis), PollingMonitoring: pollingSvc.NewMonitoringService(deps.Redis), @@ -149,6 +151,7 @@ func initServices(s *stores, deps *Dependencies) *services { PollingCleanup: pollingSvc.NewCleanupService(s.DataCleanupConfig, s.DataCleanupLog, deps.Logger), PollingManualTrigger: pollingSvc.NewManualTriggerService(s.PollingManualTriggerLog, s.IotCard, deps.Redis, deps.Logger), Asset: assetSvc.New(deps.DB, s.Device, s.IotCard, s.PackageUsage, s.Package, s.PackageSeries, s.DeviceSimBinding, s.Shop, deps.Redis, iotCard), + AssetWallet: assetWalletSvc.New(s.AssetWallet, s.AssetWalletTransaction), StopResumeService: iotCardSvc.NewStopResumeService(deps.DB, deps.Redis, s.IotCard, s.DeviceSimBinding, deps.GatewayClient, deps.Logger), } } diff --git a/internal/bootstrap/stores.go b/internal/bootstrap/stores.go index 316534c..d88da56 100644 --- a/internal/bootstrap/stores.go +++ b/internal/bootstrap/stores.go @@ -49,10 +49,10 @@ type stores struct { AgentWallet *postgres.AgentWalletStore AgentWalletTransaction *postgres.AgentWalletTransactionStore AgentRecharge *postgres.AgentRechargeStore - // 卡钱包系统 - CardWallet *postgres.CardWalletStore - CardWalletTransaction *postgres.CardWalletTransactionStore - CardRecharge *postgres.CardRechargeStore + // 资产钱包系统 + AssetWallet *postgres.AssetWalletStore + AssetWalletTransaction *postgres.AssetWalletTransactionStore + AssetRecharge *postgres.AssetRechargeStore } func initStores(deps *Dependencies) *stores { @@ -101,9 +101,9 @@ func initStores(deps *Dependencies) *stores { AgentWallet: postgres.NewAgentWalletStore(deps.DB, deps.Redis), AgentWalletTransaction: postgres.NewAgentWalletTransactionStore(deps.DB, deps.Redis), AgentRecharge: postgres.NewAgentRechargeStore(deps.DB, deps.Redis), - // 卡钱包系统 - CardWallet: postgres.NewCardWalletStore(deps.DB, deps.Redis), - CardWalletTransaction: postgres.NewCardWalletTransactionStore(deps.DB, deps.Redis), - CardRecharge: postgres.NewCardRechargeStore(deps.DB, deps.Redis), + // 资产钱包系统 + AssetWallet: postgres.NewAssetWalletStore(deps.DB, deps.Redis), + AssetWalletTransaction: postgres.NewAssetWalletTransactionStore(deps.DB, deps.Redis), + AssetRecharge: postgres.NewAssetRechargeStore(deps.DB, deps.Redis), } } diff --git a/internal/bootstrap/types.go b/internal/bootstrap/types.go index d50d61f..c70d26c 100644 --- a/internal/bootstrap/types.go +++ b/internal/bootstrap/types.go @@ -54,6 +54,7 @@ type Handlers struct { PollingCleanup *admin.PollingCleanupHandler PollingManualTrigger *admin.PollingManualTriggerHandler Asset *admin.AssetHandler + AssetWallet *admin.AssetWalletHandler } // Middlewares 封装所有中间件 diff --git a/internal/bootstrap/worker_services.go b/internal/bootstrap/worker_services.go index c6afd3d..4511490 100644 --- a/internal/bootstrap/worker_services.go +++ b/internal/bootstrap/worker_services.go @@ -85,7 +85,7 @@ func initWorkerServices(stores *queue.WorkerStores, deps *WorkerDependencies) *q stores.Order, stores.OrderItem, stores.AgentWallet, - stores.CardWallet, + stores.AssetWallet, nil, // purchaseValidationService: 超时取消不需要 stores.ShopPackageAllocation, stores.ShopSeriesAllocation, diff --git a/internal/bootstrap/worker_stores.go b/internal/bootstrap/worker_stores.go index ea0ce79..17a03ca 100644 --- a/internal/bootstrap/worker_stores.go +++ b/internal/bootstrap/worker_stores.go @@ -28,7 +28,7 @@ type workerStores struct { DataCleanupLog *postgres.DataCleanupLogStore AgentWallet *postgres.AgentWalletStore AgentWalletTransaction *postgres.AgentWalletTransactionStore - CardWallet *postgres.CardWalletStore + AssetWallet *postgres.AssetWalletStore } func initWorkerStores(deps *WorkerDependencies) *queue.WorkerStores { @@ -55,7 +55,7 @@ func initWorkerStores(deps *WorkerDependencies) *queue.WorkerStores { DataCleanupLog: postgres.NewDataCleanupLogStore(deps.DB), AgentWallet: postgres.NewAgentWalletStore(deps.DB, deps.Redis), AgentWalletTransaction: postgres.NewAgentWalletTransactionStore(deps.DB, deps.Redis), - CardWallet: postgres.NewCardWalletStore(deps.DB, deps.Redis), + AssetWallet: postgres.NewAssetWalletStore(deps.DB, deps.Redis), } return &queue.WorkerStores{ @@ -81,6 +81,6 @@ func initWorkerStores(deps *WorkerDependencies) *queue.WorkerStores { DataCleanupLog: stores.DataCleanupLog, AgentWallet: stores.AgentWallet, AgentWalletTransaction: stores.AgentWalletTransaction, - CardWallet: stores.CardWallet, + AssetWallet: stores.AssetWallet, } }