feat: 实名即生效套餐沉默期、延期办理与资产出库时间
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Failing after 8m39s
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:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user