yml2213
bafe41a3ea
手续费: - 新增 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 旧表
125 lines
2.9 KiB
Go
125 lines
2.9 KiB
Go
package service
|
|
|
|
import (
|
|
"errors"
|
|
|
|
"affiliate_dash/internal/model"
|
|
|
|
"golang.org/x/crypto/bcrypt"
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
type UserService struct {
|
|
db *gorm.DB
|
|
tenant *TenantService
|
|
}
|
|
|
|
func NewUserService(db *gorm.DB, tenant *TenantService) *UserService {
|
|
return &UserService{db: db, tenant: tenant}
|
|
}
|
|
|
|
type UserListQuery struct {
|
|
MerchantID uint
|
|
Page int
|
|
Size int
|
|
Keyword string
|
|
Role string
|
|
Status *int
|
|
}
|
|
|
|
func (s *UserService) List(q UserListQuery) ([]model.User, int64, error) {
|
|
if q.Page < 1 {
|
|
q.Page = 1
|
|
}
|
|
if q.Size < 1 || q.Size > 100 {
|
|
q.Size = 20
|
|
}
|
|
tx := s.db.Model(&model.User{})
|
|
if q.MerchantID != 0 {
|
|
tx = tx.Joins("JOIN merchant_members ON merchant_members.user_id = users.id").
|
|
Where("merchant_members.merchant_id = ?", q.MerchantID)
|
|
}
|
|
if q.Keyword != "" {
|
|
like := "%" + q.Keyword + "%"
|
|
tx = tx.Where("users.username LIKE ? OR users.nickname LIKE ?", like, like)
|
|
}
|
|
if q.Role != "" {
|
|
tx = tx.Where("users.role = ?", q.Role)
|
|
}
|
|
if q.Status != nil {
|
|
tx = tx.Where("users.status = ?", *q.Status)
|
|
}
|
|
var total int64
|
|
if err := tx.Count(&total).Error; err != nil {
|
|
return nil, 0, err
|
|
}
|
|
var list []model.User
|
|
err := tx.Order("users.id DESC").Offset((q.Page - 1) * q.Size).Limit(q.Size).Find(&list).Error
|
|
return list, total, err
|
|
}
|
|
|
|
func (s *UserService) Create(username, password, nickname, role string, merchantID uint) (*model.User, error) {
|
|
var count int64
|
|
s.db.Model(&model.User{}).Where("username = ?", username).Count(&count)
|
|
if count > 0 {
|
|
return nil, errors.New("用户名已存在")
|
|
}
|
|
if role == "" {
|
|
role = model.RoleMerchant
|
|
}
|
|
if role != model.RoleAdmin && role != model.RoleMerchant {
|
|
return nil, errors.New("无效的账号角色")
|
|
}
|
|
hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
user := &model.User{
|
|
Username: username,
|
|
PasswordHash: string(hash),
|
|
Nickname: nickname,
|
|
Role: role,
|
|
Status: 1,
|
|
}
|
|
if user.Nickname == "" {
|
|
user.Nickname = username
|
|
}
|
|
err = s.db.Transaction(func(tx *gorm.DB) error {
|
|
if err := tx.Create(user).Error; err != nil {
|
|
return err
|
|
}
|
|
if s.tenant != nil && merchantID != 0 {
|
|
memberRole := model.MemberRoleOperator
|
|
if role == model.RoleAdmin {
|
|
memberRole = model.MemberRoleOwner
|
|
}
|
|
member := model.MerchantMember{
|
|
MerchantID: merchantID,
|
|
UserID: user.ID,
|
|
Role: memberRole,
|
|
Status: user.Status,
|
|
IsDefault: role == model.RoleAdmin,
|
|
}
|
|
if err := tx.Create(&member).Error; err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return user, nil
|
|
}
|
|
|
|
func (s *UserService) UpdateStatus(id uint, status int) error {
|
|
res := s.db.Model(&model.User{}).Where("id = ?", id).Update("status", status)
|
|
if res.Error != nil {
|
|
return res.Error
|
|
}
|
|
if res.RowsAffected == 0 {
|
|
return errors.New("用户不存在")
|
|
}
|
|
return nil
|
|
}
|