huang
b18ecfeb55
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 6m29s
主要变更: - 新增 tb_shop_series_allocation 表，存储系列级别的一次性佣金配置 - ShopPackageAllocation 移除 one_time_commission_amount 字段 - PackageSeries 新增 enable_one_time_commission 字段控制是否启用一次性佣金 - 新增 /api/admin/shop-series-allocations CRUD 接口 - 佣金计算逻辑改为从 ShopSeriesAllocation 获取一次性佣金金额 - 删除废弃的 ShopSeriesOneTimeCommissionTier 模型 - OpenAPI Tag '系列分配' 和 '单套餐分配' 合并为 '套餐分配' 迁移脚本: - 000042: 重构佣金套餐模型 - 000043: 简化佣金分配 - 000044: 一次性佣金分配重构 - 000045: PackageSeries 添加 enable_one_time_commission 字段 测试: - 新增验收测试 (shop_series_allocation, commission_calculation) - 新增流程测试 (one_time_commission_chain) - 删除过时的单元测试（已被验收测试覆盖）
131 lines
9.0 KiB
Go
131 lines
9.0 KiB
Go
package bootstrap
|
|
|
|
import (
|
|
accountSvc "github.com/break/junhong_cmp_fiber/internal/service/account"
|
|
accountAuditSvc "github.com/break/junhong_cmp_fiber/internal/service/account_audit"
|
|
assetAllocationRecordSvc "github.com/break/junhong_cmp_fiber/internal/service/asset_allocation_record"
|
|
authSvc "github.com/break/junhong_cmp_fiber/internal/service/auth"
|
|
carrierSvc "github.com/break/junhong_cmp_fiber/internal/service/carrier"
|
|
commissionCalculationSvc "github.com/break/junhong_cmp_fiber/internal/service/commission_calculation"
|
|
commissionStatsSvc "github.com/break/junhong_cmp_fiber/internal/service/commission_stats"
|
|
commissionWithdrawalSvc "github.com/break/junhong_cmp_fiber/internal/service/commission_withdrawal"
|
|
commissionWithdrawalSettingSvc "github.com/break/junhong_cmp_fiber/internal/service/commission_withdrawal_setting"
|
|
|
|
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"
|
|
enterpriseCardSvc "github.com/break/junhong_cmp_fiber/internal/service/enterprise_card"
|
|
enterpriseDeviceSvc "github.com/break/junhong_cmp_fiber/internal/service/enterprise_device"
|
|
iotCardSvc "github.com/break/junhong_cmp_fiber/internal/service/iot_card"
|
|
iotCardImportSvc "github.com/break/junhong_cmp_fiber/internal/service/iot_card_import"
|
|
myCommissionSvc "github.com/break/junhong_cmp_fiber/internal/service/my_commission"
|
|
orderSvc "github.com/break/junhong_cmp_fiber/internal/service/order"
|
|
packageSvc "github.com/break/junhong_cmp_fiber/internal/service/package"
|
|
packageSeriesSvc "github.com/break/junhong_cmp_fiber/internal/service/package_series"
|
|
permissionSvc "github.com/break/junhong_cmp_fiber/internal/service/permission"
|
|
personalCustomerSvc "github.com/break/junhong_cmp_fiber/internal/service/personal_customer"
|
|
purchaseValidationSvc "github.com/break/junhong_cmp_fiber/internal/service/purchase_validation"
|
|
rechargeSvc "github.com/break/junhong_cmp_fiber/internal/service/recharge"
|
|
roleSvc "github.com/break/junhong_cmp_fiber/internal/service/role"
|
|
shopSvc "github.com/break/junhong_cmp_fiber/internal/service/shop"
|
|
|
|
shopCommissionSvc "github.com/break/junhong_cmp_fiber/internal/service/shop_commission"
|
|
shopPackageAllocationSvc "github.com/break/junhong_cmp_fiber/internal/service/shop_package_allocation"
|
|
shopPackageBatchAllocationSvc "github.com/break/junhong_cmp_fiber/internal/service/shop_package_batch_allocation"
|
|
shopPackageBatchPricingSvc "github.com/break/junhong_cmp_fiber/internal/service/shop_package_batch_pricing"
|
|
shopSeriesAllocationSvc "github.com/break/junhong_cmp_fiber/internal/service/shop_series_allocation"
|
|
)
|
|
|
|
type services struct {
|
|
Account *accountSvc.Service
|
|
AccountAudit *accountAuditSvc.Service
|
|
Role *roleSvc.Service
|
|
Permission *permissionSvc.Service
|
|
PersonalCustomer *personalCustomerSvc.Service
|
|
Shop *shopSvc.Service
|
|
Auth *authSvc.Service
|
|
ShopCommission *shopCommissionSvc.Service
|
|
CommissionWithdrawal *commissionWithdrawalSvc.Service
|
|
CommissionWithdrawalSetting *commissionWithdrawalSettingSvc.Service
|
|
CommissionCalculation *commissionCalculationSvc.Service
|
|
Enterprise *enterpriseSvc.Service
|
|
EnterpriseCard *enterpriseCardSvc.Service
|
|
EnterpriseDevice *enterpriseDeviceSvc.Service
|
|
Authorization *enterpriseCardSvc.AuthorizationService
|
|
MyCommission *myCommissionSvc.Service
|
|
IotCard *iotCardSvc.Service
|
|
IotCardImport *iotCardImportSvc.Service
|
|
Device *deviceSvc.Service
|
|
DeviceImport *deviceImportSvc.Service
|
|
AssetAllocationRecord *assetAllocationRecordSvc.Service
|
|
Carrier *carrierSvc.Service
|
|
PackageSeries *packageSeriesSvc.Service
|
|
Package *packageSvc.Service
|
|
ShopSeriesAllocation *shopSeriesAllocationSvc.Service
|
|
ShopPackageAllocation *shopPackageAllocationSvc.Service
|
|
ShopPackageBatchAllocation *shopPackageBatchAllocationSvc.Service
|
|
ShopPackageBatchPricing *shopPackageBatchPricingSvc.Service
|
|
CommissionStats *commissionStatsSvc.Service
|
|
PurchaseValidation *purchaseValidationSvc.Service
|
|
Order *orderSvc.Service
|
|
Recharge *rechargeSvc.Service
|
|
}
|
|
|
|
func initServices(s *stores, deps *Dependencies) *services {
|
|
purchaseValidation := purchaseValidationSvc.New(deps.DB, s.IotCard, s.Device, s.Package)
|
|
accountAudit := accountAuditSvc.NewService(s.AccountOperationLog)
|
|
account := accountSvc.New(s.Account, s.Role, s.AccountRole, s.ShopRole, s.Shop, s.Enterprise, accountAudit)
|
|
|
|
return &services{
|
|
Account: account,
|
|
AccountAudit: accountAudit,
|
|
Role: roleSvc.New(s.Role, s.Permission, s.RolePermission),
|
|
Permission: permissionSvc.New(s.Permission, s.AccountRole, s.RolePermission, account, deps.Redis),
|
|
PersonalCustomer: personalCustomerSvc.NewService(s.PersonalCustomer, s.PersonalCustomerPhone, deps.VerificationService, deps.JWTManager, deps.WechatOfficialAccount, deps.Logger),
|
|
Shop: shopSvc.New(s.Shop, s.Account, s.ShopRole, s.Role),
|
|
Auth: authSvc.New(s.Account, s.AccountRole, s.RolePermission, s.Permission, deps.TokenManager, deps.Logger),
|
|
ShopCommission: shopCommissionSvc.New(s.Shop, s.Account, s.Wallet, s.CommissionWithdrawalRequest, s.CommissionRecord),
|
|
CommissionWithdrawal: commissionWithdrawalSvc.New(deps.DB, s.Shop, s.Account, s.Wallet, s.WalletTransaction, s.CommissionWithdrawalRequest),
|
|
CommissionWithdrawalSetting: commissionWithdrawalSettingSvc.New(deps.DB, s.Account, s.CommissionWithdrawalSetting),
|
|
CommissionCalculation: commissionCalculationSvc.New(
|
|
deps.DB,
|
|
s.CommissionRecord,
|
|
s.Shop,
|
|
s.ShopPackageAllocation,
|
|
s.ShopSeriesAllocation,
|
|
s.PackageSeries,
|
|
s.IotCard,
|
|
s.Device,
|
|
s.Wallet,
|
|
s.WalletTransaction,
|
|
s.Order,
|
|
s.OrderItem,
|
|
s.Package,
|
|
s.ShopSeriesCommissionStats,
|
|
commissionStatsSvc.New(s.ShopSeriesCommissionStats),
|
|
deps.Logger,
|
|
),
|
|
Enterprise: enterpriseSvc.New(deps.DB, s.Enterprise, s.Shop, s.Account),
|
|
EnterpriseCard: enterpriseCardSvc.New(deps.DB, s.Enterprise, s.EnterpriseCardAuthorization),
|
|
EnterpriseDevice: enterpriseDeviceSvc.New(deps.DB, s.Enterprise, s.Device, s.DeviceSimBinding, s.EnterpriseDeviceAuthorization, s.EnterpriseCardAuthorization, deps.Logger),
|
|
Authorization: enterpriseCardSvc.NewAuthorizationService(s.Enterprise, s.IotCard, s.EnterpriseCardAuthorization, deps.Logger),
|
|
MyCommission: myCommissionSvc.New(deps.DB, s.Shop, s.Wallet, s.CommissionWithdrawalRequest, s.CommissionWithdrawalSetting, s.CommissionRecord, s.WalletTransaction),
|
|
IotCard: iotCardSvc.New(deps.DB, s.IotCard, s.Shop, s.AssetAllocationRecord, s.ShopPackageAllocation, s.ShopSeriesAllocation, s.PackageSeries, deps.GatewayClient, deps.Logger),
|
|
IotCardImport: iotCardImportSvc.New(deps.DB, s.IotCardImportTask, deps.QueueClient),
|
|
Device: deviceSvc.New(deps.DB, s.Device, s.DeviceSimBinding, s.IotCard, s.Shop, s.AssetAllocationRecord, s.ShopPackageAllocation, s.ShopSeriesAllocation, s.PackageSeries),
|
|
DeviceImport: deviceImportSvc.New(deps.DB, s.DeviceImportTask, deps.QueueClient),
|
|
AssetAllocationRecord: assetAllocationRecordSvc.New(deps.DB, s.AssetAllocationRecord, s.Shop, s.Account),
|
|
Carrier: carrierSvc.New(s.Carrier),
|
|
PackageSeries: packageSeriesSvc.New(s.PackageSeries),
|
|
Package: packageSvc.New(s.Package, s.PackageSeries, s.ShopPackageAllocation),
|
|
ShopSeriesAllocation: shopSeriesAllocationSvc.New(s.ShopSeriesAllocation, s.ShopPackageAllocation, s.Shop, s.PackageSeries),
|
|
ShopPackageAllocation: shopPackageAllocationSvc.New(s.ShopPackageAllocation, s.ShopSeriesAllocation, s.ShopPackageAllocationPriceHistory, s.Shop, s.Package, s.PackageSeries),
|
|
ShopPackageBatchAllocation: shopPackageBatchAllocationSvc.New(deps.DB, s.Package, s.ShopPackageAllocation, s.ShopSeriesAllocation, s.Shop),
|
|
ShopPackageBatchPricing: shopPackageBatchPricingSvc.New(deps.DB, s.ShopPackageAllocation, s.ShopPackageAllocationPriceHistory, s.Shop),
|
|
CommissionStats: commissionStatsSvc.New(s.ShopSeriesCommissionStats),
|
|
PurchaseValidation: purchaseValidation,
|
|
Order: orderSvc.New(deps.DB, s.Order, s.OrderItem, s.Wallet, purchaseValidation, s.ShopPackageAllocation, s.ShopSeriesAllocation, s.IotCard, s.Device, s.PackageSeries, deps.WechatPayment, deps.QueueClient, deps.Logger),
|
|
Recharge: rechargeSvc.New(deps.DB, s.Recharge, s.Wallet, s.WalletTransaction, s.IotCard, s.Device, s.ShopSeriesAllocation, s.PackageSeries, s.CommissionRecord, deps.Logger),
|
|
}
|
|
}
|