订单相关以及佣金相关修复

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-解冻中 3-已发放 4-已失效" json:"status"`
+	Status           int        `gorm:"column:status;type:int;default:1;not null;comment:状态 1-已冻结 2-解冻中 3-已发放 4-已失效 99-待人工修正" json:"status"`
 	ReleasedAt       *time.Time `gorm:"column:released_at;comment:入账时间" json:"released_at"`
 	Remark           string     `gorm:"column:remark;type:varchar(500);comment:备注" json:"remark"`
 }

internal/model/dto/commission.go

@@ -29,7 +29,7 @@ type CommissionRecordListRequest struct {
 	CommissionSource *string `json:"commission_source" query:"commission_source" validate:"omitempty,oneof=cost_diff one_time" description:"佣金来源 (cost_diff:成本价差, one_time:一次性佣金)"`
 	StartTime        *string `json:"start_time" query:"start_time" validate:"omitempty" description:"开始时间"`
 	EndTime          *string `json:"end_time" query:"end_time" validate:"omitempty" description:"结束时间"`
-	Status           *int    `json:"status" query:"status" validate:"omitempty,oneof=1 2 99" description:"状态 (1:已入账, 2:已失效, 99:待人工修正)"`
+	Status           *int    `json:"status" query:"status" validate:"omitempty,oneof=1 2 3 4 99" description:"状态 (1:已冻结, 2:解冻中, 3:已发放, 4:已失效, 99:待人工修正)"`
 }
 
 // CommissionRecordPageResult 佣金记录分页结果

internal/model/dto/order_dto.go

