Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Has been cancelled
AUG26-008。
- 迁移 000214–000217:tb_shop 全局唯一且不可修改的随机分销码(含存量回填)、
tb_agent_distribution_registration 待审批注册记录、tb_withdrawal_qualification 资料版本、
tb_commission_withdrawal_request_attempt 审批尝试记录,以及提现申请的 latest_*/异常标记列;
不修改既有迁移,down 在存在本 Change 业务事实或新类型场景行时拒绝破坏性回滚。
- 公开接口 POST /api/c/v1/agent-distribution-registrations:无认证,复用既有短信验证码校验、
消费与限流;无效分销码、停用上级、验证码无效或已消费统一返回「分销码不可用」且不落库,
审批通过前不创建店铺、账号或钱包。
- 审批通过才在同一事务内建启用店铺、代理主账号、钱包、上级层级与业务员快照,驳回不建实体,
重复回调不重复建实体,提交后清理上级下级缓存。
- 提现资料资格按不可变版本保存,替换合同或法人身份证即新增版本并同事务失效旧有效版本;
超管作废原因必填;代理停用与店铺删除联动失效。
- 提现每次提交或重提新增不可变审批尝试记录并冻结金额;企业微信通过仅一次从冻结扣减、
保持状态 2 并写 paid_at(不使用状态 4),驳回/cancelled/deleted 仅一次释放,
通过后撤销不回滚、不重新冻结、只写正交异常标记;加锁顺序统一为申请→尝试→钱包。
- 本地人工终审对已关联审批实例的申请返回状态冲突,approval_instance_id 为空的存量申请保持既有行为,
不新增任何配置开关。
- 补齐审批业务类型注册点全集:业务类型与场景字段常量、场景 DTO 两处枚举与中文描述、
场景字段白名单/合法类型/中文名、数据库 CHECK、Worker 决策消费者与装配、审批审计资源映射,
以及三个新审计资源与 13 个审计动作;失败/拒绝审计改为必达。
- 新增后台路由与 OpenAPI:资格提交/查询/作废、提现申请/重提/详情、店铺详情返回只读分销码。
- 归档本 Change:主 Spec 新增 agent-distribution-withdrawal 能力(5 个 Requirement)。
验证(junhong_cmp_test + Redis DB 6,显式 DB_*,未重置整库):
- 迁移 up → version 217 且 dirty=false → down 3 → up 回 217,fixture 复核残留为 0。
- 受控状态机脚手架 227 项通过 / 0 项失败,覆盖 18 组场景(幂等与乱序回调、资金冻结/释放/重提、
退款回扣 × 在途提现并发、负向场景拒绝审计与 14 个动作码审计真实落库)。
- gofmt 空、go build/go vet 通过、gendocs 与工作区逐字节一致、context-health 通过、
openspec validate --strict 通过、doctor healthy;自动化测试按项目决策为 N/A。
运行期前置(未完成,非代码交付物):由超管经 PUT /api/admin/wecom/scenes/{business_type} 为
agent_distribution_approval、withdrawal_qualification_approval、commission_withdrawal_approval
配置启用场景与模板控件映射;未配置时相应提交失败关闭。
267 lines
8.8 KiB
Go
267 lines
8.8 KiB
Go
package admin
|
|
|
|
import (
|
|
"strconv"
|
|
|
|
"github.com/go-playground/validator/v10"
|
|
"github.com/gofiber/fiber/v2"
|
|
|
|
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
|
distributionquery "github.com/break/junhong_cmp_fiber/internal/query/distributionwithdrawal"
|
|
shopQuery "github.com/break/junhong_cmp_fiber/internal/query/shop"
|
|
shopCommissionService "github.com/break/junhong_cmp_fiber/internal/service/shop_commission"
|
|
"github.com/break/junhong_cmp_fiber/pkg/errors"
|
|
"github.com/break/junhong_cmp_fiber/pkg/middleware"
|
|
"github.com/break/junhong_cmp_fiber/pkg/response"
|
|
)
|
|
|
|
// ShopCommissionHandler 代理商资金管理 Handler
|
|
type ShopCommissionHandler struct {
|
|
service *shopCommissionService.Service
|
|
fundSummaryQuery *shopQuery.FundSummaryQuery
|
|
withdrawalQuery *distributionquery.Query
|
|
validator *validator.Validate
|
|
}
|
|
|
|
// NewShopCommissionHandler 创建代理商资金管理 Handler
|
|
func NewShopCommissionHandler(
|
|
service *shopCommissionService.Service,
|
|
validate *validator.Validate,
|
|
) *ShopCommissionHandler {
|
|
return &ShopCommissionHandler{service: service, validator: validate}
|
|
}
|
|
|
|
// SetWithdrawalQuery 注入提现申请详情查询。
|
|
func (h *ShopCommissionHandler) SetWithdrawalQuery(query *distributionquery.Query) {
|
|
h.withdrawalQuery = query
|
|
}
|
|
|
|
// SetFundSummaryQuery 注入代理商资金概况 Query。
|
|
func (h *ShopCommissionHandler) SetFundSummaryQuery(query *shopQuery.FundSummaryQuery) {
|
|
h.fundSummaryQuery = query
|
|
}
|
|
|
|
// ListFundSummary 代理商资金概况列表
|
|
// GET /api/admin/shops/fund-summary
|
|
func (h *ShopCommissionHandler) ListFundSummary(c *fiber.Ctx) error {
|
|
var req dto.ShopFundSummaryListReq
|
|
if err := c.QueryParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
if c.Context().QueryArgs().Has("shop_id") && (req.ShopID == nil || *req.ShopID == 0) {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
if h.fundSummaryQuery == nil {
|
|
return errors.New(errors.CodeInternalError, "代理商资金概况查询能力未配置")
|
|
}
|
|
result, err := h.fundSummaryQuery.List(c.UserContext(), req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.SuccessWithPagination(c, result.Items, result.Total, result.Page, result.Size)
|
|
}
|
|
|
|
// ListWithdrawalRequests 代理商提现记录列表
|
|
// GET /api/admin/shops/:shop_id/withdrawal-requests
|
|
func (h *ShopCommissionHandler) ListWithdrawalRequests(c *fiber.Ctx) error {
|
|
shopID, err := strconv.ParseUint(c.Params("shop_id"), 10, 64)
|
|
if err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "无效的店铺 ID")
|
|
}
|
|
|
|
var req dto.ShopWithdrawalRequestListReq
|
|
if err := c.QueryParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
result, err := h.service.ListShopWithdrawalRequests(c.UserContext(), uint(shopID), &req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.SuccessWithPagination(c, result.Items, result.Total, result.Page, result.Size)
|
|
}
|
|
|
|
// ListCommissionRecords 代理商佣金明细列表
|
|
// GET /api/admin/shops/:shop_id/commission-records
|
|
func (h *ShopCommissionHandler) ListCommissionRecords(c *fiber.Ctx) error {
|
|
shopID, err := strconv.ParseUint(c.Params("shop_id"), 10, 64)
|
|
if err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "无效的店铺 ID")
|
|
}
|
|
|
|
var req dto.ShopCommissionRecordListReq
|
|
if err := c.QueryParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
result, err := h.service.ListShopCommissionRecords(c.UserContext(), uint(shopID), &req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.SuccessWithPagination(c, result.Items, result.Total, result.Page, result.Size)
|
|
}
|
|
|
|
// ResolveCommissionRecord 修正待审佣金记录
|
|
// POST /api/admin/commission-records/:id/resolve
|
|
func (h *ShopCommissionHandler) ResolveCommissionRecord(c *fiber.Ctx) error {
|
|
recordID, err := strconv.ParseUint(c.Params("id"), 10, 64)
|
|
if err != nil || recordID == 0 {
|
|
return errors.New(errors.CodeInvalidParam, "无效的佣金记录ID")
|
|
}
|
|
|
|
var req dto.CommissionRecordResolveRequest
|
|
if err := c.BodyParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
if err := h.service.ResolveCommissionRecord(c.UserContext(), uint(recordID), &req); err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.Success(c, nil)
|
|
}
|
|
|
|
// GetCommissionStats 代理商佣金统计
|
|
// GET /api/admin/shops/:shop_id/commission-stats
|
|
func (h *ShopCommissionHandler) GetCommissionStats(c *fiber.Ctx) error {
|
|
shopID, err := strconv.ParseUint(c.Params("shop_id"), 10, 64)
|
|
if err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "无效的店铺 ID")
|
|
}
|
|
|
|
var req dto.CommissionStatsRequest
|
|
if err := c.QueryParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
result, err := h.service.GetStats(c.UserContext(), uint(shopID), &req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.Success(c, result)
|
|
}
|
|
|
|
// GetCommissionDailyStats 代理商每日佣金统计
|
|
// GET /api/admin/shops/:shop_id/commission-daily-stats
|
|
func (h *ShopCommissionHandler) GetCommissionDailyStats(c *fiber.Ctx) error {
|
|
shopID, err := strconv.ParseUint(c.Params("shop_id"), 10, 64)
|
|
if err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "无效的店铺 ID")
|
|
}
|
|
|
|
var req dto.DailyCommissionStatsRequest
|
|
if err := c.QueryParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
result, err := h.service.GetDailyStats(c.UserContext(), uint(shopID), &req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.Success(c, result)
|
|
}
|
|
|
|
// CreateWithdrawal 发起提现申请
|
|
// POST /api/admin/shops/:shop_id/withdrawal-requests
|
|
func (h *ShopCommissionHandler) CreateWithdrawal(c *fiber.Ctx) error {
|
|
shopID, err := strconv.ParseUint(c.Params("shop_id"), 10, 64)
|
|
if err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "无效的店铺 ID")
|
|
}
|
|
|
|
var req dto.CreateMyWithdrawalReq
|
|
if err := c.BodyParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
result, err := h.service.CreateWithdrawalRequest(c.UserContext(), uint(shopID), &req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.Success(c, result)
|
|
}
|
|
|
|
// ResubmitWithdrawal 重提被驳回的提现申请
|
|
// PUT /api/admin/shops/:shop_id/withdrawal-requests/:id
|
|
func (h *ShopCommissionHandler) ResubmitWithdrawal(c *fiber.Ctx) error {
|
|
shopID, err := strconv.ParseUint(c.Params("shop_id"), 10, 64)
|
|
if err != nil || shopID == 0 {
|
|
return errors.New(errors.CodeInvalidParam, "无效的店铺 ID")
|
|
}
|
|
requestID, err := strconv.ParseUint(c.Params("id"), 10, 64)
|
|
if err != nil || requestID == 0 {
|
|
return errors.New(errors.CodeInvalidParam, "无效的提现申请 ID")
|
|
}
|
|
var req dto.ResubmitWithdrawalReq
|
|
if err := c.BodyParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "请求参数解析失败")
|
|
}
|
|
if h.validator == nil {
|
|
return errors.New(errors.CodeInternalError, "提现重提校验器未配置")
|
|
}
|
|
if err := h.validator.Struct(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "提现重提参数不合法")
|
|
}
|
|
result, err := h.service.ResubmitWithdrawalRequest(c.UserContext(), uint(shopID), uint(requestID), &req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return response.Success(c, result)
|
|
}
|
|
|
|
// WithdrawalDetail 提现申请详情
|
|
// GET /api/admin/shops/:shop_id/withdrawal-requests/:id
|
|
// 仅返回当前账号数据范围内的申请;超出范围与不存在返回同一结果。
|
|
func (h *ShopCommissionHandler) WithdrawalDetail(c *fiber.Ctx) error {
|
|
shopID, err := strconv.ParseUint(c.Params("shop_id"), 10, 64)
|
|
if err != nil || shopID == 0 {
|
|
return errors.New(errors.CodeInvalidParam, "无效的店铺 ID")
|
|
}
|
|
requestID, err := strconv.ParseUint(c.Params("id"), 10, 64)
|
|
if err != nil || requestID == 0 {
|
|
return errors.New(errors.CodeInvalidParam, "无效的提现申请 ID")
|
|
}
|
|
if h.withdrawalQuery == nil {
|
|
return errors.New(errors.CodeInternalError, "提现详情查询能力未配置")
|
|
}
|
|
if err := middleware.CanManageShop(c.UserContext(), uint(shopID)); err != nil {
|
|
return errors.New(errors.CodeForbidden, "无权限操作该资源或资源不存在")
|
|
}
|
|
detail, err := h.withdrawalQuery.WithdrawalDetail(c.UserContext(), uint(requestID))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if detail.ShopID != uint(shopID) {
|
|
return errors.New(errors.CodeNotFound, "提现申请不存在")
|
|
}
|
|
return response.Success(c, detail)
|
|
}
|
|
|
|
// ListMainWalletTransactions 预充值钱包流水列表
|
|
// GET /api/admin/shops/:shop_id/main-wallet/transactions
|
|
func (h *ShopCommissionHandler) ListMainWalletTransactions(c *fiber.Ctx) error {
|
|
shopID, err := strconv.ParseUint(c.Params("shop_id"), 10, 64)
|
|
if err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "无效的店铺 ID")
|
|
}
|
|
|
|
var req dto.MainWalletTransactionListRequest
|
|
if err := c.QueryParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
result, err := h.service.ListMainWalletTransactions(c.UserContext(), uint(shopID), &req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.SuccessWithPagination(c, result.Items, result.Total, result.Page, result.Size)
|
|
}
|