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 变更、无迁移、无运行时开关。
161 lines
4.6 KiB
Go
161 lines
4.6 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"
|
||
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
||
orderService "github.com/break/junhong_cmp_fiber/internal/service/order"
|
||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||
"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"
|
||
)
|
||
|
||
// OrderHandler 后台订单处理器
|
||
type OrderHandler struct {
|
||
service *orderService.Service
|
||
validator *validator.Validate
|
||
}
|
||
|
||
// NewOrderHandler 创建后台订单处理器
|
||
func NewOrderHandler(service *orderService.Service, validator *validator.Validate) *OrderHandler {
|
||
return &OrderHandler{service: service, validator: validator}
|
||
}
|
||
|
||
// Create 创建后台订单
|
||
// POST /api/admin/orders
|
||
func (h *OrderHandler) Create(c *fiber.Ctx) error {
|
||
var req dto.CreateAdminOrderRequest
|
||
if err := c.BodyParser(&req); err != nil {
|
||
return errors.New(errors.CodeInvalidParam, "请求参数解析失败")
|
||
}
|
||
|
||
// 验证请求参数(payment_method 必须为 wallet 或 offline)
|
||
if err := h.validator.Struct(&req); err != nil {
|
||
return errors.New(errors.CodeInvalidParam)
|
||
}
|
||
|
||
ctx := c.UserContext()
|
||
userType := middleware.GetUserTypeFromContext(ctx)
|
||
shopID := middleware.GetShopIDFromContext(ctx)
|
||
|
||
// 线下支付仅限平台用户
|
||
if req.PaymentMethod == model.PaymentMethodOffline {
|
||
if userType != constants.UserTypeSuperAdmin && userType != constants.UserTypePlatform {
|
||
return errors.New(errors.CodeForbidden, "只有平台可以使用线下支付")
|
||
}
|
||
} else if req.PaymentMethod == model.PaymentMethodWallet {
|
||
if userType != constants.UserTypeAgent && userType != constants.UserTypePlatform && userType != constants.UserTypeSuperAdmin {
|
||
return errors.New(errors.CodeForbidden, "无权创建订单")
|
||
}
|
||
} else {
|
||
// 防御性分支:DTO 验证已限制,此处兜底
|
||
return errors.New(errors.CodeInvalidParam, "后台仅支持钱包支付和线下支付")
|
||
}
|
||
|
||
buyerType := ""
|
||
buyerID := uint(0)
|
||
if userType == constants.UserTypeAgent {
|
||
buyerType = model.BuyerTypeAgent
|
||
buyerID = shopID
|
||
}
|
||
|
||
order, err := h.service.CreateAdminOrder(ctx, &req, buyerType, buyerID)
|
||
if err != nil {
|
||
return err
|
||
}
|
||
|
||
return response.Success(c, order)
|
||
}
|
||
|
||
func (h *OrderHandler) Get(c *fiber.Ctx) error {
|
||
id, err := strconv.ParseUint(c.Params("id"), 10, 64)
|
||
if err != nil {
|
||
return errors.New(errors.CodeInvalidParam, "无效的订单ID")
|
||
}
|
||
|
||
order, err := h.service.Get(c.UserContext(), uint(id))
|
||
if err != nil {
|
||
return err
|
||
}
|
||
|
||
return response.Success(c, order)
|
||
}
|
||
|
||
func (h *OrderHandler) List(c *fiber.Ctx) error {
|
||
var req dto.OrderListRequest
|
||
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
|
||
}
|
||
|
||
ctx := c.UserContext()
|
||
userType := middleware.GetUserTypeFromContext(ctx)
|
||
shopID := middleware.GetShopIDFromContext(ctx)
|
||
|
||
var buyerType string
|
||
var buyerID uint
|
||
|
||
if userType == constants.UserTypeAgent {
|
||
buyerType = model.BuyerTypeAgent
|
||
buyerID = shopID
|
||
} else {
|
||
buyerType = ""
|
||
buyerID = 0
|
||
}
|
||
|
||
orders, err := h.service.List(ctx, &req, startTime, endTime, buyerType, buyerID)
|
||
if err != nil {
|
||
return err
|
||
}
|
||
|
||
return response.Success(c, orders)
|
||
}
|
||
|
||
func (h *OrderHandler) Cancel(c *fiber.Ctx) error {
|
||
id, err := strconv.ParseUint(c.Params("id"), 10, 64)
|
||
if err != nil {
|
||
return errors.New(errors.CodeInvalidParam, "无效的订单ID")
|
||
}
|
||
|
||
ctx := c.UserContext()
|
||
userType := middleware.GetUserTypeFromContext(ctx)
|
||
shopID := middleware.GetShopIDFromContext(ctx)
|
||
|
||
if userType != constants.UserTypeAgent {
|
||
return errors.New(errors.CodeForbidden, "只有代理账号可以取消订单")
|
||
}
|
||
|
||
if err := h.service.Cancel(ctx, uint(id), model.BuyerTypeAgent, shopID); err != nil {
|
||
return err
|
||
}
|
||
|
||
return response.Success(c, nil)
|
||
}
|
||
|
||
// PurchaseCheck 代购订单预检接口
|
||
// 路由: POST /api/admin/orders/purchase-check
|
||
// 参数: order_type(订单类型), resource_id(资源ID), package_ids(套餐ID列表)
|
||
// 响应: 套餐总价、强充要求、实际支付金额等预检结果
|
||
func (h *OrderHandler) PurchaseCheck(c *fiber.Ctx) error {
|
||
var req dto.PurchaseCheckRequest
|
||
if err := c.BodyParser(&req); err != nil {
|
||
return errors.New(errors.CodeInvalidParam, "请求参数解析失败")
|
||
}
|
||
|
||
result, err := h.service.GetPurchaseCheck(c.UserContext(), &req)
|
||
if err != nil {
|
||
return err
|
||
}
|
||
|
||
return response.Success(c, result)
|
||
}
|