fix: 统一佣金状态常量并修复佣金明细关联查询

- 删除 model/commission.go 中与 constants 包冲突的旧常量（值=1/2）
- 所有服务层改用 constants.CommissionStatusReleased（值=3）写入和查询
- 数据库迁移：status 1→3（已发放），2→4（已失效）
- 修复佣金明细列表接口，通过 JOIN 关联返回 order_no、iccid、virtual_no、order_created_at
- 新增 seller_shop_id / seller_shop_name 销售来源字段
- 统计接口过滤条件从精确匹配改为排除无效（NOT IN 4,99）
- 更新 OpenAPI 文档及 commission-record-query spec

internal/model/commission.go

@@ -19,7 +19,7 @@ type CommissionRecord struct {
 	CommissionSource string     `gorm:"column:commission_source;type:varchar(20);not null;index;comment:佣金来源 cost_diff-成本价差 one_time-一次性佣金" json:"commission_source"`
 	Amount           int64      `gorm:"column:amount;type:bigint;not null;comment:佣金金额(分)" json:"amount"`
 	BalanceAfter     int64      `gorm:"column:balance_after;type:bigint;default:0;comment:入账后钱包余额（分）" json:"balance_after"`
-	Status           int        `gorm:"column:status;type:int;default:1;not null;comment:状态 1-已入账 2-已失效" json:"status"`
+	Status           int        `gorm:"column:status;type:int;default:1;not null;comment:状态 1-已冻结 2-解冻中 3-已发放 4-已失效" json:"status"`
 	ReleasedAt       *time.Time `gorm:"column:released_at;comment:入账时间" json:"released_at"`
 	Remark           string     `gorm:"column:remark;type:varchar(500);comment:备注" json:"remark"`
 }
@@ -36,11 +36,3 @@ const (
 	// CommissionSourceOneTime 一次性佣金
 	CommissionSourceOneTime = "one_time"
 )
-
-// 佣金状态常量
-const (
-	// CommissionStatusReleased 已入账
-	CommissionStatusReleased = 1
-	// CommissionStatusInvalid 已失效
-	CommissionStatusInvalid = 2
-)

internal/model/dto/shop_commission_dto.go

@@ -144,13 +144,15 @@ type ShopCommissionRecordItem struct {
 	Amount           int64  `json:"amount" description:"佣金金额（分）"`
 	BalanceAfter     int64  `json:"balance_after" description:"入账后佣金余额（分）"`
 	CommissionSource string `json:"commission_source" description:"佣金来源 (cost_diff:成本价差, one_time:一次性佣金, tier_bonus(已废弃):梯度奖励)"`
-	Status           int    `json:"status" description:"状态 (1:已入账, 2:已失效)"`
+	Status           int    `json:"status" description:"状态 (1:已冻结, 2:解冻中, 3:已发放, 4:已失效)"`
 	StatusName       string `json:"status_name" description:"状态名称"`
 	OrderID          uint   `json:"order_id" description:"订单ID"`
 	OrderNo          string `json:"order_no" description:"订单号"`
 	VirtualNo        string `json:"virtual_no,omitempty" description:"设备虚拟号"`
 	ICCID            string `json:"iccid,omitempty" description:"ICCID"`
 	OrderCreatedAt   string `json:"order_created_at" description:"订单创建时间"`
+	SellerShopID     uint   `json:"seller_shop_id" description:"销售来源店铺ID"`
+	SellerShopName   string `json:"seller_shop_name" description:"销售来源店铺名称"`
 	CreatedAt        string `json:"created_at" description:"佣金入账时间"`
 }
 

internal/service/commission_calculation/service.go

@@ -148,7 +148,7 @@ func (s *Service) CalculateCostDiffCommission(ctx context.Context, order *model.
 			DeviceID:         order.DeviceID,
 			CommissionSource: model.CommissionSourceCostDiff,
 			Amount:           sellerProfit,
-			Status:           model.CommissionStatusReleased,
+			Status:           constants.CommissionStatusReleased,
 		})
 	}
 
@@ -213,7 +213,7 @@ func (s *Service) CalculateCostDiffCommission(ctx context.Context, order *model.
 				DeviceID:         order.DeviceID,
 				CommissionSource: model.CommissionSourceCostDiff,
 				Amount:           profit,
-				Status:           model.CommissionStatusReleased,
+				Status:           constants.CommissionStatusReleased,
 			})
 		}
 
@@ -514,7 +514,7 @@ func (s *Service) calculateChainOneTimeCommission(ctx context.Context, bottomSho
 				DeviceID:         deviceID,
 				CommissionSource: model.CommissionSourceOneTime,
 				Amount:           actualProfit,
-				Status:           model.CommissionStatusReleased,
+				Status:           constants.CommissionStatusReleased,
 				Remark:           remark,
 			})
 		}
