关于绑定的问题

2026-06-22 12:08:41 +09:00
parent 5f960daf78
commit ba435dd6a6
13 changed files with 1306 additions and 210 deletions
--- a/internal/handler/app/client_asset.go
+++ b/internal/handler/app/client_asset.go
@@ -11,6 +11,7 @@ import (
 	"github.com/break/junhong_cmp_fiber/internal/model"
 	"github.com/break/junhong_cmp_fiber/internal/model/dto"
 	asset "github.com/break/junhong_cmp_fiber/internal/service/asset"
+	customerBinding "github.com/break/junhong_cmp_fiber/internal/service/customer_binding"
 	packagepkg "github.com/break/junhong_cmp_fiber/internal/service/package"
 	"github.com/break/junhong_cmp_fiber/internal/service/packageprice"
 	"github.com/break/junhong_cmp_fiber/internal/store"
@@ -27,7 +28,7 @@ import (
 // 提供 B1~B4 资产信息、可购套餐、套餐历史、手动刷新接口
 type ClientAssetHandler struct {
 	assetService               *asset.Service
-	personalDeviceStore        *postgres.PersonalCustomerDeviceStore
+	customerBinding            *customerBinding.Service
 	assetWalletStore           *postgres.AssetWalletStore
 	packageStore               *postgres.PackageStore
 	shopPackageAllocationStore *postgres.ShopPackageAllocationStore
@@ -40,7 +41,7 @@ type ClientAssetHandler struct {
 // NewClientAssetHandler 创建 C 端资产信息处理器
 func NewClientAssetHandler(
 	assetService *asset.Service,
-	personalDeviceStore *postgres.PersonalCustomerDeviceStore,
+	binding *customerBinding.Service,
 	assetWalletStore *postgres.AssetWalletStore,
 	packageStore *postgres.PackageStore,
 	shopPackageAllocationStore *postgres.ShopPackageAllocationStore,
@@ -51,7 +52,7 @@ func NewClientAssetHandler(
 ) *ClientAssetHandler {
 	return &ClientAssetHandler{
 		assetService:               assetService,
-		personalDeviceStore:        personalDeviceStore,
+		customerBinding:            binding,
 		assetWalletStore:           assetWalletStore,
 		packageStore:               packageStore,
 		shopPackageAllocationStore: shopPackageAllocationStore,
@@ -102,7 +103,7 @@ func (h *ClientAssetHandler) resolveAssetFromIdentifier(c *fiber.Ctx, identifier
 		return nil, err
 	}

-	owned, ownErr := h.isCustomerOwnAsset(skipPermissionCtx, customerID, assetInfo.VirtualNo)
+	owned, ownErr := h.customerBinding.OwnsAsset(skipPermissionCtx, customerID, assetInfo.AssetType, assetInfo.AssetID)
 	if ownErr != nil {
 		return nil, errors.Wrap(errors.CodeDatabaseError, ownErr, "查询资产归属失败")
 	}
@@ -422,21 +423,6 @@ func (h *ClientAssetHandler) RefreshAsset(c *fiber.Ctx) error {
 	return response.Success(c, resp)
 }

-func (h *ClientAssetHandler) isCustomerOwnAsset(ctx context.Context, customerID uint, virtualNo string) (bool, error) {
-	records, err := h.personalDeviceStore.GetByCustomerID(ctx, customerID)
-	if err != nil {
-		return false, err
-	}
-	for _, record := range records {
-		if record == nil {
-			continue
-		}
-		if record.Status == constants.StatusEnabled && record.VirtualNo == virtualNo {
-			return true, nil
-		}
-	}
-	return false, nil
-}

 func (h *ClientAssetHandler) getAssetGeneration(ctx context.Context, assetType string, assetID uint) (int, error) {
 	switch assetType {
--- a/internal/handler/app/client_device.go
+++ b/internal/handler/app/client_device.go
@@ -5,6 +5,7 @@ import (
 	"github.com/break/junhong_cmp_fiber/internal/middleware"
 	"github.com/break/junhong_cmp_fiber/internal/model/dto"
 	assetSvc "github.com/break/junhong_cmp_fiber/internal/service/asset"
+	customerBinding "github.com/break/junhong_cmp_fiber/internal/service/customer_binding"
 	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
 	"github.com/break/junhong_cmp_fiber/pkg/errors"
 	"github.com/break/junhong_cmp_fiber/pkg/logger"
@@ -27,7 +28,7 @@ type deviceAssetInfo struct {
 // 提供设备卡列表、重启、恢复出厂、WiFi 配置、切卡等操作
 type ClientDeviceHandler struct {
 	assetService          *assetSvc.Service
-	personalDeviceStore   *postgres.PersonalCustomerDeviceStore
+	customerBinding       *customerBinding.Service
 	deviceStore           *postgres.DeviceStore
 	deviceSimBindingStore *postgres.DeviceSimBindingStore
 	iotCardStore          *postgres.IotCardStore
@@ -38,7 +39,7 @@ type ClientDeviceHandler struct {
 // NewClientDeviceHandler 创建 C 端设备能力处理器
 func NewClientDeviceHandler(
 	assetService *assetSvc.Service,
-	personalDeviceStore *postgres.PersonalCustomerDeviceStore,
+	binding *customerBinding.Service,
 	deviceStore *postgres.DeviceStore,
 	deviceSimBindingStore *postgres.DeviceSimBindingStore,
 	iotCardStore *postgres.IotCardStore,
@@ -47,7 +48,7 @@ func NewClientDeviceHandler(
 ) *ClientDeviceHandler {
 	return &ClientDeviceHandler{
 		assetService:          assetService,
-		personalDeviceStore:   personalDeviceStore,
+		customerBinding:       binding,
 		deviceStore:           deviceStore,
 		deviceSimBindingStore: deviceSimBindingStore,
 		iotCardStore:          iotCardStore,
@@ -79,11 +80,11 @@ func (h *ClientDeviceHandler) validateDeviceAsset(c *fiber.Ctx, identifier strin
 	}

 	// 校验个人客户对该设备的所有权
-	owns, err := h.personalDeviceStore.ExistsByCustomerAndDevice(ctx, customerID, asset.VirtualNo)
+	owns, err := h.customerBinding.OwnsAsset(ctx, customerID, asset.AssetType, asset.AssetID)
 	if err != nil {
 		h.logger.Error("校验设备所有权失败",
 			zap.Uint("customer_id", customerID),
-			zap.String("virtual_no", asset.VirtualNo),
+			zap.Uint("asset_id", asset.AssetID),
 			zap.Error(err))
 		return nil, errors.New(errors.CodeInternalError)
 	}
--- a/internal/handler/app/client_realname.go
+++ b/internal/handler/app/client_realname.go
@@ -13,6 +13,7 @@ import (
 	"github.com/break/junhong_cmp_fiber/internal/model"
 	"github.com/break/junhong_cmp_fiber/internal/model/dto"
 	assetService "github.com/break/junhong_cmp_fiber/internal/service/asset"
+	customerBinding "github.com/break/junhong_cmp_fiber/internal/service/customer_binding"
 	pollingSvc "github.com/break/junhong_cmp_fiber/internal/service/polling"
 	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
 	"github.com/break/junhong_cmp_fiber/pkg/config"
@@ -29,7 +30,7 @@ var clientRealnameValidator = validator.New()
 // ClientRealnameHandler C 端实名认证处理器
 type ClientRealnameHandler struct {
 	assetService          *assetService.Service
-	personalDeviceStore   *postgres.PersonalCustomerDeviceStore
+	customerBinding       *customerBinding.Service
 	iotCardStore          *postgres.IotCardStore
 	deviceSimBindingStore *postgres.DeviceSimBindingStore
 	carrierStore          *postgres.CarrierStore
@@ -41,7 +42,7 @@ type ClientRealnameHandler struct {
 // NewClientRealnameHandler 创建 C 端实名认证处理器
 func NewClientRealnameHandler(
 	assetSvc *assetService.Service,
-	personalDeviceStore *postgres.PersonalCustomerDeviceStore,
+	binding *customerBinding.Service,
 	iotCardStore *postgres.IotCardStore,
 	deviceSimBindingStore *postgres.DeviceSimBindingStore,
 	carrierStore *postgres.CarrierStore,
@@ -51,7 +52,7 @@ func NewClientRealnameHandler(
 ) *ClientRealnameHandler {
 	return &ClientRealnameHandler{
 		assetService:          assetSvc,
-		personalDeviceStore:   personalDeviceStore,
+		customerBinding:       binding,
 		iotCardStore:          iotCardStore,
 		deviceSimBindingStore: deviceSimBindingStore,
 		carrierStore:          carrierStore,
@@ -89,11 +90,11 @@ func (h *ClientRealnameHandler) GetRealnameLink(c *fiber.Ctx) error {
 	}

 	// 4. 验证资产归属（个人客户必须绑定过该资产）
-	owned, err := h.personalDeviceStore.ExistsByCustomerAndDevice(ctx, customerID, asset.VirtualNo)
+	owned, err := h.customerBinding.OwnsAsset(ctx, customerID, asset.AssetType, asset.AssetID)
 	if err != nil {
 		logger.GetAppLogger().Error("查询资产归属失败",
 			zap.Uint("customer_id", customerID),
-			zap.String("virtual_no", asset.VirtualNo),
+			zap.Uint("asset_id", asset.AssetID),
 			zap.Error(err))
 		return errors.New(errors.CodeInternalError, "查询资产归属失败")
 	}
--- a/internal/handler/app/client_wallet.go
+++ b/internal/handler/app/client_wallet.go
@@ -12,6 +12,7 @@ import (
 	"github.com/break/junhong_cmp_fiber/internal/model"
 	"github.com/break/junhong_cmp_fiber/internal/model/dto"
 	asset "github.com/break/junhong_cmp_fiber/internal/service/asset"
+	customerBinding "github.com/break/junhong_cmp_fiber/internal/service/customer_binding"
 	rechargeSvc "github.com/break/junhong_cmp_fiber/internal/service/recharge"
 	wechatConfigSvc "github.com/break/junhong_cmp_fiber/internal/service/wechat_config"
 	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
@@ -31,7 +32,7 @@ import (
 // 提供 C1~C5 钱包详情、流水、充值前校验、充值下单、充值记录接口
 type ClientWalletHandler struct {
 	assetService        *asset.Service
-	personalDeviceStore *postgres.PersonalCustomerDeviceStore
+	customerBinding     *customerBinding.Service
 	walletStore         *postgres.AssetWalletStore
 	transactionStore    *postgres.AssetWalletTransactionStore
 	rechargeOrderStore  *postgres.RechargeOrderStore
@@ -49,7 +50,7 @@ type ClientWalletHandler struct {
 // NewClientWalletHandler 创建 C 端钱包处理器
 func NewClientWalletHandler(
 	assetService *asset.Service,
-	personalDeviceStore *postgres.PersonalCustomerDeviceStore,
+	binding *customerBinding.Service,
 	walletStore *postgres.AssetWalletStore,
 	transactionStore *postgres.AssetWalletTransactionStore,
 	rechargeOrderStore *postgres.RechargeOrderStore,
@@ -65,7 +66,7 @@ func NewClientWalletHandler(
 ) *ClientWalletHandler {
 	return &ClientWalletHandler{
 		assetService:        assetService,
-		personalDeviceStore: personalDeviceStore,
+		customerBinding:     binding,
 		walletStore:         walletStore,
 		transactionStore:    transactionStore,
 		rechargeOrderStore:  rechargeOrderStore,
@@ -544,7 +545,7 @@ func (h *ClientWalletHandler) resolveAssetFromIdentifier(c *fiber.Ctx, identifie
 		return nil, err
 	}

-	owned, ownErr := h.isCustomerOwnAsset(skipPermissionCtx, customerID, assetInfo.VirtualNo)
+	owned, ownErr := h.customerBinding.OwnsAsset(skipPermissionCtx, customerID, assetInfo.AssetType, assetInfo.AssetID)
 	if ownErr != nil {
 		return nil, errors.Wrap(errors.CodeDatabaseError, ownErr, "查询资产归属失败")
 	}
@@ -572,21 +573,6 @@ func (h *ClientWalletHandler) resolveAssetFromIdentifier(c *fiber.Ctx, identifie
 	}, nil
 }

-func (h *ClientWalletHandler) isCustomerOwnAsset(ctx context.Context, customerID uint, virtualNo string) (bool, error) {
-	records, err := h.personalDeviceStore.GetByCustomerID(ctx, customerID)
-	if err != nil {
-		return false, err
-	}
-	for _, record := range records {
-		if record == nil {
-			continue
-		}
-		if record.Status == constants.StatusEnabled && record.VirtualNo == virtualNo {
-			return true, nil
-		}
-	}
-	return false, nil
-}

 func (h *ClientWalletHandler) getAssetGeneration(ctx context.Context, assetType string, assetID uint) (int, error) {
 	switch assetType {