fix: 统一佣金状态常量并修复佣金明细关联查询
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 7m33s

- 删除 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
This commit is contained in:
2026-04-11 10:42:37 +08:00
parent d0989c66bb
commit 677d6239ce
17 changed files with 604 additions and 38 deletions

View File

@@ -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)