yml/hfb_sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支持提号完成后财务调整

Browse Source
This commit is contained in:
yml2213
2026-08-16 19:52:12 +08:00
parent 786d20e9cd
commit 80e55ba281
15 changed files with 1272 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/modules/pickup/repository_test.go
+156
View File
@@ -380,6 +380,161 @@ func TestRepositoryCompletePlatformManagedPickupUsesOfflineSettlement(t *testing
}
}
func TestRepositoryFinancialAdjustmentCreditsInternalPickupWallet(t *testing.T) {
repo, db := newPickupTestRepo(t)
listing := seedAvailableListing(t, db, "LST-ADJUST-INTERNAL", "站内补款账号", false)
pickup, err := repo.Create(t.Context(), CreateRequest{ListingID: listing.ID, ProfitAmountCent: 1000}, 99, auditlog.Meta{})
if err != nil {
t.Fatalf("Create() error = %v", err)
}
if _, err = repo.Complete(t.Context(), pickup.ID, CompleteRequest{SettleAmountCent: 12000}, 99, auditlog.Meta{}); err != nil {
t.Fatalf("Complete() error = %v", err)
}
updated, err := repo.CreateFinancialAdjustment(t.Context(), pickup.ID, FinancialAdjustmentRequest{
ProfitAmountCent: ptrInt64(1500),
SettleAmountCent: ptrInt64(13500),
Reason: "补录实际成交金额",
}, 100, auditlog.Meta{})
if err != nil {
t.Fatalf("CreateFinancialAdjustment() error = %v", err)
}
assertInt64(t, "原始利润不变", updated.ProfitAmountCent, 1000)
assertInt64(t, "有效利润", updated.EffectiveProfitAmountCent, 1500)
assertInt64(t, "原始结算额不变", updated.SettleAmountCent, 12000)
assertInt64(t, "有效结算额", updated.EffectiveSettleAmountCent, 13500)
var adjustment model.AdminPickupFinancialAdjustment
if err := db.Where("pickup_id = ?", pickup.ID).First(&adjustment).Error; err != nil {
t.Fatalf("查询调整流水失败: %v", err)
}
if adjustment.Status != FinancialAdjustmentStatusSettled || adjustment.ProfitDeltaCent != 500 || adjustment.SettleDeltaCent != 1500 {
t.Fatalf("调整流水 = %+v", adjustment)
}
var ledger model.WalletLedger
if err := db.Where("biz_type = ?", "admin_pickup_adjustment").First(&ledger).Error; err != nil {
t.Fatalf("站内补款应生成钱包流水: %v", err)
}
assertInt64(t, "站内补款钱包入账", ledger.AmountCent, 1500)
}
func TestRepositoryFinancialAdjustmentUsesRecoveryForInternalReduction(t *testing.T) {
repo, db := newPickupTestRepo(t)
listing := seedAvailableListing(t, db, "LST-ADJUST-RECOVERY", "站内追回账号", false)
pickup, err := repo.Create(t.Context(), CreateRequest{ListingID: listing.ID}, 99, auditlog.Meta{})
if err != nil {
t.Fatalf("Create() error = %v", err)
}
if _, err = repo.Complete(t.Context(), pickup.ID, CompleteRequest{SettleAmountCent: 12000}, 99, auditlog.Meta{}); err != nil {
t.Fatalf("Complete() error = %v", err)
}
updated, err := repo.CreateFinancialAdjustment(t.Context(), pickup.ID, FinancialAdjustmentRequest{
SettleAmountCent: ptrInt64(10000),
Reason: "实际应结算金额减少",
}, 100, auditlog.Meta{})
if err != nil {
t.Fatalf("CreateFinancialAdjustment() error = %v", err)
}
assertInt64(t, "追回后的有效结算额", updated.EffectiveSettleAmountCent, 10000)
var adjustment model.AdminPickupFinancialAdjustment
if err := db.Where("pickup_id = ?", pickup.ID).First(&adjustment).Error; err != nil {
t.Fatalf("查询追回调整失败: %v", err)
}
if adjustment.Status != FinancialAdjustmentStatusRecovery || adjustment.SettleDeltaCent != -2000 {
t.Fatalf("追回调整 = %+v", adjustment)
}
var ledgerCount int64
if err := db.Model(&model.WalletLedger{}).Where("biz_type = ?", "admin_pickup_adjustment").Count(&ledgerCount).Error; err != nil {
t.Fatalf("统计补款流水失败: %v", err)
}
if ledgerCount != 0 {
t.Fatalf("待追回不能直接扣钱包, got %d 条流水", ledgerCount)
}
}
func TestRepositoryFinancialAdjustmentSettlesPlatformManagedPickupSeparately(t *testing.T) {
repo, db := newPickupTestRepo(t)
listing := seedAvailableListing(t, db, "LST-ADJUST-PLATFORM", "代管调整账号", true)
if err := db.Create(&model.ListingUpload{UploaderName: "外部号主", ListingID: &listing.ID, Status: "listing_created"}).Error; err != nil {
t.Fatalf("创建外部上传记录失败: %v", err)
}
pickup, err := repo.Create(t.Context(), CreateRequest{ListingID: listing.ID}, 99, auditlog.Meta{})
if err != nil {
t.Fatalf("Create() error = %v", err)
}
if _, err = repo.Complete(t.Context(), pickup.ID, CompleteRequest{SettleAmountCent: 12000}, 99, auditlog.Meta{}); err != nil {
t.Fatalf("Complete() error = %v", err)
}
if _, err = repo.MarkOfflineSettlement(t.Context(), pickup.ID, OfflineSettlementRequest{}, 100, auditlog.Meta{}); err != nil {
t.Fatalf("MarkOfflineSettlement() error = %v", err)
}
updated, err := repo.CreateFinancialAdjustment(t.Context(), pickup.ID, FinancialAdjustmentRequest{
ProfitAmountCent: ptrInt64(2000),
SettleAmountCent: ptrInt64(13500),
Reason: "补录代管打款",
}, 101, auditlog.Meta{})
if err != nil {
t.Fatalf("CreateFinancialAdjustment() error = %v", err)
}
if updated.OfflineSettlementStatus != OfflineSettlementStatusSettled {
t.Fatalf("原线下结算状态不应被重置: %q", updated.OfflineSettlementStatus)
}
adjustments, err := repo.ListFinancialAdjustments(t.Context(), pickup.ID)
if err != nil || len(adjustments) != 1 {
t.Fatalf("ListFinancialAdjustments() = %+v, %v", adjustments, err)
}
if adjustments[0].Status != FinancialAdjustmentStatusPending {
t.Fatalf("代管补款状态 = %q, want pending", adjustments[0].Status)
}
if err := repo.SettleFinancialAdjustment(t.Context(), adjustments[0].ID, FinancialAdjustmentSettlementRequest{Remark: "已补款"}, 102, auditlog.Meta{}); err != nil {
t.Fatalf("SettleFinancialAdjustment() error = %v", err)
}
adjustments, err = repo.ListFinancialAdjustments(t.Context(), pickup.ID)
if err != nil || adjustments[0].Status != FinancialAdjustmentStatusSettled || adjustments[0].SettledBy == nil || *adjustments[0].SettledBy != 102 {
t.Fatalf("确认后的调整流水 = %+v, %v", adjustments, err)
}
}
func TestRepositoryOfflineSettlementProcessesPendingPickupAdjustments(t *testing.T) {
repo, db := newPickupTestRepo(t)
listing := seedAvailableListing(t, db, "LST-ADJUST-WITH-SETTLEMENT", "代管合并结算账号", true)
if err := db.Create(&model.ListingUpload{UploaderName: "外部号主", ListingID: &listing.ID, Status: "listing_created"}).Error; err != nil {
t.Fatalf("创建外部上传记录失败: %v", err)
}
pickup, err := repo.Create(t.Context(), CreateRequest{ListingID: listing.ID}, 99, auditlog.Meta{})
if err != nil {
t.Fatalf("Create() error = %v", err)
}
if _, err = repo.Complete(t.Context(), pickup.ID, CompleteRequest{SettleAmountCent: 12000}, 99, auditlog.Meta{}); err != nil {
t.Fatalf("Complete() error = %v", err)
}
if _, err = repo.CreateFinancialAdjustment(t.Context(), pickup.ID, FinancialAdjustmentRequest{
SettleAmountCent: ptrInt64(10000),
Reason: "付款前修正应付金额",
}, 100, auditlog.Meta{}); err != nil {
t.Fatalf("CreateFinancialAdjustment() error = %v", err)
}
adjustments, err := repo.ListFinancialAdjustments(t.Context(), pickup.ID)
if err != nil || len(adjustments) != 1 || adjustments[0].Status != FinancialAdjustmentStatusPending {
t.Fatalf("结算前调整流水 = %+v, %v", adjustments, err)
}
settled, err := repo.MarkOfflineSettlement(t.Context(), pickup.ID, OfflineSettlementRequest{Remark: "按修正后金额打款"}, 101, auditlog.Meta{})
if err != nil {
t.Fatalf("MarkOfflineSettlement() error = %v", err)
}
if settled.OfflineSettlementStatus != OfflineSettlementStatusSettled || settled.EffectiveSettleAmountCent != 10000 {
t.Fatalf("合并线下结算结果 = %+v", settled)
}
adjustments, err = repo.ListFinancialAdjustments(t.Context(), pickup.ID)
if err != nil || adjustments[0].Status != FinancialAdjustmentStatusSettled || adjustments[0].SettledBy == nil || *adjustments[0].SettledBy != 101 {
t.Fatalf("合并结算后的调整流水 = %+v, %v", adjustments, err)
}
}
func ptrInt64(value int64) *int64 {
return &value
}
func assertInt64(t *testing.T, name string, got, want int64) {
t.Helper()
if got != want {
@@ -409,6 +564,7 @@ func newPickupTestRepo(t *testing.T) (*Repository, *gorm.DB) {
&model.RentalListing{},
&model.ListingUpload{},
&model.AdminPickup{},
&model.AdminPickupFinancialAdjustment{},
&model.WalletAccount{},
&model.WalletLedger{},
&model.AuditLog{},