feat: 实现账号与佣金管理模块
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 4m35s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 4m35s
新增功能: - 店铺佣金查询:店铺佣金统计、店铺佣金记录列表、店铺提现记录 - 佣金提现审批:提现申请列表、审批通过、审批拒绝 - 提现配置管理:配置列表、新增配置、获取当前生效配置 - 企业管理:企业列表、创建、更新、删除、获取详情 - 企业卡授权:授权列表、批量授权、批量取消授权、统计 - 客户账号管理:账号列表、创建、更新状态、重置密码 - 我的佣金:佣金统计、佣金记录、提现申请、提现记录 数据库变更: - 扩展 tb_commission_withdrawal_request 新增提现单号等字段 - 扩展 tb_account 新增 is_primary 字段 - 扩展 tb_commission_record 新增 shop_id、balance_after - 扩展 tb_commission_withdrawal_setting 新增每日提现次数限制 - 扩展 tb_iot_card、tb_device 新增 shop_id 冗余字段 - 新建 tb_enterprise_card_authorization 企业卡授权表 - 新建 tb_asset_allocation_record 资产分配记录表 - 数据迁移:owner_type 枚举值 agent 统一为 shop 测试: - 新增 7 个单元测试文件覆盖各服务 - 修复集成测试 Redis 依赖问题
This commit is contained in:
@@ -31,6 +31,27 @@ func RegisterAdminRoutes(router fiber.Router, handlers *bootstrap.Handlers, midd
|
||||
if handlers.ShopAccount != nil {
|
||||
registerShopAccountRoutes(authGroup, handlers.ShopAccount, doc, basePath)
|
||||
}
|
||||
if handlers.ShopCommission != nil {
|
||||
registerShopCommissionRoutes(authGroup, handlers.ShopCommission, doc, basePath)
|
||||
}
|
||||
if handlers.CommissionWithdrawal != nil {
|
||||
registerCommissionWithdrawalRoutes(authGroup, handlers.CommissionWithdrawal, doc, basePath)
|
||||
}
|
||||
if handlers.CommissionWithdrawalSetting != nil {
|
||||
registerCommissionWithdrawalSettingRoutes(authGroup, handlers.CommissionWithdrawalSetting, doc, basePath)
|
||||
}
|
||||
if handlers.Enterprise != nil {
|
||||
registerEnterpriseRoutes(authGroup, handlers.Enterprise, doc, basePath)
|
||||
}
|
||||
if handlers.EnterpriseCard != nil {
|
||||
registerEnterpriseCardRoutes(authGroup, handlers.EnterpriseCard, doc, basePath)
|
||||
}
|
||||
if handlers.CustomerAccount != nil {
|
||||
registerCustomerAccountRoutes(authGroup, handlers.CustomerAccount, doc, basePath)
|
||||
}
|
||||
if handlers.MyCommission != nil {
|
||||
registerMyCommissionRoutes(authGroup, handlers.MyCommission, doc, basePath)
|
||||
}
|
||||
}
|
||||
|
||||
func registerAdminAuthRoutes(router fiber.Router, handler interface{}, authMiddleware fiber.Handler, doc *openapi.Generator, basePath string) {
|
||||
|
||||
68
internal/routes/commission.go
Normal file
68
internal/routes/commission.go
Normal file
@@ -0,0 +1,68 @@
|
||||
package routes
|
||||
|
||||
import (
|
||||
"github.com/gofiber/fiber/v2"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/handler/admin"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/openapi"
|
||||
)
|
||||
|
||||
func registerCommissionWithdrawalRoutes(router fiber.Router, handler *admin.CommissionWithdrawalHandler, doc *openapi.Generator, basePath string) {
|
||||
commission := router.Group("/commission")
|
||||
groupPath := basePath + "/commission"
|
||||
|
||||
Register(commission, doc, groupPath, "GET", "/withdrawal-requests", handler.ListWithdrawalRequests, RouteSpec{
|
||||
Summary: "提现申请列表",
|
||||
Tags: []string{"佣金提现审批"},
|
||||
Input: new(model.WithdrawalRequestListReq),
|
||||
Output: new(model.WithdrawalRequestPageResult),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(commission, doc, groupPath, "POST", "/withdrawal-requests/:id/approve", handler.ApproveWithdrawal, RouteSpec{
|
||||
Summary: "审批通过提现申请",
|
||||
Tags: []string{"佣金提现审批"},
|
||||
Input: new(model.ApproveWithdrawalReq),
|
||||
Output: new(model.WithdrawalApprovalResp),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(commission, doc, groupPath, "POST", "/withdrawal-requests/:id/reject", handler.RejectWithdrawal, RouteSpec{
|
||||
Summary: "拒绝提现申请",
|
||||
Tags: []string{"佣金提现审批"},
|
||||
Input: new(model.RejectWithdrawalReq),
|
||||
Output: new(model.WithdrawalApprovalResp),
|
||||
Auth: true,
|
||||
})
|
||||
}
|
||||
|
||||
// registerCommissionWithdrawalSettingRoutes 注册提现配置管理路由
|
||||
func registerCommissionWithdrawalSettingRoutes(router fiber.Router, handler *admin.CommissionWithdrawalSettingHandler, doc *openapi.Generator, basePath string) {
|
||||
commission := router.Group("/commission")
|
||||
groupPath := basePath + "/commission"
|
||||
|
||||
Register(commission, doc, groupPath, "POST", "/withdrawal-settings", handler.Create, RouteSpec{
|
||||
Summary: "新增提现配置",
|
||||
Tags: []string{"提现配置管理"},
|
||||
Input: new(model.CreateWithdrawalSettingReq),
|
||||
Output: new(model.WithdrawalSettingItem),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(commission, doc, groupPath, "GET", "/withdrawal-settings", handler.List, RouteSpec{
|
||||
Summary: "提现配置列表",
|
||||
Tags: []string{"提现配置管理"},
|
||||
Input: new(model.WithdrawalSettingListReq),
|
||||
Output: new(model.WithdrawalSettingPageResult),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(commission, doc, groupPath, "GET", "/withdrawal-settings/current", handler.GetCurrent, RouteSpec{
|
||||
Summary: "获取当前生效的提现配置",
|
||||
Tags: []string{"提现配置管理"},
|
||||
Input: nil,
|
||||
Output: new(model.WithdrawalSettingItem),
|
||||
Auth: true,
|
||||
})
|
||||
}
|
||||
54
internal/routes/customer_account.go
Normal file
54
internal/routes/customer_account.go
Normal file
@@ -0,0 +1,54 @@
|
||||
package routes
|
||||
|
||||
import (
|
||||
"github.com/gofiber/fiber/v2"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/handler/admin"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/openapi"
|
||||
)
|
||||
|
||||
func registerCustomerAccountRoutes(router fiber.Router, handler *admin.CustomerAccountHandler, doc *openapi.Generator, basePath string) {
|
||||
accounts := router.Group("/customer-accounts")
|
||||
groupPath := basePath + "/customer-accounts"
|
||||
|
||||
Register(accounts, doc, groupPath, "GET", "", handler.List, RouteSpec{
|
||||
Summary: "客户账号列表",
|
||||
Tags: []string{"客户账号管理"},
|
||||
Input: new(model.CustomerAccountListReq),
|
||||
Output: new(model.CustomerAccountPageResult),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(accounts, doc, groupPath, "POST", "", handler.Create, RouteSpec{
|
||||
Summary: "新增代理商账号",
|
||||
Tags: []string{"客户账号管理"},
|
||||
Input: new(model.CreateCustomerAccountReq),
|
||||
Output: new(model.CustomerAccountItem),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(accounts, doc, groupPath, "PUT", "/:id", handler.Update, RouteSpec{
|
||||
Summary: "编辑账号",
|
||||
Tags: []string{"客户账号管理"},
|
||||
Input: new(model.UpdateCustomerAccountReq),
|
||||
Output: new(model.CustomerAccountItem),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(accounts, doc, groupPath, "PUT", "/:id/password", handler.UpdatePassword, RouteSpec{
|
||||
Summary: "修改账号密码",
|
||||
Tags: []string{"客户账号管理"},
|
||||
Input: new(model.UpdateCustomerAccountPasswordReq),
|
||||
Output: nil,
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(accounts, doc, groupPath, "PUT", "/:id/status", handler.UpdateStatus, RouteSpec{
|
||||
Summary: "修改账号状态",
|
||||
Tags: []string{"客户账号管理"},
|
||||
Input: new(model.UpdateCustomerAccountStatusReq),
|
||||
Output: nil,
|
||||
Auth: true,
|
||||
})
|
||||
}
|
||||
54
internal/routes/enterprise.go
Normal file
54
internal/routes/enterprise.go
Normal file
@@ -0,0 +1,54 @@
|
||||
package routes
|
||||
|
||||
import (
|
||||
"github.com/gofiber/fiber/v2"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/handler/admin"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/openapi"
|
||||
)
|
||||
|
||||
func registerEnterpriseRoutes(router fiber.Router, handler *admin.EnterpriseHandler, doc *openapi.Generator, basePath string) {
|
||||
enterprises := router.Group("/enterprises")
|
||||
groupPath := basePath + "/enterprises"
|
||||
|
||||
Register(enterprises, doc, groupPath, "POST", "", handler.Create, RouteSpec{
|
||||
Summary: "新增企业客户",
|
||||
Tags: []string{"企业客户管理"},
|
||||
Input: new(model.CreateEnterpriseReq),
|
||||
Output: new(model.CreateEnterpriseResp),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(enterprises, doc, groupPath, "GET", "", handler.List, RouteSpec{
|
||||
Summary: "查询企业客户列表",
|
||||
Tags: []string{"企业客户管理"},
|
||||
Input: new(model.EnterpriseListReq),
|
||||
Output: new(model.EnterprisePageResult),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(enterprises, doc, groupPath, "PUT", "/:id", handler.Update, RouteSpec{
|
||||
Summary: "编辑企业信息",
|
||||
Tags: []string{"企业客户管理"},
|
||||
Input: new(model.UpdateEnterpriseReq),
|
||||
Output: new(model.EnterpriseItem),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(enterprises, doc, groupPath, "PUT", "/:id/status", handler.UpdateStatus, RouteSpec{
|
||||
Summary: "启用/禁用企业",
|
||||
Tags: []string{"企业客户管理"},
|
||||
Input: new(model.UpdateEnterpriseStatusReq),
|
||||
Output: nil,
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(enterprises, doc, groupPath, "PUT", "/:id/password", handler.UpdatePassword, RouteSpec{
|
||||
Summary: "修改企业账号密码",
|
||||
Tags: []string{"企业客户管理"},
|
||||
Input: new(model.UpdateEnterprisePasswordReq),
|
||||
Output: nil,
|
||||
Auth: true,
|
||||
})
|
||||
}
|
||||
62
internal/routes/enterprise_card.go
Normal file
62
internal/routes/enterprise_card.go
Normal file
@@ -0,0 +1,62 @@
|
||||
package routes
|
||||
|
||||
import (
|
||||
"github.com/gofiber/fiber/v2"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/handler/admin"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/openapi"
|
||||
)
|
||||
|
||||
func registerEnterpriseCardRoutes(router fiber.Router, handler *admin.EnterpriseCardHandler, doc *openapi.Generator, basePath string) {
|
||||
enterprises := router.Group("/enterprises")
|
||||
groupPath := basePath + "/enterprises"
|
||||
|
||||
Register(enterprises, doc, groupPath, "POST", "/:id/allocate-cards/preview", handler.AllocateCardsPreview, RouteSpec{
|
||||
Summary: "卡授权预检",
|
||||
Tags: []string{"企业卡授权"},
|
||||
Input: new(model.AllocateCardsPreviewReq),
|
||||
Output: new(model.AllocateCardsPreviewResp),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(enterprises, doc, groupPath, "POST", "/:id/allocate-cards", handler.AllocateCards, RouteSpec{
|
||||
Summary: "授权卡给企业",
|
||||
Tags: []string{"企业卡授权"},
|
||||
Input: new(model.AllocateCardsReq),
|
||||
Output: new(model.AllocateCardsResp),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(enterprises, doc, groupPath, "POST", "/:id/recall-cards", handler.RecallCards, RouteSpec{
|
||||
Summary: "回收卡授权",
|
||||
Tags: []string{"企业卡授权"},
|
||||
Input: new(model.RecallCardsReq),
|
||||
Output: new(model.RecallCardsResp),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(enterprises, doc, groupPath, "GET", "/:id/cards", handler.ListCards, RouteSpec{
|
||||
Summary: "企业卡列表",
|
||||
Tags: []string{"企业卡授权"},
|
||||
Input: new(model.EnterpriseCardListReq),
|
||||
Output: new(model.EnterpriseCardPageResult),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(enterprises, doc, groupPath, "POST", "/:id/cards/:card_id/suspend", handler.SuspendCard, RouteSpec{
|
||||
Summary: "停机卡",
|
||||
Tags: []string{"企业卡授权"},
|
||||
Input: nil,
|
||||
Output: nil,
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(enterprises, doc, groupPath, "POST", "/:id/cards/:card_id/resume", handler.ResumeCard, RouteSpec{
|
||||
Summary: "复机卡",
|
||||
Tags: []string{"企业卡授权"},
|
||||
Input: nil,
|
||||
Output: nil,
|
||||
Auth: true,
|
||||
})
|
||||
}
|
||||
46
internal/routes/my_commission.go
Normal file
46
internal/routes/my_commission.go
Normal file
@@ -0,0 +1,46 @@
|
||||
package routes
|
||||
|
||||
import (
|
||||
"github.com/gofiber/fiber/v2"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/handler/admin"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/openapi"
|
||||
)
|
||||
|
||||
func registerMyCommissionRoutes(router fiber.Router, handler *admin.MyCommissionHandler, doc *openapi.Generator, basePath string) {
|
||||
my := router.Group("/my")
|
||||
groupPath := basePath + "/my"
|
||||
|
||||
Register(my, doc, groupPath, "GET", "/commission-summary", handler.GetSummary, RouteSpec{
|
||||
Summary: "我的佣金概览",
|
||||
Tags: []string{"我的佣金"},
|
||||
Input: nil,
|
||||
Output: new(model.MyCommissionSummaryResp),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(my, doc, groupPath, "POST", "/withdrawal-requests", handler.CreateWithdrawal, RouteSpec{
|
||||
Summary: "发起提现申请",
|
||||
Tags: []string{"我的佣金"},
|
||||
Input: new(model.CreateMyWithdrawalReq),
|
||||
Output: new(model.CreateMyWithdrawalResp),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(my, doc, groupPath, "GET", "/withdrawal-requests", handler.ListWithdrawals, RouteSpec{
|
||||
Summary: "我的提现记录",
|
||||
Tags: []string{"我的佣金"},
|
||||
Input: new(model.MyWithdrawalListReq),
|
||||
Output: new(model.WithdrawalRequestPageResult),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(my, doc, groupPath, "GET", "/commission-records", handler.ListRecords, RouteSpec{
|
||||
Summary: "我的佣金明细",
|
||||
Tags: []string{"我的佣金"},
|
||||
Input: new(model.MyCommissionRecordListReq),
|
||||
Output: new(model.MyCommissionRecordPageResult),
|
||||
Auth: true,
|
||||
})
|
||||
}
|
||||
@@ -89,3 +89,32 @@ func registerShopAccountRoutes(router fiber.Router, handler *admin.ShopAccountHa
|
||||
Auth: true,
|
||||
})
|
||||
}
|
||||
|
||||
func registerShopCommissionRoutes(router fiber.Router, handler *admin.ShopCommissionHandler, doc *openapi.Generator, basePath string) {
|
||||
shops := router.Group("/shops")
|
||||
groupPath := basePath + "/shops"
|
||||
|
||||
Register(shops, doc, groupPath, "GET", "/commission-summary", handler.ListCommissionSummary, RouteSpec{
|
||||
Summary: "代理商佣金列表",
|
||||
Tags: []string{"代理商佣金管理"},
|
||||
Input: new(model.ShopCommissionSummaryListReq),
|
||||
Output: new(model.ShopCommissionSummaryPageResult),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(shops, doc, groupPath, "GET", "/:shop_id/withdrawal-requests", handler.ListWithdrawalRequests, RouteSpec{
|
||||
Summary: "代理商提现记录",
|
||||
Tags: []string{"代理商佣金管理"},
|
||||
Input: new(model.ShopWithdrawalRequestListReq),
|
||||
Output: new(model.ShopWithdrawalRequestPageResult),
|
||||
Auth: true,
|
||||
})
|
||||
|
||||
Register(shops, doc, groupPath, "GET", "/:shop_id/commission-records", handler.ListCommissionRecords, RouteSpec{
|
||||
Summary: "代理商佣金明细",
|
||||
Tags: []string{"代理商佣金管理"},
|
||||
Input: new(model.ShopCommissionRecordListReq),
|
||||
Output: new(model.ShopCommissionRecordPageResult),
|
||||
Auth: true,
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user