feat(tenant): 按租户隔离支付退款与商户配置
This commit is contained in:
@@ -274,17 +274,19 @@ func resolveTenantID(db *gorm.DB, explicitTenantID uint64, userID uint64) uint64
|
||||
if explicitTenantID > 0 {
|
||||
return explicitTenantID
|
||||
}
|
||||
if userID > 0 {
|
||||
var tenantID uint64
|
||||
if err := db.Model(&model.User{}).Select("tenant_id").Where("id = ?", userID).Scan(&tenantID).Error; err == nil && tenantID > 0 {
|
||||
return tenantID
|
||||
}
|
||||
}
|
||||
if tenantID := tenantIDFromDB(db); tenantID > 0 {
|
||||
return tenantID
|
||||
}
|
||||
if userID == 0 {
|
||||
return 0
|
||||
}
|
||||
var tenantID uint64
|
||||
if err := db.Model(&model.User{}).Select("tenant_id").Where("id = ?", userID).Scan(&tenantID).Error; err != nil {
|
||||
return 0
|
||||
}
|
||||
return tenantID
|
||||
return 0
|
||||
}
|
||||
|
||||
func tenantIDFromDB(db *gorm.DB) uint64 {
|
||||
|
||||
@@ -67,3 +67,34 @@ func TestWalletAccountsAndLedgerAreScopedByTenant(t *testing.T) {
|
||||
t.Fatalf("tenant wallet accounts = %+v", accounts)
|
||||
}
|
||||
}
|
||||
|
||||
func TestWalletCreditsUserTenantWhenRequestComesFromBuyerTenant(t *testing.T) {
|
||||
db := database.NewTestDB()
|
||||
owner := model.User{TenantID: 202, Phone: "13400000009", Status: "active"}
|
||||
if err := db.Create(&owner).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
buyerCtx := walletTenantContext(101)
|
||||
if err := db.WithContext(buyerCtx).Transaction(func(tx *gorm.DB) error {
|
||||
return AppendEntries(tx, Entry{
|
||||
UserID: owner.ID, Direction: "in", AmountCent: 800,
|
||||
BalanceType: "available", BizType: "owner_income", BizNo: "RO-CROSS-TENANT",
|
||||
})
|
||||
}); err != nil {
|
||||
t.Fatalf("credit cross-tenant owner wallet: %v", err)
|
||||
}
|
||||
var account model.WalletAccount
|
||||
if err := db.Where("user_id = ?", owner.ID).First(&account).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if account.TenantID != 202 || account.AvailableBalanceCent != 800 {
|
||||
t.Fatalf("owner wallet = %+v", account)
|
||||
}
|
||||
var ledger model.WalletLedger
|
||||
if err := db.Where("user_id = ?", owner.ID).First(&ledger).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if ledger.TenantID != 202 {
|
||||
t.Fatalf("owner ledger tenant = %d, want 202", ledger.TenantID)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user