feat: 实名即生效套餐沉默期、延期办理与资产出库时间
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Failing after 8m39s

- 迁移 000259~000265:套餐记录沉默期字段与扫描索引、套餐默认沉默期、延期政策/流水/订单/批次/明细 5 张表、默认政策与系统配置(总开关默认关闭)、企微审批白名单、卡与设备出库时间及出库记录
- 沉默期设置(订单发放、自动购包、钱包续费)、后台购买时调整(超默认值按政策免审或企微审批)、统一判定与激活闸门、排队与孤儿扫描跳过过期套餐、过期套餐禁止退款、每 10 分钟扫描
- 总开关专用接口与打开前 4 项检查;延期政策;延期资格与计费;H5 自助与后台二维码在线支付(商户池路由)、支付回调与查单恢复、线下登记、特殊/批量延期、异常重试与原路退款;沉默期审批场景与终态处理
- 换货沉默期流水与出库时间;卡/设备列表、详情、导出与出库记录接口;延期订单与即将过期套餐列表及导出;财务流水纳入延期支付
- 沉默期与出库时间回填工具 cmd/silence-backfill;前端接口变更说明

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
邹进
2026-10-27 16:32:58 +09:00
parent d2b0d2f534
commit 909f4d0ec2
112 changed files with 10473 additions and 82 deletions

View File

