fix: 第1批 M2、M3、M16、M23 导入与展示类缺陷
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Failing after 8h37m36s
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Failing after 8h37m36s
- M2 批量换绑表头改为“平台登录账号”,只认手机号,细分格式、不存在、多匹配、非平台、已禁用失败原因 - M3 后台订单列表与详情返回 C 端在线购买的交易流水号、支付渠道、商户名称,详情新增全部支付单 payments - M16 预警规则不再返回 real_data_mb,预警列表/详情新增 threshold_mb,导出末列追加“阈值流量(MB)” - M23 设备导入 IMEI 必填,空 IMEI 行记为失败 - OpenSpec Change fix-august-iteration-follow-up-gaps:13/18,导入任务、导出任务的 Worker 端到端验证与前端/运营通知待部署后完成
This commit is contained in:
@@ -57,7 +57,7 @@ func (q *Query) ListRules(ctx context.Context, request dto.ListPackageTrafficAle
|
||||
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询套餐真流量预警规则总数失败")
|
||||
}
|
||||
if err := query.Select("r.id, r.package_id, r.threshold_percent, r.enabled, r.remark, r.updated_at, " +
|
||||
"COALESCE(p.package_name, '') AS package_name, COALESCE(p.real_data_mb, 0) AS real_data_mb").
|
||||
"COALESCE(p.package_name, '') AS package_name").
|
||||
Order("r.updated_at DESC, r.id DESC").
|
||||
Offset((page - 1) * pageSize).Limit(pageSize).
|
||||
Scan(&rows).Error; err != nil {
|
||||
@@ -69,7 +69,6 @@ func (q *Query) ListRules(ctx context.Context, request dto.ListPackageTrafficAle
|
||||
ID: row.ID,
|
||||
PackageID: row.PackageID,
|
||||
PackageName: row.PackageName,
|
||||
RealDataMB: row.RealDataMB,
|
||||
ThresholdPercent: row.ThresholdPercent,
|
||||
Enabled: row.Enabled == constants.StatusEnabled,
|
||||
EnabledName: enabledStatusName(row.Enabled),
|
||||
@@ -84,7 +83,6 @@ type ruleRow struct {
|
||||
ID uint `gorm:"column:id"`
|
||||
PackageID uint `gorm:"column:package_id"`
|
||||
PackageName string `gorm:"column:package_name"`
|
||||
RealDataMB int64 `gorm:"column:real_data_mb"`
|
||||
ThresholdPercent float64 `gorm:"column:threshold_percent"`
|
||||
Enabled int `gorm:"column:enabled"`
|
||||
Remark string `gorm:"column:remark"`
|
||||
@@ -241,6 +239,7 @@ func (q *Query) projectAlerts(ctx context.Context, alerts []*model.PackageTraffi
|
||||
LimitMB: alert.LimitMBSnapshot,
|
||||
UsagePercent: alert.UsagePercentSnapshot,
|
||||
ThresholdPercent: alert.ThresholdPercentSnapshot,
|
||||
ThresholdMB: domainpackagetrafficalert.ThresholdMB(alert.LimitMBSnapshot, alert.ThresholdPercentSnapshot),
|
||||
ExpiresAt: alert.ExpiresAtSnapshot,
|
||||
TriggeredAt: alert.TriggeredAt,
|
||||
ShopName: alert.ShopNameSnapshot,
|
||||
|
||||
Reference in New Issue
Block a user