dachui/hfb_sys
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(distribution): 移除生产环境资金冻结，测试与生产口径统一

Browse Source 
liveMoneyMovementEnabled 按 APP_ENV 在生产冻结结算入账、站点提现与自动释放，
与测试环境行为不一致，且该开关在 APP_ENV 缺失时为 fail-open。本次整体移除：

- 删除 liveMoneyMovementEnabled 与 ErrLiveMoneyMovementFrozen
- MarkSettlementBatch / ApplySiteWithdrawal / AutoReleaseDueSettlements 去掉守卫
- handler 去掉 403 settlement_frozen 映射
- 测试改为断言生产环境结算入账与提现正常执行
This commit is contained in:
yml2213
2026-09-10 18:44:52 +08:00
parent 768902f2f7
commit dbe9aaabfe
5 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/modules/distribution/repository_test.go
+18 -9
View File
@@ -1038,16 +1038,16 @@ func TestSettlementBatchSplitsThreePartyBySite(t *testing.T) {
}
}
func TestLiveMoneyMovementFrozenInProduction(t *testing.T) {
func TestMoneyMovementNotFrozenInProduction(t *testing.T) {
t.Setenv("APP_ENV", "production")
db := distributionTestDB(t)
repo := NewRepository(db)
site := model.DistributionSite{SiteCode: "frozen", SiteName: "冻结站", Domain: "frozen.example.com", Status: "active"}
site := model.DistributionSite{SiteCode: "prod", SiteName: "生产口径站", Domain: "prod.example.com", Status: "active"}
if err := db.Create(&site).Error; err != nil {
t.Fatal(err)
}
batch := model.DistributionSettlementBatch{
SiteID: site.ID, BatchNo: "B-FROZEN", PeriodStart: time.Now().Add(-time.Hour), PeriodEnd: time.Now(),
SiteID: site.ID, BatchNo: "B-PROD", PeriodStart: time.Now().Add(-time.Hour), PeriodEnd: time.Now(),
TotalAmountCent: 100, Status: "draft",
}
if err := db.Create(&batch).Error; err != nil {
@@ -1055,7 +1055,7 @@ func TestLiveMoneyMovementFrozenInProduction(t *testing.T) {
}
// 结算明细的 order_id / party_id 都带外键，必须先落库对应的订单与参与方。
order := model.RentalOrder{
OrderNo: "ORD-FROZEN", ListingID: 1, AccountID: 1, OwnerID: 1, RenterID: 1,
OrderNo: "ORD-PROD", ListingID: 1, AccountID: 1, OwnerID: 1, RenterID: 1,
Status: "completed", SettlementMode: "platform_managed",
}
if err := db.Create(&order).Error; err != nil {
@@ -1073,13 +1073,22 @@ func TestLiveMoneyMovementFrozenInProduction(t *testing.T) {
}).Error; err != nil {
t.Fatal(err)
}
if _, err := repo.MarkSettlementBatch(t.Context(), 0, batch.ID); err != ErrLiveMoneyMovementFrozen {
t.Fatalf("settle err = %v", err)
// 生产与测试口径一致：结算入账与站点提现不再按 APP_ENV 冻结。
settled, err := repo.MarkSettlementBatch(t.Context(), 0, batch.ID)
if err != nil {
t.Fatalf("生产环境结算入账不应被冻结: %v", err)
}
if _, err := repo.ApplySiteWithdrawal(t.Context(), 0, site.ID, ApplySiteWithdrawalRequest{
if settled.Status != "settled" {
t.Fatalf("batch status = %s, want settled", settled.Status)
}
wd, err := repo.ApplySiteWithdrawal(t.Context(), 0, site.ID, ApplySiteWithdrawalRequest{
SiteID: site.ID, AmountCent: 1, AccountType: "alipay", AccountName: "x", AccountNo: "1",
}); err != ErrLiveMoneyMovementFrozen {
t.Fatalf("withdraw err = %v", err)
})
if err != nil {
t.Fatalf("生产环境站点提现不应被冻结: %v", err)
}
if wd.AmountCent != 1 || wd.Status != "pending" {
t.Fatalf("unexpected withdrawal: %+v", wd)
}
}