暂存一下,防止丢失

2026-07-24 16:07:18 +08:00
parent 5d6e23f1a5
commit a18ed8bc8d
180 changed files with 13597 additions and 1986 deletions
--- a/internal/bootstrap/handlers.go
+++ b/internal/bootstrap/handlers.go
@@ -1,7 +1,11 @@
 package bootstrap

 import (
+	notificationApp "github.com/break/junhong_cmp_fiber/internal/application/notification"
+	roleApp "github.com/break/junhong_cmp_fiber/internal/application/role"
+	shopApp "github.com/break/junhong_cmp_fiber/internal/application/shop"
 	systemConfigApp "github.com/break/junhong_cmp_fiber/internal/application/systemconfig"
+	walletApp "github.com/break/junhong_cmp_fiber/internal/application/wallet"
 	"github.com/break/junhong_cmp_fiber/internal/handler/admin"
 	"github.com/break/junhong_cmp_fiber/internal/handler/app"
 	authHandler "github.com/break/junhong_cmp_fiber/internal/handler/auth"
@@ -11,7 +15,9 @@ import (
 	pollingPkg "github.com/break/junhong_cmp_fiber/internal/polling"
 	assetQuery "github.com/break/junhong_cmp_fiber/internal/query/asset"
 	exchangeQuery "github.com/break/junhong_cmp_fiber/internal/query/exchange"
+	notificationQuery "github.com/break/junhong_cmp_fiber/internal/query/notification"
 	packageExpiryQuery "github.com/break/junhong_cmp_fiber/internal/query/packageexpiry"
+	shopQuery "github.com/break/junhong_cmp_fiber/internal/query/shop"
 	systemConfigQuery "github.com/break/junhong_cmp_fiber/internal/query/systemconfig"
 	clientOrderSvc "github.com/break/junhong_cmp_fiber/internal/service/client_order"
 	pollingSvcPkg "github.com/break/junhong_cmp_fiber/internal/service/polling"
@@ -95,23 +101,39 @@ func initHandlers(svc *services, deps *Dependencies) *Handlers {
 	)

 	return &Handlers{
-		Auth:                        authHandler.NewHandler(svc.Auth, validate),
-		Account:                     admin.NewAccountHandler(svc.Account),
-		Role:                        admin.NewRoleHandler(svc.Role, validate),
-		Permission:                  admin.NewPermissionHandler(svc.Permission),
-		PersonalCustomer:            app.NewPersonalCustomerHandler(svc.PersonalCustomer, deps.Logger),
-		ClientAuth:                  app.NewClientAuthHandler(svc.ClientAuth, deps.Logger),
-		ClientAsset:                 app.NewClientAssetHandler(svc.Asset, svc.CustomerBinding, assetWalletStore, packageStore, shopPackageAllocationStore, iotCardStore, deviceStore, deps.DB, deps.Logger),
-		ClientWallet:                app.NewClientWalletHandler(svc.Asset, svc.CustomerBinding, assetWalletStore, assetWalletTransactionStore, rechargeOrderStore, paymentStore, svc.Recharge, personalCustomerOpenIDStore, svc.WechatConfig, deps.Redis, deps.Logger, deps.DB, iotCardStore, deviceStore),
-		ClientOrder:                 app.NewClientOrderHandler(clientOrderService, deps.Logger),
-		ClientExchange:              app.NewClientExchangeHandler(svc.Exchange),
-		ClientRealname:              app.NewClientRealnameHandler(svc.Asset, svc.CustomerBinding, iotCardStore, deviceSimBindingStore, carrierStore, deps.GatewayClient, deps.Logger, svc.PollingManualTrigger),
-		ClientDevice:                app.NewClientDeviceHandler(svc.Asset, svc.CustomerBinding, deviceStore, deviceSimBindingStore, iotCardStore, deps.GatewayClient, deps.Logger),
-		ClientRechargeOrder:         app.NewClientRechargeOrderHandler(rechargeOrderStore, paymentStore, deps.Logger),
-		Shop:                        admin.NewShopHandler(svc.Shop, validate),
-		ShopRole:                    admin.NewShopRoleHandler(svc.Shop),
-		AdminAuth:                   admin.NewAuthHandler(svc.Auth, validate),
-		ShopCommission:              admin.NewShopCommissionHandler(svc.ShopCommission),
+		Auth:    authHandler.NewHandler(svc.Auth, validate),
+		Account: admin.NewAccountHandler(svc.Account),
+		Role: func() *admin.RoleHandler {
+			handler := admin.NewRoleHandler(svc.Role, validate)
+			handler.SetDefaultCreditService(roleApp.NewDefaultCreditService(deps.DB, svc.Permission))
+			return handler
+		}(),
+		Permission:          admin.NewPermissionHandler(svc.Permission),
+		PersonalCustomer:    app.NewPersonalCustomerHandler(svc.PersonalCustomer, deps.Logger),
+		ClientAuth:          app.NewClientAuthHandler(svc.ClientAuth, deps.Logger),
+		ClientAsset:         app.NewClientAssetHandler(svc.Asset, svc.CustomerBinding, assetWalletStore, packageStore, shopPackageAllocationStore, iotCardStore, deviceStore, deps.DB, deps.Logger),
+		ClientWallet:        app.NewClientWalletHandler(svc.Asset, svc.CustomerBinding, assetWalletStore, assetWalletTransactionStore, rechargeOrderStore, paymentStore, svc.Recharge, personalCustomerOpenIDStore, svc.WechatConfig, deps.Redis, deps.Logger, deps.DB, iotCardStore, deviceStore),
+		ClientOrder:         app.NewClientOrderHandler(clientOrderService, deps.Logger),
+		ClientExchange:      app.NewClientExchangeHandler(svc.Exchange),
+		ClientRealname:      app.NewClientRealnameHandler(svc.Asset, svc.CustomerBinding, iotCardStore, deviceSimBindingStore, carrierStore, deps.GatewayClient, deps.Logger, svc.PollingManualTrigger),
+		ClientDevice:        app.NewClientDeviceHandler(svc.Asset, svc.CustomerBinding, deviceStore, deviceSimBindingStore, iotCardStore, deps.GatewayClient, deps.Logger),
+		ClientRechargeOrder: app.NewClientRechargeOrderHandler(rechargeOrderStore, paymentStore, deps.Logger),
+		ClientNotification:  app.NewClientNotificationHandler(notificationQuery.NewQuery(deps.DB), notificationApp.NewReadService(deps.DB), validate),
+		Shop: func() *admin.ShopHandler {
+			handler := admin.NewShopHandler(svc.Shop, validate)
+			handler.SetCreateService(shopApp.NewCreateService(deps.DB))
+			handler.SetUpdateService(shopApp.NewUpdateService(deps.DB))
+			handler.SetBusinessOwnerQuery(shopQuery.NewBusinessOwnerQuery(deps.DB))
+			handler.SetChangeCreditService(walletApp.NewChangeCreditService(deps.DB))
+			return handler
+		}(),
+		ShopRole:  admin.NewShopRoleHandler(svc.Shop),
+		AdminAuth: admin.NewAuthHandler(svc.Auth, validate),
+		ShopCommission: func() *admin.ShopCommissionHandler {
+			handler := admin.NewShopCommissionHandler(svc.ShopCommission)
+			handler.SetFundSummaryQuery(shopQuery.NewFundSummaryQuery(deps.DB))
+			return handler
+		}(),
 		CommissionWithdrawal:        admin.NewCommissionWithdrawalHandler(svc.CommissionWithdrawal, validate),
 		CommissionWithdrawalSetting: admin.NewCommissionWithdrawalSettingHandler(svc.CommissionWithdrawalSetting),
 		Enterprise:                  admin.NewEnterpriseHandler(svc.Enterprise),
@@ -121,6 +143,7 @@ func initHandlers(svc *services, deps *Dependencies) *Handlers {
 		IotCard:                     admin.NewIotCardHandler(svc.IotCard),
 		IotCardImport:               admin.NewIotCardImportHandler(svc.IotCardImport),
 		ExportTask:                  admin.NewExportTaskHandler(svc.ExportTask),
+		Notification:                admin.NewNotificationHandler(notificationQuery.NewQuery(deps.DB), notificationApp.NewReadService(deps.DB), validate),
 		Device:                      admin.NewDeviceHandler(svc.Device),
 		DeviceImport:                admin.NewDeviceImportHandler(svc.DeviceImport),
 		AssetAllocationRecord:       admin.NewAssetAllocationRecordHandler(svc.AssetAllocationRecord),
--- a/internal/bootstrap/services.go
+++ b/internal/bootstrap/services.go
@@ -5,6 +5,11 @@ import (

 	"go.uber.org/zap"

+	cardObservationApp "github.com/break/junhong_cmp_fiber/internal/application/cardobservation"
+	walletapp "github.com/break/junhong_cmp_fiber/internal/application/wallet"
+	cardObservationInfra "github.com/break/junhong_cmp_fiber/internal/infrastructure/cardobservation"
+	"github.com/break/junhong_cmp_fiber/internal/infrastructure/messaging/outbox"
+	walletinfra "github.com/break/junhong_cmp_fiber/internal/infrastructure/wallet"
 	"github.com/break/junhong_cmp_fiber/internal/polling"
 	accountSvc "github.com/break/junhong_cmp_fiber/internal/service/account"
 	accountAuditSvc "github.com/break/junhong_cmp_fiber/internal/service/account_audit"
@@ -137,6 +142,12 @@ func initServices(s *stores, deps *Dependencies) *services {
 		deps.Logger,
 		assetAudit,
 	)
+	cardObservationOutbox := outbox.NewRepository()
+	iotCard.SetCardObservationService(cardObservationApp.NewService(
+		deps.DB,
+		cardObservationInfra.NewEventWriter(cardObservationOutbox),
+		cardObservationInfra.NewCacheInvalidator(deps.Redis, deps.Logger),
+	))
 	// 使用 PollingLifecycleService 替代 APICallback：通过分片队列准确操作（修复 api_callback.go 遗漏 protect 队列的 Bug3）
 	pollingConfigStore := postgres.NewPollingConfigStore(deps.DB)
 	pollingConfigMgr := polling.NewPollingConfigManager(pollingConfigStore, deps.Redis, deps.Logger)
@@ -147,10 +158,6 @@ func initServices(s *stores, deps *Dependencies) *services {
 	pollingQueueMgr := polling.NewPollingQueueManager(deps.Redis, constants.PollingShardCount, deps.Logger)
 	pollingLifecycleSvc := polling.NewPollingLifecycleService(pollingQueueMgr, pollingConfigMgr, s.IotCard, s.DeviceSimBinding, s.Device, deps.Logger)
 	iotCard.SetPollingCallback(pollingLifecycleSvc)
-	// 注入流量扣减回调，使手动刷新资产时能触发套餐流量扣减
-	usageService := packageSvc.NewUsageService(deps.DB, deps.Redis, s.PackageUsage, s.PackageUsageDailyRecord, s.DeviceSimBinding, deps.Logger)
-	iotCard.SetDataDeductor(usageService)
-
 	// 创建支付配置服务（Order 和 Recharge 依赖）
 	wechatConfig := wechatConfigSvc.New(s.WechatConfig, s.Order, s.RechargeOrder, s.AgentRecharge, s.Payment, accountAudit, deps.Redis, deps.Logger)

@@ -203,6 +210,38 @@ func initServices(s *stores, deps *Dependencies) *services {
 	shopCommission := shopCommissionSvc.New(s.Shop, s.Account, s.AgentWallet, s.CommissionWithdrawalRequest, s.CommissionWithdrawalSetting, s.CommissionRecord, s.AgentWalletTransaction, deps.DB, deps.Logger)
 	packageService := packageSvc.New(s.Package, s.PackageSeries, s.ShopPackageAllocation, s.ShopSeriesAllocation)
 	orderService := orderSvc.New(deps.DB, deps.Redis, s.Order, s.OrderItem, s.AgentWallet, s.AssetWallet, s.Payment, purchaseValidation, s.ShopPackageAllocation, s.ShopSeriesAllocation, s.IotCard, s.Device, s.PackageSeries, s.PackageUsage, s.Package, wechatConfig, deps.WechatPayment, paymentLoader, deps.QueueClient, deps.Logger, s.AssetIdentifier, s.PersonalCustomer, s.PersonalCustomerPhone)
+	walletOutbox := outbox.NewRepository()
+	walletDebitEvents := walletinfra.NewDebitEventWriter(walletOutbox)
+	orderService.SetAgentWalletDebitService(walletapp.NewDebitService(walletDebitEvents, nil))
+	orderService.SetAgentWalletReservationService(walletapp.NewReservationService(walletinfra.NewReservationEventWriter(walletOutbox), walletDebitEvents, nil))
+	agentRechargeService := agentRechargeSvc.New(
+		deps.DB,
+		s.AgentRecharge,
+		s.AgentWallet,
+		s.Shop,
+		wechatConfig,
+		accountAudit,
+		operationPassword,
+		deps.Redis,
+		deps.Logger,
+	)
+	agentRechargeService.SetAgentWalletPostingService(walletapp.NewPostingService(walletinfra.NewCreditEventWriter(walletOutbox), nil))
+	refundService := refundSvc.New(
+		deps.DB,
+		s.RefundRequest,
+		s.Order,
+		s.CommissionRecord,
+		s.AgentWallet,
+		s.AgentWalletTransaction,
+		stopResumeService,
+		device,
+		packageActivation,
+		s.IotCard,
+		s.Device,
+		s.AssetWallet,
+		deps.Logger,
+	)
+	refundService.SetAgentWalletRefundService(walletapp.NewRefundService(walletinfra.NewRefundEventWriter(walletOutbox), nil))
 	assetService := assetSvc.New(deps.DB, s.Device, s.IotCard, s.PackageUsage, s.Package, s.PackageSeries, s.DeviceSimBinding, s.Shop, deps.Redis, iotCard, deps.GatewayClient, s.AssetIdentifier, s.Order, s.OrderItem, s.ExchangeOrder, assetAudit)
 	agentOpenAPI := agentOpenAPISvc.New(assetService, packageService, orderService, shopCommission, stopResumeService, device, s.IotCard, s.PackageUsage, s.Package, s.PackageSeries, s.AgentWallet, s.DeviceSimBinding, s.Device)

@@ -227,7 +266,7 @@ func initServices(s *stores, deps *Dependencies) *services {
 			deps.Logger,
 			customerBinding,
 		),
-		Shop:                        shopSvc.New(s.Shop, s.Account, s.ShopRole, s.Role, s.AccountRole, s.AgentWallet),
+		Shop:                        shopSvc.New(s.Shop, s.Account, s.ShopRole, s.Role),
 		Auth:                        authSvc.New(s.Account, s.AccountRole, s.RolePermission, s.Permission, s.Shop, deps.TokenManager, deps.Logger),
 		ShopCommission:              shopCommission,
 		CommissionWithdrawal:        commissionWithdrawalSvc.New(deps.DB, s.Shop, s.Account, s.AgentWallet, s.AgentWalletTransaction, s.CommissionWithdrawalRequest),
@@ -284,38 +323,13 @@ func initServices(s *stores, deps *Dependencies) *services {
 		AssetWallet:                assetWalletSvc.New(s.AssetWallet, s.AssetWalletTransaction),
 		StopResumeService:          stopResumeService,
 		WechatConfig:               wechatConfig,
-		AgentRecharge: agentRechargeSvc.New(
-			deps.DB,
-			s.AgentRecharge,
-			s.AgentWallet,
-			s.AgentWalletTransaction,
-			s.Shop,
-			wechatConfig,
-			accountAudit,
-			operationPassword,
-			deps.Redis,
-			deps.Logger,
-		),
-		PackageActivation: packageActivation,
-		TrafficQuery:      trafficSvc.NewQueryService(deps.Redis, s.CardDailyUsage),
-		OperationPassword: operationPassword,
-		AgentOpenAPI:      agentOpenAPI,
-		Refund: refundSvc.New(
-			deps.DB,
-			s.RefundRequest,
-			s.Order,
-			s.CommissionRecord,
-			s.AgentWallet,
-			s.AgentWalletTransaction,
-			stopResumeService,
-			device,
-			packageActivation,
-			s.IotCard,
-			s.Device,
-			s.AssetWallet,
-			deps.Logger,
-		),
-		CustomerBinding:        customerBinding,
-		OrderPackageInvalidate: orderPackageInvalidateSvc.New(s.OrderPackageInvalidateTask, deps.QueueClient),
+		AgentRecharge:              agentRechargeService,
+		PackageActivation:          packageActivation,
+		TrafficQuery:               trafficSvc.NewQueryService(deps.Redis, s.CardDailyUsage),
+		OperationPassword:          operationPassword,
+		AgentOpenAPI:               agentOpenAPI,
+		Refund:                     refundService,
+		CustomerBinding:            customerBinding,
+		OrderPackageInvalidate:     orderPackageInvalidateSvc.New(s.OrderPackageInvalidateTask, deps.QueueClient),
 	}
 }
--- a/internal/bootstrap/types.go
+++ b/internal/bootstrap/types.go
@@ -24,6 +24,7 @@ type Handlers struct {
 	ClientRealname              *app.ClientRealnameHandler
 	ClientDevice                *app.ClientDeviceHandler
 	ClientRechargeOrder         *app.ClientRechargeOrderHandler
+	ClientNotification          *app.ClientNotificationHandler
 	Shop                        *admin.ShopHandler
 	ShopRole                    *admin.ShopRoleHandler
 	AdminAuth                   *admin.AuthHandler
@@ -37,6 +38,7 @@ type Handlers struct {
 	IotCard                     *admin.IotCardHandler
 	IotCardImport               *admin.IotCardImportHandler
 	ExportTask                  *admin.ExportTaskHandler
+	Notification                *admin.NotificationHandler
 	Device                      *admin.DeviceHandler
 	DeviceImport                *admin.DeviceImportHandler
 	AssetAllocationRecord       *admin.AssetAllocationRecordHandler
--- a/internal/bootstrap/worker_services.go
+++ b/internal/bootstrap/worker_services.go
@@ -1,6 +1,12 @@
 package bootstrap

 import (
+	cardObservationApp "github.com/break/junhong_cmp_fiber/internal/application/cardobservation"
+	walletapp "github.com/break/junhong_cmp_fiber/internal/application/wallet"
+	cardObservationInfra "github.com/break/junhong_cmp_fiber/internal/infrastructure/cardobservation"
+	"github.com/break/junhong_cmp_fiber/internal/infrastructure/integrationlog"
+	"github.com/break/junhong_cmp_fiber/internal/infrastructure/messaging/outbox"
+	walletinfra "github.com/break/junhong_cmp_fiber/internal/infrastructure/wallet"
 	assetAuditSvc "github.com/break/junhong_cmp_fiber/internal/service/asset_audit"
 	"github.com/break/junhong_cmp_fiber/internal/service/commission_calculation"
 	"github.com/break/junhong_cmp_fiber/internal/service/commission_stats"
@@ -81,6 +87,19 @@ func initWorkerServices(stores *queue.WorkerStores, deps *WorkerDependencies) *q
 		stores.DataCleanupLog,
 		deps.Logger,
 	)
+	cardObservationOutbox := outbox.NewRepository()
+	cardObservationService := cardObservationApp.NewService(
+		deps.DB,
+		cardObservationInfra.NewEventWriter(cardObservationOutbox),
+		cardObservationInfra.NewCacheInvalidator(deps.Redis, deps.Logger),
+	)
+	cardObservationIntegration := integrationlog.NewRepository(deps.DB)
+	cardObservationSeriesCoordinator := cardObservationInfra.NewSeriesCoordinator(deps.Redis)
+	cardObservationSeriesService := cardObservationApp.NewSeriesAttemptService(
+		cardObservationSeriesCoordinator,
+		cardObservationInfra.NewSeriesRunner(deps.DB, deps.GatewayClient, cardObservationService, cardObservationIntegration),
+		cardObservationInfra.NewSeriesAttemptLogger(cardObservationIntegration),
+	)

 	// 初始化订单服务（仅用于超时自动取消，不需要微信支付和队列客户端）
 	orderService := orderSvc.New(
@@ -108,6 +127,9 @@ func initWorkerServices(stores *queue.WorkerStores, deps *WorkerDependencies) *q
 		stores.PersonalCustomer,
 		stores.PersonalCustomerPhone,
 	)
+	walletOutbox := outbox.NewRepository()
+	walletDebitEvents := walletinfra.NewDebitEventWriter(walletOutbox)
+	orderService.SetAgentWalletReservationService(walletapp.NewReservationService(walletinfra.NewReservationEventWriter(walletOutbox), walletDebitEvents, nil))

 	// 创建停复机服务并注入回调：流量耗尽自动停机、套餐激活/重置/支付后自动复机
 	stopResumeService := iotCardSvc.NewStopResumeService(
@@ -125,6 +147,8 @@ func initWorkerServices(stores *queue.WorkerStores, deps *WorkerDependencies) *q
 	resetService.SetResumeCallback(stopResumeService)

 	return &queue.WorkerServices{
+		CardObservation:       cardObservationService,
+		CardObservationSeries: cardObservationSeriesService,
 		CommissionCalculation: commissionCalculationService,
 		CommissionStats:       commissionStatsService,
 		UsageService:          usageService,