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 变更、无迁移、无运行时开关。
202 lines
6.3 KiB
Go
202 lines
6.3 KiB
Go
package exporter
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"gorm.io/gorm"
|
|
|
|
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
|
)
|
|
|
|
// AgentRechargeDataSource 代理充值导出数据源。
|
|
type AgentRechargeDataSource struct {
|
|
db *gorm.DB
|
|
}
|
|
|
|
// NewAgentRechargeDataSource 创建代理充值导出数据源。
|
|
func NewAgentRechargeDataSource(db *gorm.DB) *AgentRechargeDataSource {
|
|
return &AgentRechargeDataSource{db: db}
|
|
}
|
|
|
|
// Scene 返回导出场景编码。
|
|
func (s *AgentRechargeDataSource) Scene() string {
|
|
return constants.ExportTaskSceneAgentRecharge
|
|
}
|
|
|
|
// Count 统计代理充值导出行数。
|
|
func (s *AgentRechargeDataSource) Count(ctx context.Context, params ExportParams) (int, error) {
|
|
var total int64
|
|
query, err := s.applyFilters(s.baseQuery(ctx), params)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
if err := query.Count(&total).Error; err != nil {
|
|
return 0, err
|
|
}
|
|
return int(total), nil
|
|
}
|
|
|
|
// Headers 返回代理充值导出表头。
|
|
func (s *AgentRechargeDataSource) Headers(context.Context, ExportParams) ([]string, error) {
|
|
return []string{
|
|
"充值单号", "店铺名称", "充值类型", "充值金额(元)", "实付金额(元)", "充值前余额(元)", "充值后余额(元)",
|
|
"状态", "支付方式", "运营备注", "驳回原因", "创建时间", "支付时间", "完成时间", "提交人", "审批来源", "审批状态", "支付凭证",
|
|
}, nil
|
|
}
|
|
|
|
// Fetch 按 offset/limit 查询代理充值导出数据。
|
|
func (s *AgentRechargeDataSource) Fetch(ctx context.Context, params ExportParams, offset, limit int) ([][]string, error) {
|
|
if limit <= 0 {
|
|
return [][]string{}, nil
|
|
}
|
|
|
|
var items []agentRechargeExportRow
|
|
filtered, err := s.applyFilters(s.baseQuery(ctx), params)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
query := filtered.
|
|
Select(`
|
|
r.recharge_no,
|
|
r.amount,
|
|
r.payment_method,
|
|
r.status,
|
|
r.remark,
|
|
COALESCE(r.rejection_reason, '') AS rejection_reason,
|
|
r.created_at,
|
|
r.paid_at,
|
|
r.completed_at,
|
|
COALESCE(sh.shop_name, '') AS shop_name,
|
|
COALESCE(ac.username, '') AS submitter_name,
|
|
ai.provider AS approval_provider,
|
|
ai.status AS approval_status,
|
|
wt.amount AS actual_amount,
|
|
wt.balance_before,
|
|
wt.balance_after,
|
|
COALESCE((SELECT string_agg(voucher.value, ',' ORDER BY voucher.ordinality)
|
|
FROM jsonb_array_elements_text(COALESCE(r.payment_voucher_key, '[]'::jsonb)) WITH ORDINALITY AS voucher(value, ordinality)), '') AS voucher_keys
|
|
`).
|
|
Joins("LEFT JOIN tb_shop AS sh ON sh.id = r.shop_id").
|
|
Joins("LEFT JOIN tb_account AS ac ON ac.id = r.user_id").
|
|
Joins("LEFT JOIN tb_approval_instance AS ai ON ai.id = r.approval_instance_id").
|
|
Joins(`LEFT JOIN LATERAL (
|
|
SELECT t.amount, t.balance_before, t.balance_after
|
|
FROM tb_agent_wallet_transaction AS t
|
|
WHERE t.reference_type = ?
|
|
AND t.reference_id = r.id
|
|
AND t.transaction_type = ?
|
|
AND t.status = ?
|
|
AND t.deleted_at IS NULL
|
|
ORDER BY t.id ASC
|
|
LIMIT 1
|
|
) AS wt ON TRUE`, constants.ReferenceTypeTopup, constants.AgentTransactionTypeRecharge, constants.TransactionStatusSuccess).
|
|
Order("r.id ASC").
|
|
Limit(limit).
|
|
Offset(offset)
|
|
if err := query.Scan(&items).Error; err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
rows := make([][]string, 0, len(items))
|
|
for _, item := range items {
|
|
rows = append(rows, []string{
|
|
item.RechargeNo,
|
|
item.ShopName,
|
|
formatRechargeType(item.PaymentMethod),
|
|
formatMoneyYuan(item.Amount),
|
|
formatOptionalMoneyYuan(item.ActualAmount),
|
|
formatOptionalMoneyYuan(item.BalanceBefore),
|
|
formatOptionalMoneyYuan(item.BalanceAfter),
|
|
constants.GetRechargeStatusName(item.Status),
|
|
constants.GetBusinessPaymentMethodName(item.PaymentMethod),
|
|
item.Remark,
|
|
item.RejectionReason,
|
|
item.CreatedAt.Format(exportTimeLayout),
|
|
formatOptionalTime(item.PaidAt),
|
|
formatOptionalTime(item.CompletedAt),
|
|
item.SubmitterName,
|
|
formatApprovalProvider(item.ApprovalProvider),
|
|
formatOptionalApprovalStatus(item.ApprovalStatus),
|
|
item.VoucherKeys,
|
|
})
|
|
}
|
|
return rows, nil
|
|
}
|
|
|
|
func (s *AgentRechargeDataSource) baseQuery(ctx context.Context) *gorm.DB {
|
|
return s.db.WithContext(ctx).Table("tb_agent_recharge_record AS r").Where("r.deleted_at IS NULL")
|
|
}
|
|
|
|
func (s *AgentRechargeDataSource) applyFilters(query *gorm.DB, params ExportParams) (*gorm.DB, error) {
|
|
query = applyExportShopScope(query, params, "r.shop_id")
|
|
if shopID, ok := filterUint(params.Filters, "shop_id"); ok {
|
|
query = query.Where("r.shop_id = ?", shopID)
|
|
}
|
|
if status, ok := filterInt(params.Filters, "status"); ok {
|
|
query = query.Where("r.status = ?", status)
|
|
}
|
|
start, end, err := strictTimeRange(params.Filters)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if start != nil {
|
|
query = query.Where("r.created_at >= ?", *start)
|
|
}
|
|
if end != nil {
|
|
query = query.Where("r.created_at <= ?", *end)
|
|
}
|
|
return query, nil
|
|
}
|
|
|
|
type agentRechargeExportRow struct {
|
|
RechargeNo string `gorm:"column:recharge_no"`
|
|
ShopName string `gorm:"column:shop_name"`
|
|
Amount int64 `gorm:"column:amount"`
|
|
ActualAmount *int64 `gorm:"column:actual_amount"`
|
|
BalanceBefore *int64 `gorm:"column:balance_before"`
|
|
BalanceAfter *int64 `gorm:"column:balance_after"`
|
|
PaymentMethod string `gorm:"column:payment_method"`
|
|
Status int `gorm:"column:status"`
|
|
Remark string `gorm:"column:remark"`
|
|
RejectionReason string `gorm:"column:rejection_reason"`
|
|
CreatedAt time.Time `gorm:"column:created_at"`
|
|
PaidAt *time.Time `gorm:"column:paid_at"`
|
|
CompletedAt *time.Time `gorm:"column:completed_at"`
|
|
SubmitterName string `gorm:"column:submitter_name"`
|
|
ApprovalProvider *string `gorm:"column:approval_provider"`
|
|
ApprovalStatus *int `gorm:"column:approval_status"`
|
|
VoucherKeys string `gorm:"column:voucher_keys"`
|
|
}
|
|
|
|
func formatRechargeType(paymentMethod string) string {
|
|
if paymentMethod == constants.RechargeMethodOffline {
|
|
return "员工线下代充值"
|
|
}
|
|
return "在线充值"
|
|
}
|
|
|
|
func formatOptionalMoneyYuan(value *int64) string {
|
|
if value == nil {
|
|
return ""
|
|
}
|
|
return formatMoneyYuan(*value)
|
|
}
|
|
|
|
func formatApprovalProvider(provider *string) string {
|
|
if provider == nil || *provider == "" {
|
|
return ""
|
|
}
|
|
if *provider == constants.IntegrationProviderWeCom {
|
|
return "企业微信"
|
|
}
|
|
return *provider
|
|
}
|
|
|
|
func formatOptionalApprovalStatus(status *int) string {
|
|
if status == nil {
|
|
return ""
|
|
}
|
|
return constants.GetApprovalStatusName(*status)
|
|
}
|