refactor: 一次性佣金配置从套餐级别提升到系列级别

主要变更: - 新增 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) - 删除过时的单元测试（已被验收测试覆盖）
2026-02-04 14:28:44 +08:00
parent fba8e9e76b
commit b18ecfeb55
106 changed files with 9899 additions and 6608 deletions
--- a/internal/service/iot_card/service.go
+++ b/internal/service/iot_card/service.go
@@ -19,7 +19,8 @@ type Service struct {
 	iotCardStore               *postgres.IotCardStore
 	shopStore                  *postgres.ShopStore
 	assetAllocationRecordStore *postgres.AssetAllocationRecordStore
-	seriesAllocationStore      *postgres.ShopSeriesAllocationStore
+	shopPackageAllocationStore *postgres.ShopPackageAllocationStore
+	shopSeriesAllocationStore  *postgres.ShopSeriesAllocationStore
 	packageSeriesStore         *postgres.PackageSeriesStore
 	gatewayClient              *gateway.Client
 	logger                     *zap.Logger
@@ -30,7 +31,8 @@ func New(
 	iotCardStore *postgres.IotCardStore,
 	shopStore *postgres.ShopStore,
 	assetAllocationRecordStore *postgres.AssetAllocationRecordStore,
-	seriesAllocationStore *postgres.ShopSeriesAllocationStore,
+	shopPackageAllocationStore *postgres.ShopPackageAllocationStore,
+	shopSeriesAllocationStore *postgres.ShopSeriesAllocationStore,
 	packageSeriesStore *postgres.PackageSeriesStore,
 	gatewayClient *gateway.Client,
 	logger *zap.Logger,
@@ -40,7 +42,8 @@ func New(
 		iotCardStore:               iotCardStore,
 		shopStore:                  shopStore,
 		assetAllocationRecordStore: assetAllocationRecordStore,
-		seriesAllocationStore:      seriesAllocationStore,
+		shopPackageAllocationStore: shopPackageAllocationStore,
+		shopSeriesAllocationStore:  shopSeriesAllocationStore,
 		packageSeriesStore:         packageSeriesStore,
 		gatewayClient:              gatewayClient,
 		logger:                     logger,
@@ -603,17 +606,24 @@ func (s *Service) BatchSetSeriesBinding(ctx context.Context, req *dto.BatchSetCa

 		// 验证操作者权限（仅代理用户）
 		if operatorShopID != nil && req.SeriesID > 0 {
-			allocation, err := s.seriesAllocationStore.GetByShopAndSeries(ctx, *operatorShopID, req.SeriesID)
+			seriesAllocations, err := s.shopSeriesAllocationStore.GetByShopID(ctx, *operatorShopID)
 			if err != nil {
-				if err == gorm.ErrRecordNotFound || allocation.Status != 1 {
-					failedItems = append(failedItems, dto.CardSeriesBindngFailedItem{
-						ICCID:  iccid,
-						Reason: "您没有权限分配该套餐系列",
-					})
-					continue
-				}
 				return nil, err
 			}
+			hasSeriesAllocation := false
+			for _, alloc := range seriesAllocations {
+				if alloc.SeriesID == req.SeriesID && alloc.Status == 1 {
+					hasSeriesAllocation = true
+					break
+				}
+			}
+			if !hasSeriesAllocation {
+				failedItems = append(failedItems, dto.CardSeriesBindngFailedItem{
+					ICCID:  iccid,
+					Reason: "您没有权限分配该套餐系列",
+				})
+				continue
+			}
 		}

 		// 验证卡权限（基于 card.ShopID）
--- a/internal/service/iot_card/service_test.go
+++ b/internal/service/iot_card/service_test.go
@@ -1,148 +0,0 @@
-package iot_card
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/break/junhong_cmp_fiber/internal/model"
-	"github.com/break/junhong_cmp_fiber/internal/model/dto"
-	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
-	"github.com/break/junhong_cmp_fiber/tests/testutils"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func uniqueTestICCIDPrefix() string {
-	return fmt.Sprintf("T%d", time.Now().UnixNano()%1000000000)
-}
-
-func TestIotCardService_BatchSetSeriesBinding(t *testing.T) {
-	tx := testutils.NewTestTransaction(t)
-	rdb := testutils.GetTestRedis(t)
-	testutils.CleanTestRedisKeys(t, rdb)
-
-	iotCardStore := postgres.NewIotCardStore(tx, rdb)
-	shopStore := postgres.NewShopStore(tx, rdb)
-	assetAllocationRecordStore := postgres.NewAssetAllocationRecordStore(tx, rdb)
-	seriesAllocationStore := postgres.NewShopSeriesAllocationStore(tx)
-
-	packageSeriesStore := postgres.NewPackageSeriesStore(tx)
-	svc := New(tx, iotCardStore, shopStore, assetAllocationRecordStore, seriesAllocationStore, packageSeriesStore, nil, nil)
-	ctx := context.Background()
-
-	shop := &model.Shop{
-		ShopName: "测试店铺",
-		ShopCode: fmt.Sprintf("SHOP%d", time.Now().UnixNano()%1000000),
-		Level:    1,
-		Status:   1,
-	}
-	require.NoError(t, tx.Create(shop).Error)
-
-	series := &model.PackageSeries{
-		SeriesCode: fmt.Sprintf("SERIES%d", time.Now().UnixNano()%1000000),
-		SeriesName: "测试系列",
-		Status:     1,
-	}
-	require.NoError(t, tx.Create(series).Error)
-
-	allocation := &model.ShopSeriesAllocation{
-		ShopID:   shop.ID,
-		SeriesID: series.ID,
-		Status:   1,
-	}
-	require.NoError(t, tx.Create(allocation).Error)
-
-	prefix := uniqueTestICCIDPrefix()
-	cards := []*model.IotCard{
-		{ICCID: prefix + "001", CarrierID: 1, Status: 1, ShopID: &shop.ID},
-		{ICCID: prefix + "002", CarrierID: 1, Status: 1, ShopID: &shop.ID},
-		{ICCID: prefix + "003", CarrierID: 1, Status: 1, ShopID: nil},
-	}
-	require.NoError(t, iotCardStore.CreateBatch(ctx, cards))
-
-	t.Run("成功设置系列绑定", func(t *testing.T) {
-		req := &dto.BatchSetCardSeriesBindngRequest{
-			ICCIDs:   []string{prefix + "001", prefix + "002"},
-			SeriesID: allocation.SeriesID,
-		}
-
-		resp, err := svc.BatchSetSeriesBinding(ctx, req, nil)
-		require.NoError(t, err)
-		assert.Equal(t, 2, resp.SuccessCount)
-		assert.Equal(t, 0, resp.FailCount)
-
-		var updatedCards []*model.IotCard
-		require.NoError(t, tx.Where("iccid IN ?", req.ICCIDs).Find(&updatedCards).Error)
-		for _, card := range updatedCards {
-			require.NotNil(t, card.SeriesID)
-			assert.Equal(t, allocation.SeriesID, *card.SeriesID)
-		}
-	})
-
-	t.Run("卡不属于套餐系列分配的店铺", func(t *testing.T) {
-		req := &dto.BatchSetCardSeriesBindngRequest{
-			ICCIDs:   []string{prefix + "003"},
-			SeriesID: allocation.SeriesID,
-		}
-
-		resp, err := svc.BatchSetSeriesBinding(ctx, req, nil)
-		require.NoError(t, err)
-		assert.Equal(t, 0, resp.SuccessCount)
-		assert.Equal(t, 1, resp.FailCount)
-		assert.Equal(t, "卡不属于套餐系列分配的店铺", resp.FailedItems[0].Reason)
-	})
-
-	t.Run("卡不存在", func(t *testing.T) {
-		req := &dto.BatchSetCardSeriesBindngRequest{
-			ICCIDs:   []string{"NOTEXIST001"},
-			SeriesID: allocation.SeriesID,
-		}
-
-		resp, err := svc.BatchSetSeriesBinding(ctx, req, nil)
-		require.NoError(t, err)
-		assert.Equal(t, 0, resp.SuccessCount)
-		assert.Equal(t, 1, resp.FailCount)
-		assert.Equal(t, "卡不存在", resp.FailedItems[0].Reason)
-	})
-
-	t.Run("清除系列绑定", func(t *testing.T) {
-		req := &dto.BatchSetCardSeriesBindngRequest{
-			ICCIDs:   []string{prefix + "001"},
-			SeriesID: 0,
-		}
-
-		resp, err := svc.BatchSetSeriesBinding(ctx, req, nil)
-		require.NoError(t, err)
-		assert.Equal(t, 1, resp.SuccessCount)
-
-		var updatedCard model.IotCard
-		require.NoError(t, tx.Where("iccid = ?", prefix+"001").First(&updatedCard).Error)
-		assert.Nil(t, updatedCard.SeriesID)
-	})
-
-	t.Run("代理用户只能操作自己店铺的卡", func(t *testing.T) {
-		otherShopID := uint(99999)
-		req := &dto.BatchSetCardSeriesBindngRequest{
-			ICCIDs:   []string{prefix + "002"},
-			SeriesID: 0,
-		}
-
-		resp, err := svc.BatchSetSeriesBinding(ctx, req, &otherShopID)
-		require.NoError(t, err)
-		assert.Equal(t, 0, resp.SuccessCount)
-		assert.Equal(t, 1, resp.FailCount)
-		assert.Equal(t, "无权操作此卡", resp.FailedItems[0].Reason)
-	})
-
-	t.Run("套餐系列分配不存在", func(t *testing.T) {
-		req := &dto.BatchSetCardSeriesBindngRequest{
-			ICCIDs:   []string{prefix + "002"},
-			SeriesID: 99999,
-		}
-
-		_, err := svc.BatchSetSeriesBinding(ctx, req, nil)
-		require.Error(t, err)
-	})
-}