break
1aa4eacee2
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 9m26s
用 PRD 2.14 语义整体替换退款佣金「整单全额失效」实现：原佣金保持已发放不变， 回溯事实落在新表 tb_commission_clawback_record 的负数、不可提现明细上。 - 新增成对迁移 000220 建 tb_commission_clawback_record，唯一约束 (refund_id, original_commission_id) 为权威幂等键，附店铺+时间/原佣金/订单索引。 - 回溯用例（internal/service/refund/clawback.go）：准入仅由退款申请状态、审批异常 标记与退款方式决定；金额按分整数计算，分母取冻结实收（缺失回落审批尝试）、 分子原路取渠道成功金额，乘法用 math/big 中间量，舍入差自末条起向前补差； 终态判据要求订单佣金已离开待计算且不存在 status IN (1,2,99) 的记录。 - 三层幂等：唯一约束兜底、佣金行行锁 + 钱包乐观锁、commission_deducted 仅作投影 并带 WHERE commission_deducted = false 条件置位；闭合三结果为已回溯、无需回溯、 审批异常转人工。 - 事务内顺序固定：锁提现申请行 → 锁尝试行 → 解冻冻结 → 置驳回 → 插回溯明细 → 扣 balance（允许为负）→ 写负数流水 → 审计；删除旧全额失效写入与其两个审计调用点， refund.invalidate_commission 仅保留常量与注册供历史审计读取。 - 读侧：佣金明细列表 status 筛选透传，两表 UNION ALL 合并分页并以 source ASC 作 末位次序键；新增佣金明细详情接口并同步路由与 OpenAPI 装配。 - 导出：新增 commission_record 场景（白名单、exporter 注册、DTO oneof、DataSource 与列定义），粒度为佣金记录，原佣金与回溯各一行，金额保持分且可为负。 - 新增退款佣金回溯周期补偿任务（@every 1m / MaxRetry(3) / Timeout(10m) / Unique(10m)，独立队列），保留启动时补偿扫描，判据与既有实现一致。 Refs: AUG26-012
295 lines
9.7 KiB
Go
295 lines
9.7 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)
|
|
}
|
|
|
|
// GetCommissionRecord 佣金明细详情
|
|
// GET /api/admin/shops/:shop_id/commission-records/:id
|
|
// source 区分原佣金与回溯明细；越权与不存在返回同一结果。
|
|
func (h *ShopCommissionHandler) GetCommissionRecord(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")
|
|
}
|
|
recordID, err := strconv.ParseUint(c.Params("id"), 10, 64)
|
|
if err != nil || recordID == 0 {
|
|
return errors.New(errors.CodeInvalidParam, "无效的佣金明细ID")
|
|
}
|
|
|
|
var req dto.ShopCommissionRecordDetailReq
|
|
if err := c.QueryParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
req.ShopID = uint(shopID)
|
|
req.ID = uint(recordID)
|
|
|
|
result, err := h.service.GetShopCommissionRecord(c.UserContext(), &req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.Success(c, result)
|
|
}
|
|
|
|
// 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)
|
|
}
|