@@ -656,7 +656,7 @@ func (s *Service) creditCommissionInTx(ctx context.Context, tx *gorm.DB, record
 	now := time.Now()
 	if err := tx.Model(record).Updates(map[string]any{
 		"balance_after": balanceBefore + record.Amount,
-		"status":        model.CommissionStatusReleased,
+		"status":        constants.CommissionStatusReleased,
 		"released_at":   now,
 	}).Error; err != nil {
 		return errors.Wrap(errors.CodeDatabaseError, err, "更新佣金记录失败")

internal/service/recharge/service.go

@@ -661,7 +661,7 @@ func (s *Service) triggerOneTimeCommissionIfNeededInTx(ctx context.Context, tx *
 		DeviceID:         deviceID,
 		CommissionSource: model.CommissionSourceOneTime,
 		Amount:           commissionAmount,
-		Status:           model.CommissionStatusReleased,
+		Status:           constants.CommissionStatusReleased,
 		Remark:           "钱包充值触发一次性佣金",
 	}
 

internal/service/refund/service.go

@@ -341,7 +341,7 @@ func (s *Service) deductAllCommission(ctx context.Context, refundID uint) {
 
 	// 查询该订单所有已入账佣金记录
 	var commissions []model.CommissionRecord
-	if err := s.db.Where("order_id = ? AND status = ?", refund.OrderID, model.CommissionStatusReleased).Find(&commissions).Error; err != nil {
+	if err := s.db.Where("order_id = ? AND status = ?", refund.OrderID, constants.CommissionStatusReleased).Find(&commissions).Error; err != nil {
 		logger.Error("佣金回扣：查询佣金记录失败", zap.Uint("refund_id", refundID), zap.Uint("order_id", refund.OrderID), zap.Error(err))
 		return
 	}

internal/service/shop_commission/service.go

@@ -410,8 +410,33 @@ func (s *Service) ListShopCommissionRecords(ctx context.Context, shopID uint, re
 		return nil, errors.Wrap(errors.CodeInternalError, err, "查询佣金明细失败")
 	}
 
+	sellerShopIDs := make([]uint, 0)
+	for _, r := range records {
+		if r.SellerShopID != nil && *r.SellerShopID > 0 {
+			sellerShopIDs = append(sellerShopIDs, *r.SellerShopID)
+		}
+	}
+
+	shopNameMap := make(map[uint]string)
+	if len(sellerShopIDs) > 0 {
+		shops, err := s.shopStore.GetByIDs(ctx, sellerShopIDs)
+		if err == nil {
+			for _, sh := range shops {
+				shopNameMap[sh.ID] = sh.ShopName
+			}
+		}
+	}
+
 	items := make([]dto.ShopCommissionRecordItem, 0, len(records))
 	for _, r := range records {
+		var orderCreatedAt string
+		if r.OrderCreatedAt != nil {
+			orderCreatedAt = r.OrderCreatedAt.Format("2006-01-02 15:04:05")
+		}
+		var sellerShopID uint
+		if r.SellerShopID != nil {
+			sellerShopID = *r.SellerShopID
+		}
 		item := dto.ShopCommissionRecordItem{
 			ID:               r.ID,
 			Amount:           r.Amount,
@@ -420,10 +445,12 @@ func (s *Service) ListShopCommissionRecords(ctx context.Context, shopID uint, re
 			Status:           r.Status,
 			StatusName:       getCommissionStatusName(r.Status),
 			OrderID:          r.OrderID,
-			OrderNo:          "",
-			VirtualNo:        "",
-			ICCID:            "",
-			OrderCreatedAt:   "",
+			OrderNo:          r.OrderNo,
+			VirtualNo:        r.VirtualNo,
+			ICCID:            r.ICCID,
+			OrderCreatedAt:   orderCreatedAt,
+			SellerShopID:     sellerShopID,
+			SellerShopName:   shopNameMap[sellerShopID],
 			CreatedAt:        r.CreatedAt.Format("2006-01-02 15:04:05"),
 		}
 		items = append(items, item)
@@ -746,7 +773,7 @@ func (s *Service) ResolveCommissionRecord(ctx context.Context, recordID uint, re
 
 	if req.Action == "invalidate" {
 		return s.commissionRecordStore.UpdateByID(ctx, nil, recordID, map[string]any{
-			"status": model.CommissionStatusInvalid,
+			"status": constants.CommissionStatusInvalid,
 			"remark": resolveRemark,
 		})
 	}
@@ -764,7 +791,7 @@ func (s *Service) ResolveCommissionRecord(ctx context.Context, recordID uint, re
 
 	return s.db.Transaction(func(tx *gorm.DB) error {
 		if err := s.commissionRecordStore.UpdateByID(ctx, tx, recordID, map[string]any{
-			"status":      model.CommissionStatusReleased,
+			"status":      constants.CommissionStatusReleased,
 			"amount":      amount,
 			"released_at": now,
 			"remark":      resolveRemark,

internal/store/postgres/commission_record_store.go

@@ -2,6 +2,7 @@ package postgres
 
 import (
 	"context"
+	"time"
 
 	"github.com/break/junhong_cmp_fiber/internal/model"
 	"github.com/break/junhong_cmp_fiber/internal/store"
@@ -11,6 +12,15 @@ import (
 	"gorm.io/gorm"
 )
 
+type CommissionRecordWithRelations struct {
+	model.CommissionRecord
+	OrderNo        string     `gorm:"column:order_no"`
+	OrderCreatedAt *time.Time `gorm:"column:order_created_at"`
+	ICCID          string     `gorm:"column:iccid"`
+	VirtualNo      string     `gorm:"column:virtual_no"`
+	SellerShopID   *uint      `gorm:"column:seller_shop_id"`
+}
+
 type CommissionRecordStore struct {
 	db    *gorm.DB
 	redis *redis.Client
@@ -57,29 +67,39 @@ type CommissionRecordListFilters struct {
 	Status           *int
 }
 
-func (s *CommissionRecordStore) ListByShopID(ctx context.Context, opts *store.QueryOptions, filters *CommissionRecordListFilters) ([]*model.CommissionRecord, int64, error) {
-	var records []*model.CommissionRecord
+func (s *CommissionRecordStore) ListByShopID(ctx context.Context, opts *store.QueryOptions, filters *CommissionRecordListFilters) ([]*CommissionRecordWithRelations, int64, error) {
 	var total int64
 
-	query := s.db.WithContext(ctx).Model(&model.CommissionRecord{})
-	// 应用数据权限过滤
+	query := s.db.WithContext(ctx).Model(&model.CommissionRecord{}).
+		Joins("LEFT JOIN tb_order o ON tb_commission_record.order_id = o.id AND o.deleted_at IS NULL").
+		Joins("LEFT JOIN tb_iot_card ic ON tb_commission_record.iot_card_id = ic.id AND ic.deleted_at IS NULL").
+		Joins("LEFT JOIN tb_device d ON tb_commission_record.device_id = d.id AND d.deleted_at IS NULL")
 	query = middleware.ApplyShopFilter(ctx, query)
 
 	if filters != nil {
 		if filters.ShopID > 0 {
-			query = query.Where("shop_id = ?", filters.ShopID)
+			query = query.Where("tb_commission_record.shop_id = ?", filters.ShopID)
 		}
 		if filters.CommissionSource != "" {
-			query = query.Where("commission_source = ?", filters.CommissionSource)
+			query = query.Where("tb_commission_record.commission_source = ?", filters.CommissionSource)
 		}
 		if filters.StartTime != nil && *filters.StartTime != "" {
-			query = query.Where("created_at >= ?", *filters.StartTime)
+			query = query.Where("tb_commission_record.created_at >= ?", *filters.StartTime)
 		}
 		if filters.EndTime != nil && *filters.EndTime != "" {
-			query = query.Where("created_at <= ?", *filters.EndTime)
+			query = query.Where("tb_commission_record.created_at <= ?", *filters.EndTime)
 		}
 		if filters.Status != nil {
-			query = query.Where("status = ?", *filters.Status)
+			query = query.Where("tb_commission_record.status = ?", *filters.Status)
+		}
+		if filters.ICCID != "" {
+			query = query.Where("ic.iccid LIKE ?", "%"+filters.ICCID+"%")
+		}
+		if filters.OrderNo != "" {
+			query = query.Where("o.order_no = ?", filters.OrderNo)
+		}
+		if filters.DeviceNo != "" {
+			query = query.Where("d.virtual_no LIKE ?", "%"+filters.DeviceNo+"%")
 		}
 	}
 
@@ -94,14 +114,16 @@ func (s *CommissionRecordStore) ListByShopID(ctx context.Context, opts *store.Qu
 		}
 	}
 	offset := (opts.Page - 1) * opts.PageSize
+	query = query.Select(`tb_commission_record.*, o.order_no, o.created_at as order_created_at, o.seller_shop_id, ic.iccid, d.virtual_no`)
 	query = query.Offset(offset).Limit(opts.PageSize)
 
 	if opts.OrderBy != "" {
 		query = query.Order(opts.OrderBy)
 	} else {
-		query = query.Order("created_at DESC")
+		query = query.Order("tb_commission_record.created_at DESC")
 	}
 
+	var records []*CommissionRecordWithRelations
 	if err := query.Find(&records).Error; err != nil {
 		return nil, 0, err
 	}
@@ -120,7 +142,7 @@ type CommissionStats struct {
 
 func (s *CommissionRecordStore) GetStats(ctx context.Context, filters *CommissionRecordListFilters) (*CommissionStats, error) {
 	query := s.db.WithContext(ctx).Model(&model.CommissionRecord{}).
-		Where("status = ?", model.CommissionStatusReleased)
+		Where("status NOT IN (?)", []int{constants.CommissionStatusInvalid, constants.CommissionStatusPendingReview})
 	// 应用数据权限过滤
 	query = middleware.ApplyShopFilter(ctx, query)
 
@@ -166,7 +188,7 @@ func (s *CommissionRecordStore) GetDailyStats(ctx context.Context, filters *Comm
 	}
 
 	query := s.db.WithContext(ctx).Model(&model.CommissionRecord{}).
-		Where("status = ?", model.CommissionStatusReleased)
+		Where("status NOT IN (?)", []int{constants.CommissionStatusInvalid, constants.CommissionStatusPendingReview})
 	// 应用数据权限过滤
 	query = middleware.ApplyShopFilter(ctx, query)