重构: 手续费改为百分比/固定二选一，清理旧 Skin/Order/ShipLog 演示链路
手续费: - 新增 fee_type 字段(rate/fixed)，百分比与固定金额二选一，不再叠加 - calculateServiceFee 按 fee_type 分支计算 - 商户创建/更新校验 fee_type，订单落库快照 fee_type - 前端表单改为下拉选择手续费类型，动态显示对应输入框 - 测试拆为 TestFeeRate + TestFeeFixed 清理旧链路: - 删除旧 Skin/Order/ShipLog 模型及 OrderService/SkinService - Dashboard 迁移到 FulfillmentService - 上游 /api/open/v1 改为基于 FulfillmentOrder 实现，接口契约不变 - 推送留痕改用 AuditLog，不再建 ShipLog 表 - 删除前端 Skins/Orders/ShipLogs/Distributors 页面及路由、菜单、API、类型 - 新增迁移 003: 添加 fee_type 列并 DROP 旧表
This commit is contained in:
yml2213
@@ -10,11 +10,21 @@ const (
|
||||
MerchantStatusActive = "active"
|
||||
MerchantStatusDisabled = "disabled"
|
||||
|
||||
MerchantFeatureProducts = "products"
|
||||
MerchantFeatureOrders = "orders"
|
||||
MerchantFeatureWallet = "wallet"
|
||||
MerchantFeatureAPI = "api"
|
||||
MerchantFeatureCallbacks = "callbacks"
|
||||
DefaultMerchantFeatures = "products,orders,wallet,api,callbacks"
|
||||
|
||||
MemberRoleOwner = "owner"
|
||||
MemberRoleOperator = "operator"
|
||||
MemberRoleFinance = "finance"
|
||||
MemberRoleViewer = "viewer"
|
||||
|
||||
FeeTypeRate = "rate" // 手续费按百分比
|
||||
FeeTypeFixed = "fixed" // 手续费按固定金额
|
||||
|
||||
APIClientStatusActive = "active"
|
||||
APIClientStatusDisabled = "disabled"
|
||||
|
||||
@@ -63,6 +73,22 @@ type Merchant struct {
|
||||
Status string `gorm:"size:16;not null;default:active;index" json:"status"`
|
||||
ContactName string `gorm:"size:64" json:"contact_name"`
|
||||
ContactInfo string `gorm:"size:128" json:"contact_info"`
|
||||
Features string `gorm:"type:text;not null;default:'products,orders,wallet,api,callbacks'" json:"features"`
|
||||
|
||||
// 手续费按"百分比或固定"二选一：fee_type=rate 用 fee_rate_bp，fee_type=fixed 用 fee_fixed_amount。
|
||||
FeeType string `gorm:"size:16;not null;default:rate" json:"fee_type"`
|
||||
FeeRateBP int64 `gorm:"not null;default:0" json:"fee_rate_bp"`
|
||||
FeeFixedAmount int64 `gorm:"not null;default:0" json:"fee_fixed_amount"`
|
||||
}
|
||||
|
||||
func (m *Merchant) BeforeCreate(tx *gorm.DB) error {
|
||||
if m.Features == "" {
|
||||
m.Features = DefaultMerchantFeatures
|
||||
}
|
||||
if m.FeeType == "" {
|
||||
m.FeeType = FeeTypeRate
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// MerchantMember 将系统账号和商户权限分离，账号可以属于多个商户。
|
||||
@@ -179,6 +205,11 @@ type FulfillmentOrder struct {
|
||||
ProductSKU string `gorm:"size:96;not null" json:"product_sku"`
|
||||
ProductName string `gorm:"size:160;not null" json:"product_name"`
|
||||
Quantity int64 `gorm:"not null;default:1" json:"quantity"`
|
||||
BaseAmount int64 `gorm:"not null;default:0" json:"base_amount"`
|
||||
FeeType string `gorm:"size:16;not null;default:rate" json:"fee_type"`
|
||||
FeeRateBP int64 `gorm:"not null;default:0" json:"fee_rate_bp"`
|
||||
FeeFixedAmount int64 `gorm:"not null;default:0" json:"fee_fixed_amount"`
|
||||
ServiceFeeAmount int64 `gorm:"not null;default:0" json:"service_fee_amount"`
|
||||
Amount int64 `gorm:"not null" json:"amount"`
|
||||
Currency string `gorm:"size:12;not null;default:CNY" json:"currency"`
|
||||
PaymentStatus string `gorm:"size:16;not null;default:pending;index" json:"payment_status"`
|
||||
|
||||
@@ -8,8 +8,8 @@ import (
|
||||
|
||||
// 用户角色
|
||||
const (
|
||||
RoleAdmin = "admin" // 管理员
|
||||
RoleDistributor = "distributor" // 分销商
|
||||
RoleAdmin = "admin" // 平台管理员
|
||||
RoleMerchant = "merchant" // 商户账号
|
||||
)
|
||||
|
||||
// User 系统用户
|
||||
@@ -22,92 +22,6 @@ type User struct {
|
||||
Username string `gorm:"uniqueIndex;size:64;not null" json:"username"`
|
||||
PasswordHash string `gorm:"size:255;not null" json:"-"`
|
||||
Nickname string `gorm:"size:64" json:"nickname"`
|
||||
Role string `gorm:"size:32;not null;default:distributor" json:"role"`
|
||||
Role string `gorm:"size:32;not null;default:merchant" json:"role"`
|
||||
Status int `gorm:"default:1" json:"status"` // 1启用 0禁用
|
||||
InviteCode string `gorm:"uniqueIndex;size:32" json:"invite_code"`
|
||||
ParentID *uint `gorm:"index" json:"parent_id"` // 上级分销商
|
||||
}
|
||||
|
||||
// Skin 游戏皮肤商品
|
||||
type Skin struct {
|
||||
ID uint `gorm:"primarykey" json:"id"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
UpdatedAt time.Time `json:"updated_at"`
|
||||
DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
|
||||
|
||||
MerchantID uint `gorm:"index;uniqueIndex:idx_skins_merchant_sku;not null;default:0" json:"merchant_id"`
|
||||
Name string `gorm:"size:128;not null" json:"name"` // 中文名（展示用，保持原名）
|
||||
SKU string `gorm:"uniqueIndex:idx_skins_merchant_sku;size:64;not null" json:"sku"` // 英文固定标识
|
||||
Game string `gorm:"size:64;index" json:"game"` // 所属游戏
|
||||
Category string `gorm:"size:64;index" json:"category"` // 品类：套装/背包/...
|
||||
CoverURL string `gorm:"size:512" json:"cover_url"`
|
||||
Price float64 `gorm:"not null;default:0" json:"price"` // 售价
|
||||
CostPrice float64 `gorm:"default:0" json:"cost_price"` // 成本价
|
||||
Commission float64 `gorm:"default:0" json:"commission"` // 佣金比例 0-1
|
||||
Stock int `gorm:"default:0" json:"stock"` // -1 无限
|
||||
Status int `gorm:"default:1" json:"status"` // 1上架 0下架
|
||||
Description string `gorm:"type:text" json:"description"`
|
||||
}
|
||||
|
||||
// Order 订单
|
||||
type Order struct {
|
||||
ID uint `gorm:"primarykey" json:"id"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
UpdatedAt time.Time `json:"updated_at"`
|
||||
DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
|
||||
|
||||
MerchantID uint `gorm:"index;not null;default:0" json:"merchant_id"`
|
||||
OrderNo string `gorm:"uniqueIndex;size:64;not null" json:"order_no"`
|
||||
SkinID uint `gorm:"index;not null" json:"skin_id"`
|
||||
Skin *Skin `gorm:"foreignKey:SkinID" json:"skin,omitempty"`
|
||||
DistributorID uint `gorm:"index;not null" json:"distributor_id"`
|
||||
Distributor *User `gorm:"foreignKey:DistributorID" json:"distributor,omitempty"`
|
||||
BuyerName string `gorm:"size:64" json:"buyer_name"`
|
||||
Amount float64 `gorm:"not null" json:"amount"`
|
||||
CommissionAmt float64 `gorm:"default:0" json:"commission_amt"`
|
||||
Status string `gorm:"size:32;default:pending;index" json:"status"`
|
||||
Remark string `gorm:"size:255" json:"remark"`
|
||||
|
||||
// 发货相关（上游皮肤源头对接）
|
||||
ProviderOrderNo string `gorm:"size:64;index" json:"provider_order_no"` // 上游单号
|
||||
ShippedAt *time.Time `json:"shipped_at"` // 发货成功时间
|
||||
ShipFailReason string `gorm:"size:512" json:"ship_fail_reason"` // 最近一次失败原因
|
||||
|
||||
GameChannel string `gorm:"size:64" json:"game_channel"` // 账号区服(安卓/IOS-微信/QQ)
|
||||
GameUID string `gorm:"size:128" json:"game_uid"` // 游戏角色UUID
|
||||
RoleName string `gorm:"size:64" json:"role_name"` // 角色名
|
||||
PayScore int `gorm:"default:0" json:"pay_score"` // 消耗积分
|
||||
}
|
||||
|
||||
// 订单状态
|
||||
const (
|
||||
OrderStatusPending = "pending" // 待支付
|
||||
OrderStatusPaid = "paid" // 已支付，可发货
|
||||
OrderStatusDelivering = "delivering" // 发货中
|
||||
OrderStatusDelivered = "delivered" // 已交付
|
||||
OrderStatusShipFailed = "ship_failed" // 发货失败（可重试）
|
||||
OrderStatusCancelled = "cancelled" // 已取消
|
||||
)
|
||||
|
||||
// 上游推送的发货状态
|
||||
const (
|
||||
ShipNotifySuccess = "success"
|
||||
ShipNotifyFailed = "failed"
|
||||
ShipNotifyProcessing = "processing"
|
||||
)
|
||||
|
||||
// ShipLog 发货推送记录（上游回调留痕）
|
||||
type ShipLog struct {
|
||||
ID uint `gorm:"primarykey" json:"id"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
|
||||
MerchantID uint `gorm:"index;not null;default:0" json:"merchant_id"`
|
||||
OrderNo string `gorm:"size:64;index;not null" json:"order_no"`
|
||||
OrderID uint `gorm:"index" json:"order_id"`
|
||||
ShipStatus string `gorm:"size:32;not null" json:"ship_status"` // success/failed/processing
|
||||
ProviderOrderNo string `gorm:"size:64" json:"provider_order_no"`
|
||||
FailReason string `gorm:"size:512" json:"fail_reason"`
|
||||
Payload string `gorm:"type:text" json:"payload"` // 原始请求 JSON
|
||||
ResultStatus string `gorm:"size:32" json:"result_status"` // 处理后订单状态
|
||||
Message string `gorm:"size:255" json:"message"`
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user