break
62419d4b17
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 13m40s
统一时间筛选：新增共享严格解析器 pkg/utils/time_range.go，只接受带显式时区的 RFC3339 秒级时间（拒绝小数秒、无时区、date-only、空格分隔、±hhmm、未补零、非法日期与越界偏移），闭区间含两端、归一为 UTC 瞬时，创建期与执行期共用同一份实现。 端点改造（13 个入口）：IoT 卡导入任务、设备导入任务、导出任务列表、订单列表参数名不变仅收紧解析；换货、分配记录、代理充值、临期列表改名 start_time/end_time（旧参数名显式拒绝）；提现记录两处删除解析失败静默跳过，非法参数一律 1001；授权记录由起始闭结束开改为闭区间含两端；临期列表改按当前生效主套餐最终到期时刻比较，保留剩余天数上下限与既有粗放窗口。 临期导出新建：新场景 expiring_asset 与受控入口 POST /api/admin/expiring-assets/export，复用列表候选预筛与最终到期推算，一行一资产、加油包不单独成行，列序与 111 §18.1 逐列一致，店铺/业务员/用户组按执行时当前归属补充且不超出创建时冻结范围。 佣金明细导出新增按创建时间闭区间筛选（原佣金与回溯两条分支各自创建时间列），记录粒度、列定义与余额口径不变。 冻结与遗留任务：创建期把筛选与时间边界规范化为 UTC RFC3339 秒级串写入既有 query_json，无新列无迁移；执行期只按冻结值严格解析，非法冻结值在任何分片与文件动作前落任务失败并写安全摘要，不放行全量；重试沿用原快照。达量预警导出执行期同样纳入严格解析（其入口契约、列定义与触发快照口径不变）。 归档 add-export-time-filter-standards 并新建主 Spec openspec/specs/export-time-filter/spec.md，同步 requirement-evidence.json 与入口能力矩阵，README 导出场景清单更新为 11 个场景。 验证：junhong_cmp_test + 本地隔离 Redis（DB7，测试部署共享队列 DB6 未被占用）实跑 85 PASS / 0 FAIL（接受/拒绝集合、区间与顺序语义、列表与导出同筛选行集一致、代理 HTTP 全链路与范围冻结、遗留旧格式任务安全失败、列与余额口径回归、表头逐字），门禁 gofmt/go build/gendocs 两次一致/openspec validate/doctor/context-health 全绿；无 Schema 变更、无迁移、无运行时开关。
307 lines
10 KiB
Go
307 lines
10 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"
|
|
"github.com/break/junhong_cmp_fiber/pkg/utils"
|
|
)
|
|
|
|
// 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)
|
|
}
|
|
startTime, endTime, err := utils.ParseTimeRange(req.StartTime, req.EndTime)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
result, err := h.service.ListShopWithdrawalRequests(c.UserContext(), uint(shopID), &req, startTime, endTime)
|
|
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)
|
|
}
|
|
startTime, endTime, err := utils.ParseTimeRange(req.StartTime, req.EndTime)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
result, err := h.service.ListShopCommissionRecords(c.UserContext(), uint(shopID), &req, startTime, endTime)
|
|
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, "请求参数解析失败")
|
|
}
|
|
// shop_id 与 id 只来自路径，必须在校验前回填，否则两者的 required 恒失败。
|
|
req.ShopID = uint(shopID)
|
|
req.ID = uint(requestID)
|
|
if h.validator == nil {
|
|
return errors.New(errors.CodeInternalError, "提现重提校验器未配置")
|
|
}
|
|
if err := h.validator.Struct(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam, validationMessage("提现重提参数不合法", &req, err))
|
|
}
|
|
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)
|
|
}
|