@@ -65,14 +65,18 @@ type OrderResponse struct {
 	PaidAt                  *time.Time `json:"paid_at,omitempty" description:"支付时间"`
 	PaymentVoucherKey       string     `json:"payment_voucher_key,omitempty" description:"线下支付凭证对象存储file_key（仅线下支付订单有值）"`
 	IsPurchaseOnBehalf      bool       `json:"is_purchase_on_behalf" description:"是否为代购订单"`
-	CommissionStatus        int        `json:"commission_status" description:"佣金状态 (1:待计算, 2:已计算)"`
-	CommissionStatusName    string     `json:"commission_status_name" description:"佣金状态名称（中文）"`
+	CommissionStatus        int        `json:"commission_status" description:"佣金流程状态 (1:待计算, 2:已完成, 3:待人工处理)"`
+	CommissionStatusName    string     `json:"commission_status_name" description:"佣金流程状态名称（中文）"`
+	CommissionResult        int        `json:"commission_result" description:"佣金业务结果 (0:未知, 1:有佣金, 2:无佣金, 3:链路异常)"`
+	CommissionResultName    string     `json:"commission_result_name" description:"佣金业务结果名称（中文）"`
 	CommissionConfigVersion int        `json:"commission_config_version" description:"佣金配置版本"`
+	SellerShopID            *uint      `json:"seller_shop_id,omitempty" description:"销售店铺ID（业务归属字段）"`
+	SellerShopName          string     `json:"seller_shop_name,omitempty" description:"销售店铺名称（业务归属展示）"`
 
 	// 操作者信息
-	OperatorID       *uint  `json:"operator_id,omitempty" description:"操作者ID"`
-	OperatorType     string `json:"operator_type,omitempty" description:"操作者类型 (platform:平台, agent:代理)"`
-	OperatorName     string `json:"operator_name,omitempty" description:"操作者名称"`
+	OperatorID       *uint  `json:"operator_id,omitempty" description:"操作者账号ID（真实发起操作的账号/主体ID）"`
+	OperatorType     string `json:"operator_type,omitempty" description:"操作者账号类型 (platform:平台, agent:代理, enterprise:企业, personal_customer:个人客户)"`
+	OperatorName     string `json:"operator_name,omitempty" description:"操作者名称（按账号语义展示）"`
 	ActualPaidAmount *int64 `json:"actual_paid_amount,omitempty" description:"实际支付金额(分)"`
 
 	// 订单角色

internal/model/order.go

@@ -37,7 +37,8 @@ type Order struct {
 	PaidAt        *time.Time `gorm:"column:paid_at;comment:支付时间" json:"paid_at,omitempty"`
 
 	// 佣金信息
-	CommissionStatus        int   `gorm:"column:commission_status;type:int;default:1;not null;comment:佣金状态 1-待计算 2-已计算" json:"commission_status"`
+	CommissionStatus        int   `gorm:"column:commission_status;type:int;default:1;not null;comment:佣金流程状态 1-待计算 2-已完成 3-待人工处理" json:"commission_status"`
+	CommissionResult        int   `gorm:"column:commission_result;type:int;default:0;not null;comment:佣金业务结果 0-未知 1-有佣金 2-无佣金 3-链路异常" json:"commission_result"`
 	CommissionConfigVersion int   `gorm:"column:commission_config_version;type:int;default:0;comment:佣金配置版本(订单创建时快照)" json:"commission_config_version"`
 	SellerShopID            *uint `gorm:"column:seller_shop_id;index;comment:销售店铺ID（用于成本价差佣金计算）" json:"seller_shop_id,omitempty"`
 	SellerCostPrice         int64 `gorm:"column:seller_cost_price;type:bigint;default:0;comment:销售成本价（分，用于计算利润）" json:"seller_cost_price"`
@@ -51,8 +52,11 @@ type Order struct {
 	IsPurchaseOnBehalf bool `gorm:"column:is_purchase_on_behalf;type:boolean;default:false;comment:是否为代购订单" json:"is_purchase_on_behalf"`
 
 	// 操作者信息（谁下的单）
-	OperatorID   *uint  `gorm:"column:operator_id;index:idx_orders_operator_id;comment:操作者ID（谁下的单）" json:"operator_id,omitempty"`
-	OperatorType string `gorm:"column:operator_type;type:varchar(20);comment:操作者类型（platform/agent）" json:"operator_type,omitempty"`
+	OperatorAccountID   *uint  `gorm:"column:operator_account_id;index:idx_orders_operator_account_id;comment:操作者账号ID（权威字段）" json:"operator_account_id,omitempty"`
+	OperatorAccountType string `gorm:"column:operator_account_type;type:varchar(32);default:'';not null;comment:操作者账号类型（platform/agent/enterprise/personal_customer）" json:"operator_account_type,omitempty"`
+	OperatorAccountName string `gorm:"column:operator_account_name;type:varchar(255);default:'';not null;comment:操作者名称快照" json:"operator_account_name,omitempty"`
+	OperatorID          *uint  `gorm:"column:operator_id;index:idx_orders_operator_id;comment:操作者ID（历史兼容字段，旧语义可能保存代理店铺ID）" json:"operator_id,omitempty"`
+	OperatorType        string `gorm:"column:operator_type;type:varchar(20);comment:操作者类型（历史兼容字段，旧语义为platform/agent）" json:"operator_type,omitempty"`
 
 	// 实际支付金额（可能与订单金额不同，如代理代购场景）
 	ActualPaidAmount *int64 `gorm:"column:actual_paid_amount;type:bigint;comment:实际支付金额（分）" json:"actual_paid_amount,omitempty"`
@@ -103,10 +107,22 @@ const (
 	PaymentStatusRefunded  = 4 // 已退款
 )
 
-// 佣金状态常量
+// 佣金流程状态常量
 const (
-	CommissionStatusPending    = 1 // 待计算
-	CommissionStatusCalculated = 2 // 已计算
+	CommissionStatusPending       = 1 // 待计算
+	CommissionStatusCompleted     = 2 // 已完成
+	CommissionStatusPendingReview = 3 // 待人工处理
+
+	// CommissionStatusCalculated 兼容旧命名，语义已调整为“已完成”
+	CommissionStatusCalculated = CommissionStatusCompleted
+)
+
+// 佣金业务结果常量
+const (
+	CommissionResultUnknown     = 0 // 未知（历史兼容态）
+	CommissionResultHasAmount   = 1 // 有佣金
+	CommissionResultNoAmount    = 2 // 无佣金
+	CommissionResultChainBroken = 3 // 链路异常
 )
 
 // 订单角色常量
@@ -117,21 +133,29 @@ const (
 	PurchaseRolePurchaseForSubordinate = "purchase_for_subordinate" // 给下级购买
 )
 
+// 操作者账号类型常量
+const (
+	OperatorAccountTypePlatform         = "platform"          // 平台账号
+	OperatorAccountTypeAgent            = "agent"             // 代理账号
+	OperatorAccountTypeEnterprise       = "enterprise"        // 企业账号
+	OperatorAccountTypePersonalCustomer = "personal_customer" // 个人客户
+)
+
 // OrderItem 订单明细模型
 // 记录订单中购买的套餐明细，支持一个订单购买多个套餐
 type OrderItem struct {
 	gorm.Model
 	BaseModel `gorm:"embedded"`
 
-	OrderID     uint    `gorm:"column:order_id;index:idx_order_item_order_id;not null;comment:订单ID" json:"order_id"`
-	PackageID   uint    `gorm:"column:package_id;index;not null;comment:套餐ID" json:"package_id"`
-	PackageName string  `gorm:"column:package_name;type:varchar(100);not null;comment:套餐名称(快照)" json:"package_name"`
-	PackageType *string `gorm:"column:package_type;type:varchar(20);comment:套餐类型快照 formal-正式套餐 addon-加油包" json:"package_type"`
-	Quantity    int     `gorm:"column:quantity;type:int;default:1;not null;comment:数量" json:"quantity"`
-	UnitPrice   int64   `gorm:"column:unit_price;type:bigint;not null;comment:单价(分)" json:"unit_price"`
-	Amount      int64   `gorm:"column:amount;type:bigint;not null;comment:小计金额(分)" json:"amount"`
-	PackagePriceConfigStatus int  `gorm:"column:package_price_config_status;type:int;default:0;not null;comment:套餐价格配置状态快照 0-未配置 1-赠送0价 2-已配置非0" json:"package_price_config_status"`
-	PackageIsGift            bool `gorm:"column:package_is_gift;type:boolean;default:false;not null;comment:套餐是否赠送快照 true-赠送 false-普通可售" json:"package_is_gift"`
+	OrderID                  uint    `gorm:"column:order_id;index:idx_order_item_order_id;not null;comment:订单ID" json:"order_id"`
+	PackageID                uint    `gorm:"column:package_id;index;not null;comment:套餐ID" json:"package_id"`
+	PackageName              string  `gorm:"column:package_name;type:varchar(100);not null;comment:套餐名称(快照)" json:"package_name"`
+	PackageType              *string `gorm:"column:package_type;type:varchar(20);comment:套餐类型快照 formal-正式套餐 addon-加油包" json:"package_type"`
+	Quantity                 int     `gorm:"column:quantity;type:int;default:1;not null;comment:数量" json:"quantity"`
+	UnitPrice                int64   `gorm:"column:unit_price;type:bigint;not null;comment:单价(分)" json:"unit_price"`
+	Amount                   int64   `gorm:"column:amount;type:bigint;not null;comment:小计金额(分)" json:"amount"`
+	PackagePriceConfigStatus int     `gorm:"column:package_price_config_status;type:int;default:0;not null;comment:套餐价格配置状态快照 0-未配置 1-赠送0价 2-已配置非0" json:"package_price_config_status"`
+	PackageIsGift            bool    `gorm:"column:package_is_gift;type:boolean;default:false;not null;comment:套餐是否赠送快照 true-赠送 false-普通可售" json:"package_is_gift"`
 }
 
 // TableName 指定表名