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 变更、无迁移、无运行时开关。
306 lines
11 KiB
Go
306 lines
11 KiB
Go
package admin
|
|
|
|
import (
|
|
"bytes"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/bytedance/sonic"
|
|
"github.com/go-playground/validator/v10"
|
|
"github.com/gofiber/fiber/v2"
|
|
|
|
agentrechargeapp "github.com/break/junhong_cmp_fiber/internal/application/agentrecharge"
|
|
systemconfigapp "github.com/break/junhong_cmp_fiber/internal/application/systemconfig"
|
|
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
|
agentrechargequery "github.com/break/junhong_cmp_fiber/internal/query/agentrecharge"
|
|
agentRechargeSvc "github.com/break/junhong_cmp_fiber/internal/service/agent_recharge"
|
|
"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"
|
|
)
|
|
|
|
// AgentRechargeHandler 代理预充值 Handler
|
|
type AgentRechargeHandler struct {
|
|
service *agentRechargeSvc.Service
|
|
online *agentrechargeapp.OnlineCreationService
|
|
status *agentrechargequery.PaymentStatusQuery
|
|
ocr *agentrechargeapp.PaymentVoucherOCRService
|
|
config *systemconfigapp.UpdateService
|
|
validator *validator.Validate
|
|
}
|
|
|
|
// SetOnlineCreationService 注入代理在线扫码充值用例。
|
|
func (h *AgentRechargeHandler) SetOnlineCreationService(service *agentrechargeapp.OnlineCreationService) {
|
|
h.online = service
|
|
}
|
|
|
|
// SetPaymentStatusQuery 注入代理充值本地支付状态 Query。
|
|
func (h *AgentRechargeHandler) SetPaymentStatusQuery(query *agentrechargequery.PaymentStatusQuery) {
|
|
h.status = query
|
|
}
|
|
|
|
// SetPaymentVoucherOCRService 注入付款凭证识别用例。
|
|
func (h *AgentRechargeHandler) SetPaymentVoucherOCRService(service *agentrechargeapp.PaymentVoucherOCRService) {
|
|
h.ocr = service
|
|
}
|
|
|
|
// SetSystemConfigUpdateService 注入受控系统配置写服务,用于代理自充允许范围修改。
|
|
func (h *AgentRechargeHandler) SetSystemConfigUpdateService(service *systemconfigapp.UpdateService) {
|
|
h.config = service
|
|
}
|
|
|
|
// NewAgentRechargeHandler 创建代理预充值 Handler
|
|
func NewAgentRechargeHandler(service *agentRechargeSvc.Service, validator *validator.Validate) *AgentRechargeHandler {
|
|
return &AgentRechargeHandler{service: service, validator: validator}
|
|
}
|
|
|
|
// Create 创建代理充值订单
|
|
// POST /api/admin/agent-recharges
|
|
func (h *AgentRechargeHandler) Create(c *fiber.Ctx) error {
|
|
var req dto.CreateAgentRechargeRequest
|
|
decoder := sonic.ConfigStd.NewDecoder(bytes.NewReader(c.Body()))
|
|
decoder.DisallowUnknownFields()
|
|
if err := decoder.Decode(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "请求参数解析失败")
|
|
}
|
|
if err := h.validator.Struct(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
if req.PaymentMethod == constants.RechargeMethodWechat || req.PaymentMethod == constants.RechargeMethodAlipay {
|
|
return h.createOnline(c, req)
|
|
}
|
|
if strings.TrimSpace(req.RequestID) != "" {
|
|
return errors.New(errors.CodeInvalidParam, "线下充值不能传入在线请求标识")
|
|
}
|
|
result, err := h.service.Create(c.UserContext(), &req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.Success(c, result)
|
|
}
|
|
|
|
func (h *AgentRechargeHandler) createOnline(c *fiber.Ctx, req dto.CreateAgentRechargeRequest) error {
|
|
if h.online == nil {
|
|
return errors.New(errors.CodeServiceUnavailable, "代理在线充值能力未配置")
|
|
}
|
|
if req.ShopID != nil || len(req.PaymentVoucherKey) > 0 || len(req.OtherVoucherKey) > 0 ||
|
|
req.OfflinePaymentMethodID != 0 || strings.TrimSpace(req.ExternalTransactionNo) != "" || strings.TrimSpace(req.Remark) != "" {
|
|
return errors.New(errors.CodeInvalidParam, "在线充值不能指定店铺、收款方式、交易流水号、支付凭证或运营备注")
|
|
}
|
|
result, err := h.online.Execute(c.UserContext(), agentrechargeapp.CreateOnlineCommand{
|
|
AccountID: middleware.GetUserIDFromContext(c.UserContext()), UserType: middleware.GetUserTypeFromContext(c.UserContext()),
|
|
CurrentShopID: middleware.GetShopIDFromContext(c.UserContext()), Amount: req.Amount,
|
|
PaymentMethod: req.PaymentMethod, RequestID: req.RequestID, PayerClientIP: c.IP(),
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
rechargeSource, rechargeSourceName := constants.GetAgentRechargeSource(result.Payment.PaymentMethod)
|
|
return response.Success(c, &dto.AgentRechargeOnlineResponse{
|
|
RechargeID: result.Recharge.ID, RechargeNo: result.Recharge.RechargeNo, PaymentNo: result.Payment.PaymentNo,
|
|
PaymentMethod: result.Payment.PaymentMethod, Amount: result.Payment.Amount, QRContent: result.Payment.QRContent,
|
|
RechargeSource: rechargeSource, RechargeSourceName: rechargeSourceName,
|
|
Status: result.Recharge.Status, StatusName: constants.GetRechargeStatusName(result.Recharge.Status),
|
|
})
|
|
}
|
|
|
|
// PaymentMethods 查询代理在线充值可用支付方式。
|
|
// GET /api/admin/agent-recharges/payment-methods
|
|
func (h *AgentRechargeHandler) PaymentMethods(c *fiber.Ctx) error {
|
|
if h.online == nil {
|
|
return errors.New(errors.CodeServiceUnavailable, "代理在线充值能力未配置")
|
|
}
|
|
result, err := h.online.AvailablePaymentMethods(c.UserContext(), middleware.GetUserTypeFromContext(c.UserContext()))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return response.Success(c, &dto.AgentRechargePaymentMethodsResponse{
|
|
Methods: result.Methods, MinAmount: result.MinAmount, MaxAmount: result.MaxAmount,
|
|
})
|
|
}
|
|
|
|
// SelfRechargePaymentMethods 查询代理自充实际可用支付方式。
|
|
// GET /api/admin/agent-self-recharge-payment-methods
|
|
// 响应只含交集结果,不含允许范围、商户身份或凭证。
|
|
func (h *AgentRechargeHandler) SelfRechargePaymentMethods(c *fiber.Ctx) error {
|
|
return h.PaymentMethods(c)
|
|
}
|
|
|
|
// UpdateSelfRechargePaymentMethods 修改代理在线自充允许范围。
|
|
// PUT /api/admin/agent-self-recharge-payment-methods
|
|
// 复用受控系统配置写服务,获得超级管理员限定、咨询锁串行与前后值审计。
|
|
func (h *AgentRechargeHandler) UpdateSelfRechargePaymentMethods(c *fiber.Ctx) error {
|
|
var req dto.AgentSelfRechargePaymentMethodsUpdateRequest
|
|
decoder := sonic.ConfigStd.NewDecoder(bytes.NewReader(c.Body()))
|
|
decoder.DisallowUnknownFields()
|
|
if err := decoder.Decode(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "请求参数解析失败")
|
|
}
|
|
if err := h.validator.Struct(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
if h.config == nil {
|
|
return errors.New(errors.CodeServiceUnavailable, "代理自充允许范围维护能力未配置")
|
|
}
|
|
item, err := h.config.Execute(c.UserContext(), constants.SystemConfigAgentSelfRechargeAllowedMethods,
|
|
dto.UpdateSystemConfigRequest{Value: req.AllowedMethods})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
updatedAt := ""
|
|
if item.UpdatedAt != nil {
|
|
updatedAt = item.UpdatedAt.UTC().Format(time.RFC3339)
|
|
}
|
|
return response.Success(c, &dto.AgentSelfRechargePaymentMethodsUpdateResponse{
|
|
AllowedMethods: item.Value, AllowedMethodsName: constants.GetAgentSelfRechargeAllowedMethodsName(item.Value),
|
|
UpdatedAt: updatedAt,
|
|
})
|
|
}
|
|
|
|
// PaymentVoucherOCR 识别付款凭证,只返回交易流水号预填值。
|
|
// POST /api/admin/agent-recharges/payment-voucher-ocr
|
|
// 识别失败返回明确失败,不影响提交人人工填写交易流水号后创建申请。
|
|
func (h *AgentRechargeHandler) PaymentVoucherOCR(c *fiber.Ctx) error {
|
|
var req dto.AgentRechargePaymentVoucherOCRRequest
|
|
decoder := sonic.ConfigStd.NewDecoder(bytes.NewReader(c.Body()))
|
|
decoder.DisallowUnknownFields()
|
|
if err := decoder.Decode(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "请求参数解析失败")
|
|
}
|
|
if err := h.validator.Struct(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
if h.ocr == nil {
|
|
return errors.New(errors.CodeServiceUnavailable, "付款凭证识别能力未配置")
|
|
}
|
|
result, err := h.ocr.Recognize(c.UserContext(), req.PaymentVoucherKey)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return response.Success(c, &dto.AgentRechargePaymentVoucherOCRResponse{
|
|
ExternalTransactionNo: result.ExternalTransactionNo,
|
|
})
|
|
}
|
|
|
|
// List 查询代理充值订单列表
|
|
// GET /api/admin/agent-recharges
|
|
func (h *AgentRechargeHandler) List(c *fiber.Ctx) error {
|
|
var req dto.AgentRechargeListRequest
|
|
if err := rejectLegacyTimeParams(c, "start_date", "end_date"); err != nil {
|
|
return err
|
|
}
|
|
if err := c.QueryParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "请求参数解析失败")
|
|
}
|
|
if err := h.validator.Struct(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
startTime, endTime, err := utils.ParseTimeRange(req.StartTime, req.EndTime)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
list, total, err := h.service.List(c.UserContext(), &req, startTime, endTime)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.SuccessWithPagination(c, list, total, req.Page, req.PageSize)
|
|
}
|
|
|
|
// Get 查询代理充值订单详情
|
|
// GET /api/admin/agent-recharges/:id
|
|
func (h *AgentRechargeHandler) Get(c *fiber.Ctx) error {
|
|
id, err := strconv.ParseUint(c.Params("id"), 10, 64)
|
|
if err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "无效的充值记录ID")
|
|
}
|
|
|
|
result, err := h.service.GetByID(c.UserContext(), uint(id))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.Success(c, result)
|
|
}
|
|
|
|
// TriggerApproval 主动补发历史线下代理充值审批。
|
|
// POST /api/admin/agent-recharges/:id/trigger-approval
|
|
func (h *AgentRechargeHandler) TriggerApproval(c *fiber.Ctx) error {
|
|
id, err := strconv.ParseUint(c.Params("id"), 10, 64)
|
|
if err != nil || id == 0 {
|
|
return errors.New(errors.CodeInvalidParam, "无效的充值记录ID")
|
|
}
|
|
result, err := h.service.TriggerApproval(c.UserContext(), uint(id))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return response.Success(c, result)
|
|
}
|
|
|
|
// PaymentStatus 查询代理充值本地支付与到账状态。
|
|
// GET /api/admin/agent-recharges/:id/payment-status
|
|
func (h *AgentRechargeHandler) PaymentStatus(c *fiber.Ctx) error {
|
|
if h.status == nil {
|
|
return errors.New(errors.CodeServiceUnavailable, "代理充值支付状态查询未配置")
|
|
}
|
|
id, err := strconv.ParseUint(c.Params("id"), 10, 64)
|
|
if err != nil || id == 0 {
|
|
return errors.New(errors.CodeInvalidParam, "无效的充值记录ID")
|
|
}
|
|
result, err := h.status.Get(c.UserContext(), uint(id))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return response.Success(c, result)
|
|
}
|
|
|
|
// Reject 驳回代理充值订单
|
|
// POST /api/admin/agent-recharges/:id/reject
|
|
func (h *AgentRechargeHandler) Reject(c *fiber.Ctx) error {
|
|
id, err := strconv.ParseUint(c.Params("id"), 10, 64)
|
|
if err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "无效的充值记录ID")
|
|
}
|
|
|
|
var req dto.AgentRechargeRejectRequest
|
|
if err := c.BodyParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "请求参数解析失败")
|
|
}
|
|
if err := h.validator.Struct(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam)
|
|
}
|
|
|
|
if err := h.service.Reject(c.UserContext(), uint(id), req.RejectionReason); err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.Success(c, nil)
|
|
}
|
|
|
|
// OfflinePay 确认线下充值
|
|
// POST /api/admin/agent-recharges/:id/offline-pay
|
|
func (h *AgentRechargeHandler) OfflinePay(c *fiber.Ctx) error {
|
|
id, err := strconv.ParseUint(c.Params("id"), 10, 64)
|
|
if err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "无效的充值记录ID")
|
|
}
|
|
|
|
var req dto.AgentOfflinePayRequest
|
|
if err := c.BodyParser(&req); err != nil {
|
|
return errors.New(errors.CodeInvalidParam, "请求参数解析失败")
|
|
}
|
|
|
|
result, err := h.service.OfflinePay(c.UserContext(), uint(id), &req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return response.Success(c, result)
|
|
}
|