手续费: - 新增 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 旧表
49 lines
1.7 KiB
Go
49 lines
1.7 KiB
Go
package service
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"affiliate_dash/internal/model"
|
|
)
|
|
|
|
func TestUserListFiltersByMerchantMembership(t *testing.T) {
|
|
db := newServiceTestDB(t)
|
|
merchantA := model.Merchant{Code: "user-merchant-a", Name: "商户 A", Status: model.MerchantStatusActive}
|
|
merchantB := model.Merchant{Code: "user-merchant-b", Name: "商户 B", Status: model.MerchantStatusActive}
|
|
if err := db.Create(&merchantA).Error; err != nil {
|
|
t.Fatalf("create merchant a: %v", err)
|
|
}
|
|
if err := db.Create(&merchantB).Error; err != nil {
|
|
t.Fatalf("create merchant b: %v", err)
|
|
}
|
|
userA := model.User{Username: "user-a", PasswordHash: "hash", Role: model.RoleMerchant, Status: 1}
|
|
userB := model.User{Username: "user-b", PasswordHash: "hash", Role: model.RoleMerchant, Status: 1}
|
|
if err := db.Create(&userA).Error; err != nil {
|
|
t.Fatalf("create user a: %v", err)
|
|
}
|
|
if err := db.Create(&userB).Error; err != nil {
|
|
t.Fatalf("create user b: %v", err)
|
|
}
|
|
if err := db.Create(&model.MerchantMember{MerchantID: merchantA.ID, UserID: userA.ID, Role: model.MemberRoleOperator, Status: 1}).Error; err != nil {
|
|
t.Fatalf("create member a: %v", err)
|
|
}
|
|
if err := db.Create(&model.MerchantMember{MerchantID: merchantB.ID, UserID: userB.ID, Role: model.MemberRoleOperator, Status: 1}).Error; err != nil {
|
|
t.Fatalf("create member b: %v", err)
|
|
}
|
|
|
|
active := 1
|
|
list, total, err := NewUserService(db, nil).List(UserListQuery{
|
|
MerchantID: merchantA.ID,
|
|
Page: 1,
|
|
Size: 20,
|
|
Role: model.RoleMerchant,
|
|
Status: &active,
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("list users: %v", err)
|
|
}
|
|
if total != 1 || len(list) != 1 || list[0].Username != "user-a" {
|
|
t.Fatalf("expected only merchant A user, total=%d list=%+v", total, list)
|
|
}
|
|
}
|