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:
@@ -6,6 +6,7 @@ package asset
|
||||
import (
|
||||
"context"
|
||||
stderrors "errors"
|
||||
packagesilenceapp "github.com/break/junhong_cmp_fiber/internal/application/packagesilence"
|
||||
stopresumedomain "github.com/break/junhong_cmp_fiber/internal/domain/stopresume"
|
||||
"strconv"
|
||||
"time"
|
||||
@@ -38,6 +39,7 @@ type PackageExpiryResolver interface {
|
||||
|
||||
// Service 资产查询与操作服务
|
||||
type Service struct {
|
||||
silenceSwitch SilenceSwitch
|
||||
db *gorm.DB
|
||||
deviceStore *postgres.DeviceStore
|
||||
iotCardStore *postgres.IotCardStore
|
||||
@@ -199,6 +201,7 @@ func (s *Service) buildDeviceResolveResponse(ctx context.Context, device *model.
|
||||
AssetType: "device",
|
||||
AssetID: device.ID,
|
||||
VirtualNo: device.VirtualNo,
|
||||
OutboundAt: device.OutboundAt,
|
||||
Status: device.Status,
|
||||
StatusName: constants.GetDeviceStatusName(device.Status),
|
||||
BatchNo: device.BatchNo,
|
||||
@@ -343,6 +346,7 @@ func (s *Service) buildCardResolveResponse(ctx context.Context, card *model.IotC
|
||||
AssetType: "card",
|
||||
AssetID: card.ID,
|
||||
VirtualNo: card.VirtualNo,
|
||||
OutboundAt: card.OutboundAt,
|
||||
Status: card.Status,
|
||||
StatusName: constants.GetIotCardStatusName(card.Status),
|
||||
BatchNo: card.BatchNo,
|
||||
@@ -862,7 +866,9 @@ func (s *Service) GetPackages(ctx context.Context, assetType string, id uint, pa
|
||||
|
||||
items := make([]*dto.AssetPackageHistoryNode, 0, len(history.Items))
|
||||
for _, node := range history.Items {
|
||||
items = append(items, buildAssetPackageHistoryNode(node, packageMap, callerAccountType))
|
||||
item := buildAssetPackageHistoryNode(node, packageMap, callerAccountType)
|
||||
s.fillSilenceViews(ctx, item, node)
|
||||
items = append(items, item)
|
||||
}
|
||||
|
||||
return &dto.AssetPackagesResult{
|
||||
@@ -1181,6 +1187,7 @@ func (s *Service) buildAssetPackageResponse(ctx context.Context, usage *model.Pa
|
||||
PaidAmount: paidAmount,
|
||||
RetailAmount: usage.RetailAmount,
|
||||
CreatedAt: usage.CreatedAt,
|
||||
Silence: s.silenceView(ctx, usage),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1540,3 +1547,39 @@ func (s *Service) restorePollingAfterExpiryChange(ctx context.Context, assetType
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// SilenceSwitch 读取沉默期总开关。
|
||||
type SilenceSwitch interface {
|
||||
Enabled(ctx context.Context) bool
|
||||
}
|
||||
|
||||
// SetSilenceSwitch 注入沉默期总开关;打开时资产套餐列表与详情返回沉默期信息。
|
||||
func (s *Service) SetSilenceSwitch(sw SilenceSwitch) {
|
||||
s.silenceSwitch = sw
|
||||
}
|
||||
|
||||
// silenceView 返回套餐记录的沉默期展示信息;总开关关闭时不返回。
|
||||
func (s *Service) silenceView(ctx context.Context, usage *model.PackageUsage) *dto.PackageSilenceView {
|
||||
if s.silenceSwitch == nil || !s.silenceSwitch.Enabled(ctx) {
|
||||
return nil
|
||||
}
|
||||
return packagesilenceapp.BuildView(usage, time.Now())
|
||||
}
|
||||
|
||||
// fillSilenceViews 按历史树逐节点填写沉默期展示信息。
|
||||
func (s *Service) fillSilenceViews(ctx context.Context, item *dto.AssetPackageHistoryNode, node *assetquery.PackageHistoryNode) {
|
||||
if item == nil || node == nil {
|
||||
return
|
||||
}
|
||||
item.Silence = s.silenceView(ctx, node.Usage)
|
||||
for index, child := range node.Children {
|
||||
if index < len(item.Children) {
|
||||
s.fillSilenceViews(ctx, item.Children[index], child)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// SilenceView 返回套餐记录的沉默期展示信息(H5 资产套餐历史复用);总开关关闭时返回 nil。
|
||||
func (s *Service) SilenceView(ctx context.Context, usage *model.PackageUsage) *dto.PackageSilenceView {
|
||||
return s.silenceView(ctx, usage)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user