@@ -15,7 +15,9 @@ const (
deviceExportBaseHeaderCount = 6
deviceExportCardGroupSize = 5
// deviceExportTailHeaderCount 是当前尾部固定列数(含「关联手机号」「设备合计(GB)」列)。
deviceExportTailHeaderCount = 8
deviceExportTailHeaderCount = 9
// deviceExportPollingTailHeaderCount 是追加「出库时间」前(以「是否轮询」结尾)的尾部列数
deviceExportPollingTailHeaderCount = 8
// deviceExportGBTailHeaderCount 是新增「是否轮询」之前、带「设备合计(GB)」的尾部列数,供历史任务表头反解。
deviceExportGBTailHeaderCount = 7
// deviceExportPhoneTailHeaderCount 是新增「设备合计(GB)」之前、带「关联手机号」的尾部列数,供历史任务表头反解。
@@ -29,6 +31,8 @@ const (
deviceExportTotalGBHeader = "设备合计(GB)"
// deviceExportPollingHeader 是「是否轮询」列的表头,位于导出最后一列。
deviceExportPollingHeader = "是否轮询"
// deviceExportOutboundHeader 出库时间(当前世代首次购买套餐的支付时间)
deviceExportOutboundHeader = "出库时间"
// deviceExportMBPerGB MB 换算 GB 的进制。
deviceExportMBPerGB = 1024
)
@@ -127,6 +131,12 @@ func (s *DeviceDataSource) baseQuery(ctx context.Context) *gorm.DB {
// 导出任务运行在 Worker 中,权限只能使用任务创建时保存的店铺范围快照。
func (s *DeviceDataSource) applyFilters(query *gorm.DB, params ExportParams) *gorm.DB {
query = applyExportShopScope(query, params, "d.shop_id")
if start, ok := filterTime(params.Filters, "outbound_start"); ok {
query = query.Where("d.outbound_at >= ?", start)
}
if end, ok := filterTime(params.Filters, "outbound_end"); ok {
query = query.Where("d.outbound_at <= ?", end)
}
if virtualNo, ok := filterString(params.Filters, "virtual_no"); ok {
query = query.Where("d.virtual_no LIKE ?", "%"+virtualNo+"%")
@@ -273,7 +283,8 @@ func (s *DeviceDataSource) fetchDevices(ctx context.Context, params ExportParams
COALESCE(sh.shop_name, '') AS shop_name,
COALESCE(ps.series_name, '') AS series_name,
COALESCE(aw.balance, 0) AS wallet_balance,
d.enable_polling
d.enable_polling,
d.outbound_at
`).
Order("d.id ASC").
Limit(limit).
@@ -352,15 +363,16 @@ func (s *DeviceDataSource) fetchActivePackages(ctx context.Context, deviceIDs []
}
type deviceExportRow struct {
ID uint `gorm:"column:id"`
VirtualNo string `gorm:"column:virtual_no"`
IMEI string `gorm:"column:imei"`
DeviceName string `gorm:"column:device_name"`
DeviceModel string `gorm:"column:device_model"`
ShopName string `gorm:"column:shop_name"`
SeriesName string `gorm:"column:series_name"`
WalletBalance int64 `gorm:"column:wallet_balance"`
EnablePolling bool `gorm:"column:enable_polling"`
ID uint `gorm:"column:id"`
VirtualNo string `gorm:"column:virtual_no"`
IMEI string `gorm:"column:imei"`
DeviceName string `gorm:"column:device_name"`
DeviceModel string `gorm:"column:device_model"`
ShopName string `gorm:"column:shop_name"`
SeriesName string `gorm:"column:series_name"`
WalletBalance int64 `gorm:"column:wallet_balance"`
EnablePolling bool `gorm:"column:enable_polling"`
OutboundAt *time.Time `gorm:"column:outbound_at"`
}
type deviceExportCardRow struct {
@@ -404,6 +416,7 @@ func buildDeviceExportHeaders(cardGroups int) []string {
deviceExportAssociatedPhoneHeader,
deviceExportTotalGBHeader,
deviceExportPollingHeader,
deviceExportOutboundHeader,
)
return headers
}
@@ -457,9 +470,12 @@ func buildDeviceExportRow(item deviceExportRow, cards []deviceExportCardRow, pkg
if tailCount >= deviceExportGBTailHeaderCount {
row = append(row, formatMB(totalUsage/deviceExportMBPerGB))
}
if tailCount >= deviceExportTailHeaderCount {
if tailCount >= deviceExportPollingTailHeaderCount {
row = append(row, yesNo(item.EnablePolling))
}
if tailCount >= deviceExportTailHeaderCount {
row = append(row, formatOptionalTime(item.OutboundAt))
}
return row
}
@@ -475,8 +491,10 @@ func deviceExportTailCount(headers []string) int {
return deviceExportTailHeaderCount
}
switch headers[len(headers)-1] {
case deviceExportPollingHeader:
case deviceExportOutboundHeader:
return deviceExportTailHeaderCount
case deviceExportPollingHeader:
return deviceExportPollingTailHeaderCount
case deviceExportTotalGBHeader:
return deviceExportGBTailHeaderCount
case deviceExportAssociatedPhoneHeader:

View File

@@ -40,7 +40,7 @@ func (s *IotCardDataSource) Count(ctx context.Context, params ExportParams) (int
// Headers 返回 IoT 卡导出表头。
func (s *IotCardDataSource) Headers(ctx context.Context, params ExportParams) ([]string, error) {
// 「关联手机号」「套餐到期时间」「使用流量(GB)」「剩余流量(GB)」依次固定追加在尾部:导出表头在 dispatch 阶段落库,历史任务重导出沿用同一列序。
return []string{"ICCID", "MSISDN", "绑定设备虚拟号", "运营商", "店铺名称", "绑定设备名称", "是否实名", "实名时间", "网络状态", "套餐名称", "使用流量(MB)", "剩余流量(MB)", iotCardExportAssociatedPhoneHeader, iotCardExportFinalExpiryHeader, iotCardExportUsageGBHeader, iotCardExportRemainingGBHeader, iotCardExportPollingHeader}, nil
return []string{"ICCID", "MSISDN", "绑定设备虚拟号", "运营商", "店铺名称", "绑定设备名称", "是否实名", "实名时间", "网络状态", "套餐名称", "使用流量(MB)", "剩余流量(MB)", iotCardExportAssociatedPhoneHeader, iotCardExportFinalExpiryHeader, iotCardExportUsageGBHeader, iotCardExportRemainingGBHeader, iotCardExportPollingHeader, iotCardExportOutboundHeader}, nil
}
// Fetch 按 offset/limit 查询 IoT 卡导出数据。
@@ -62,6 +62,7 @@ func (s *IotCardDataSource) Fetch(ctx context.Context, params ExportParams, offs
c.real_name_status,
c.enable_polling,
c.first_realname_at,
c.outbound_at,
c.network_status,
COALESCE(pkg.package_name, '') AS package_name,
COALESCE(pkg.data_usage_mb, 0) AS data_usage_mb,
@@ -82,7 +83,7 @@ func (s *IotCardDataSource) Fetch(ctx context.Context, params ExportParams, offs
if err != nil {
return nil, err
}
includeExpiry, includeGB, includePolling := iotCardExportTailColumns(params.ResolvedHeaders)
includeExpiry, includeGB, includePolling, includeOutbound := iotCardExportTailColumns(params.ResolvedHeaders)
var finalExpiries map[uint]string
if includeExpiry {
finalExpiries, err = s.loadFinalExpiries(ctx, cardIDs)
@@ -118,6 +119,9 @@ func (s *IotCardDataSource) Fetch(ctx context.Context, params ExportParams, offs
if includePolling {
row = append(row, yesNo(item.EnablePolling))
}
if includeOutbound {
row = append(row, formatOptionalTime(item.OutboundAt))
}
rows = append(rows, row)
}
return rows, nil
@@ -141,19 +145,21 @@ func (s *IotCardDataSource) loadFinalExpiries(ctx context.Context, cardIDs []uin
// iotCardExportTailColumns 按冻结表头末列识别尾部版本:末列「是否轮询」输出到期、GB 与是否轮询列,
// 末列「剩余流量(GB)」输出到期列与 GB 列,末列「套餐到期时间」只输出到期列,更早的表头都不输出;无冻结表头按当前版本输出。
func iotCardExportTailColumns(headers []string) (includeExpiry, includeGB, includePolling bool) {
func iotCardExportTailColumns(headers []string) (includeExpiry, includeGB, includePolling, includeOutbound bool) {
if len(headers) == 0 {
return true, true, true
return true, true, true, true
}
switch headers[len(headers)-1] {
case iotCardExportOutboundHeader:
return true, true, true, true
case iotCardExportPollingHeader:
return true, true, true
return true, true, true, false
case iotCardExportRemainingGBHeader:
return true, true, false
return true, true, false, false
case iotCardExportFinalExpiryHeader:
return true, false, false
return true, false, false, false
default:
return false, false, false
return false, false, false, false
}
}
@@ -198,6 +204,12 @@ func (s *IotCardDataSource) baseQuery(ctx context.Context) *gorm.DB {
// 导出任务运行在 Worker 中,权限只能使用任务创建时保存的店铺范围快照。
func (s *IotCardDataSource) applyFilters(ctx context.Context, query *gorm.DB, params ExportParams) *gorm.DB {
query = applyExportShopScope(query, params, "c.shop_id")
if start, ok := filterTime(params.Filters, "outbound_start"); ok {
query = query.Where("c.outbound_at >= ?", start)
}
if end, ok := filterTime(params.Filters, "outbound_end"); ok {
query = query.Where("c.outbound_at <= ?", end)
}
if isStandalone, ok := filterOptionalBool(params.Filters, "is_standalone"); ok {
query = query.Where("c.is_standalone = ?", isStandalone)
@@ -302,6 +314,8 @@ const (
iotCardExportRemainingGBHeader = "剩余流量(GB)"
// iotCardExportPollingHeader 是「是否轮询」列的表头,位于 GB 流量列之后、导出最后一列。
iotCardExportPollingHeader = "是否轮询"
// iotCardExportOutboundHeader 出库时间(当前世代首次购买套餐的支付时间)
iotCardExportOutboundHeader = "出库时间"
)
type iotCardExportRow struct {
@@ -314,6 +328,7 @@ type iotCardExportRow struct {
DeviceName string `gorm:"column:device_name"`
RealNameStatus int `gorm:"column:real_name_status"`
FirstRealnameAt *time.Time `gorm:"column:first_realname_at"`
OutboundAt *time.Time `gorm:"column:outbound_at"`
NetworkStatus int `gorm:"column:network_status"`
PackageName string `gorm:"column:package_name"`
DataUsageMB int64 `gorm:"column:data_usage_mb"`

View File

@@ -7,6 +7,7 @@ import (
"gorm.io/gorm"
"github.com/break/junhong_cmp_fiber/internal/store/postgres"
"github.com/break/junhong_cmp_fiber/pkg/constants"
)
@@ -42,6 +43,7 @@ func (s *PackageDataSource) Headers(context.Context, ExportParams) ([]string, er
"套餐时长说明", "套餐周期类型", "套餐天数", "真流量额度(MB)", "虚流量额度(MB)",
"是否启用虚流量", "虚流量比例", "流量重置周期", "到期时间基准", "成本价(元)",
"建议售价(元)", "价格配置状态", "状态", "上架状态", "是否赠送套餐",
"默认沉默期(天)", "是否支持付费延期",
"创建人ID", "更新人ID", "创建时间", "更新时间", "删除时间",
}, nil
}
@@ -111,6 +113,9 @@ func (s *PackageDataSource) applyFilters(query *gorm.DB, params ExportParams) *g
if packageType, ok := filterString(params.Filters, "package_type"); ok {
query = query.Where("p.package_type = ?", packageType)
}
if filterBool(params.Filters, "silence_unconfigured") {
query = query.Where(postgres.SilenceUnconfiguredPackageCondition("p"))
}
return query
}
@@ -141,6 +146,8 @@ func (s *PackageDataSource) selectColumns(params ExportParams) string {
p.status,
` + shelfStatusColumn + ` AS shelf_status,
p.is_gift,
p.silence_period_days,
p.silence_extension_enabled,
p.creator,
p.updater,
p.created_at,
@@ -167,6 +174,8 @@ type packageExportRow struct {
Status int `gorm:"column:status"`
ShelfStatus int `gorm:"column:shelf_status"`
IsGift bool `gorm:"column:is_gift"`
SilencePeriodDays *int `gorm:"column:silence_period_days"`
SilenceExtension bool `gorm:"column:silence_extension_enabled"`
Creator uint `gorm:"column:creator"`
Updater uint `gorm:"column:updater"`
CreatedAt time.Time `gorm:"column:created_at"`
@@ -195,6 +204,8 @@ func buildPackageExportRow(item packageExportRow) []string {
constants.GetStatusName(item.Status),
constants.GetShelfStatusName(item.ShelfStatus),
formatYesNo(item.IsGift),
formatSilencePeriodDays(item.SilencePeriodDays),
formatYesNo(item.SilenceExtension),
strconv.FormatUint(uint64(item.Creator), 10),
strconv.FormatUint(uint64(item.Updater), 10),
item.CreatedAt.Format(exportTimeLayout),
@@ -226,3 +237,10 @@ func formatYesNo(value bool) string {
}
return "否"
}
func formatSilencePeriodDays(days *int) string {
if days == nil {
return ""
}
return strconv.Itoa(*days)
}

View File

@@ -0,0 +1,218 @@
package exporter
import (
"context"
"strconv"
"gorm.io/gorm"
"github.com/break/junhong_cmp_fiber/internal/model"
"github.com/break/junhong_cmp_fiber/internal/model/dto"
packagesilencequery "github.com/break/junhong_cmp_fiber/internal/query/packagesilence"
"github.com/break/junhong_cmp_fiber/pkg/constants"
)
// 沉默期延期订单与即将过期 / 已过期套餐导出(add-package-silence-period)。
// 导出在 Worker 中执行,数据范围按任务创建时冻结的账号类型与店铺范围重建上下文。
var silenceOrderHeaders = []string{
"订单号", "批次号", "资产类型", "资产标识", "套餐名称", "来源", "状态", "输入天数", "计费月数", "延长天数",
"单价(元/月)", "金额(元)", "政策", "下单时截止", "预计新截止", "支付方式", "收款商户", "交易流水号",
"线下收款方式", "线下交易单号", "实付金额(元)", "支付时间", "延期生效时间", "退款单号", "退款金额(元)", "退款时间", "异常说明", "创建时间",
}
var silenceUsageHeaders = []string{
"套餐记录ID", "订单号", "资产类型", "资产标识", "店铺", "套餐名称", "购买时间", "沉默期状态", "沉默期天数",
"截止时间", "过期时间", "累计延期天数", "付费延期天数", "延期次数", "免费延期次数", "调整审批中",
}
// silenceExportContext 用任务冻结的账号类型与店铺范围构造查询上下文。
func silenceExportContext(ctx context.Context, params ExportParams) context.Context {
ctx = context.WithValue(ctx, constants.ContextKeyUserType, params.UserType)
if params.CreatorShopID != nil {
ctx = context.WithValue(ctx, constants.ContextKeyShopID, *params.CreatorShopID)
}
if params.UserType == constants.UserTypeAgent {
ctx = context.WithValue(ctx, constants.ContextKeySubordinateShopIDs, append([]uint{}, params.ScopeShopIDs...))
}
return ctx
}
// SilenceOrderDataSource 沉默期延期订单导出数据源(场景 package_silence_order)。
type SilenceOrderDataSource struct {
query *packagesilencequery.Query
}
// NewSilenceOrderDataSource 创建延期订单导出数据源。
func NewSilenceOrderDataSource(db *gorm.DB) *SilenceOrderDataSource {
return &SilenceOrderDataSource{query: packagesilencequery.NewQuery(db)}
}
// Scene 返回导出场景编码。
func (s *SilenceOrderDataSource) Scene() string { return constants.ExportTaskSceneSilenceOrder }
func (s *SilenceOrderDataSource) filter(params ExportParams) packagesilencequery.OrderFilter {
req := dto.SilenceOrderListRequest{}
if id, ok := filterUint(params.Filters, "package_usage_id"); ok && id > 0 {
req.PackageUsageID = &id
}
if id, ok := filterUint(params.Filters, "package_id"); ok && id > 0 {
req.PackageID = &id
}
req.AssetIdentifier, _ = filterString(params.Filters, "asset_identifier")
req.OrderNo, _ = filterString(params.Filters, "order_no")
req.Status, _ = filterString(params.Filters, "status")
req.Source, _ = filterString(params.Filters, "source")
req.PaymentMethod, _ = filterString(params.Filters, "payment_method")
req.MerchantName, _ = filterString(params.Filters, "merchant_name")
req.ThirdPartyTradeNo, _ = filterString(params.Filters, "third_party_trade_no")
req.PaidStart, _ = filterString(params.Filters, "paid_start")
req.PaidEnd, _ = filterString(params.Filters, "paid_end")
return packagesilencequery.OrderFilter{Request: req}
}
// Count 统计导出行数。
func (s *SilenceOrderDataSource) Count(ctx context.Context, params ExportParams) (int, error) {
query, err := s.query.OrderQuery(silenceExportContext(ctx, params), s.filter(params))
if err != nil {
return 0, err
}
var total int64
if err := query.Count(&total).Error; err != nil {
return 0, err
}
return int(total), nil
}
// Headers 返回导出表头。
func (s *SilenceOrderDataSource) Headers(context.Context, ExportParams) ([]string, error) {
return silenceOrderHeaders, nil
}
// Fetch 按 offset/limit 返回导出行。
func (s *SilenceOrderDataSource) Fetch(ctx context.Context, params ExportParams, offset, limit int) ([][]string, error) {
if limit <= 0 {
return [][]string{}, nil
}
ctx = silenceExportContext(ctx, params)
query, err := s.query.OrderQuery(ctx, s.filter(params))
if err != nil {
return nil, err
}
var orders []model.PackageSilenceExtensionOrder
if err := query.Select("o.*").Order("o.id ASC").Offset(offset).Limit(limit).Find(&orders).Error; err != nil {
return nil, err
}
items, err := s.query.OrderItems(ctx, orders)
if err != nil {
return nil, err
}
rows := make([][]string, 0, len(items))
for _, item := range items {
rows = append(rows, []string{
item.OrderNo, item.BatchNo, item.AssetType, item.AssetIdentifier, item.PackageName, item.SourceName, item.StatusName,
strconv.Itoa(item.InputDays), strconv.Itoa(item.Months), strconv.Itoa(item.ExtensionDays),
formatMoneyYuan(item.UnitPrice), formatMoneyYuan(item.Amount), item.PolicyName,
item.BeforeDeadlineAt.Format(exportTimeLayout), item.ExpectedDeadlineAt.Format(exportTimeLayout),
item.PaymentMethod, item.PaymentMerchantName, item.ThirdPartyTradeNo, item.OfflinePaymentMethodName, item.OfflineTradeNo,
formatOptionalMoney(item.PaidAmount), formatOptionalTime(item.PaidAt), formatOptionalTime(item.CompletedAt),
item.RefundNo, formatOptionalMoney(item.RefundAmount), formatOptionalTime(item.RefundedAt), item.ExceptionSummary,
item.CreatedAt.Format(exportTimeLayout),
})
}
return rows, nil
}
// SilenceUsageDataSource 即将过期 / 已过期套餐导出数据源(场景 package_silence_usage)。
type SilenceUsageDataSource struct {
query *packagesilencequery.Query
}
// NewSilenceUsageDataSource 创建沉默期套餐导出数据源。
func NewSilenceUsageDataSource(db *gorm.DB) *SilenceUsageDataSource {
return &SilenceUsageDataSource{query: packagesilencequery.NewQuery(db)}
}
// Scene 返回导出场景编码。
func (s *SilenceUsageDataSource) Scene() string { return constants.ExportTaskSceneSilenceUsage }
func (s *SilenceUsageDataSource) request(params ExportParams) dto.SilenceUsageListRequest {
req := dto.SilenceUsageListRequest{}
req.View, _ = filterString(params.Filters, "view")
if days, ok := filterInt(params.Filters, "within_days"); ok {
req.WithinDays = days
}
req.AssetIdentifier, _ = filterString(params.Filters, "asset_identifier")
if id, ok := filterUint(params.Filters, "package_id"); ok && id > 0 {
req.PackageID = &id
}
if id, ok := filterUint(params.Filters, "shop_id"); ok && id > 0 {
req.ShopID = &id
}
req.DeadlineStart, _ = filterString(params.Filters, "deadline_start")
req.DeadlineEnd, _ = filterString(params.Filters, "deadline_end")
return req
}
// Count 统计导出行数。
func (s *SilenceUsageDataSource) Count(ctx context.Context, params ExportParams) (int, error) {
query, err := s.query.UsageQuery(silenceExportContext(ctx, params), s.request(params))
if err != nil {
return 0, err
}
var total int64
if err := query.Count(&total).Error; err != nil {
return 0, err
}
return int(total), nil
}
// Headers 返回导出表头。
func (s *SilenceUsageDataSource) Headers(context.Context, ExportParams) ([]string, error) {
return silenceUsageHeaders, nil
}
// Fetch 按 offset/limit 返回导出行。
func (s *SilenceUsageDataSource) Fetch(ctx context.Context, params ExportParams, offset, limit int) ([][]string, error) {
if limit <= 0 {
return [][]string{}, nil
}
ctx = silenceExportContext(ctx, params)
query, err := s.query.UsageQuery(ctx, s.request(params))
if err != nil {
return nil, err
}
items, err := s.query.FetchUsages(ctx, query, offset, limit)
if err != nil {
return nil, err
}
rows := make([][]string, 0, len(items))
for _, item := range items {
view := item.Silence
if view == nil {
view = &dto.PackageSilenceView{}
}
rows = append(rows, []string{
strconv.FormatUint(uint64(item.PackageUsageID), 10), item.OrderNo, item.AssetType, item.AssetIdentifier, item.ShopName,
item.PackageName, item.CreatedAt.Format(exportTimeLayout), view.SilenceStatusName, formatOptionalInt(view.SilencePeriodDays),
formatOptionalTime(view.SilenceDeadlineAt), formatOptionalTime(view.SilenceExpiredAt), strconv.Itoa(view.SilenceExtendedDays),
strconv.Itoa(view.SilencePaidExtendedDays), strconv.Itoa(view.SilenceExtensionCount), strconv.Itoa(view.SilenceFreeExtensionUsed),
formatYesNo(view.SilenceAdjustPending),
})
}
return rows, nil
}
func formatOptionalMoney(value *int64) string {
if value == nil {
return ""
}
return formatMoneyYuan(*value)
}
func formatOptionalInt(value *int) string {
if value == nil {
return ""
}
return strconv.Itoa(*value)
}

View File

@@ -49,6 +49,8 @@ func NewDefaultRegistry(db *gorm.DB) *Registry {
NewOperationsRenewalDataSource(db),
NewStopResumeRuleDataSource(db),
NewPollingPauseDataSource(db),
NewSilenceOrderDataSource(db),
NewSilenceUsageDataSource(db),
NewStopRefusedAlertDataSource(db, stopResumeAlertThreshold(db)),
)
}