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

fix: 仲裁实际结算发放邀请返利

Browse Source
This commit is contained in:
yml2213
2026-10-17 15:48:53 +08:00
parent e6c4f58251
commit 27a6442c18
5 changed files with 407 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/modules/dispute/arbitration.go
+19
View File
@@ -12,6 +12,7 @@ import (
"hfb_sys/backend/internal/model"
"hfb_sys/backend/internal/modules/adminnotification"
"hfb_sys/backend/internal/modules/distribution"
"hfb_sys/backend/internal/modules/invitation"
"hfb_sys/backend/internal/modules/notification"
ordermodule "hfb_sys/backend/internal/modules/order"
"hfb_sys/backend/internal/modules/rentergrowth"
@@ -134,6 +135,24 @@ func (r *Repository) Arbitrate(ctx context.Context, adminID uint64, id uint64, r
if err := tx.Save(&order).Error; err != nil {
return err
}
if order.Status == "completed" {
if actualSettlement == nil {
return ErrInvalidDispute
}
// 仲裁按实际消耗结算后，订单仍保留原预收金额快照；返利必须使用实际平台毛利。
grossProfitCent := actualSettlement.PlatformFeeCent
if err := invitation.ProcessOrderInvitationRebateWithOptionsTx(tx, order.ID, invitation.OrderRebateOptions{
GrossProfitCent: &grossProfitCent,
RateReferenceAt: now,
}); err != nil {
logging.FromContext(ctx).Error("仲裁结算邀请返利失败",
zap.String("module", "dispute"),
zap.Uint64("order_id", order.ID),
zap.Int64("actual_platform_fee_cent", grossProfitCent),
zap.Error(err),
)
}
}
if order.DistributionSiteID != nil && *order.DistributionSiteID > 0 {
if err := distribution.ApplyRefundTx(tx, order.ID, refundAmountCent); err != nil {
return err
backend/internal/modules/dispute/repository_test.go
+57
View File
@@ -3,12 +3,14 @@ package dispute
import (
"context"
"errors"
"math"
"strings"
"testing"
"time"
"hfb_sys/backend/internal/database"
"hfb_sys/backend/internal/model"
ordermodule "hfb_sys/backend/internal/modules/order"
"hfb_sys/backend/internal/modules/wallet"
"gorm.io/datatypes"
@@ -536,6 +538,61 @@ func TestCheckoutDisputeArbitrationReusesCheckoutCoinConsumedM(t *testing.T) {
}
}
func TestArbitrationActualSettlementAwardsSellerRebateOnActualProfit(t *testing.T) {
db := setupDisputeTestDB(t)
repo := NewRepository(db, Dependencies{RefundStarter: RefundStarterFunc(func(context.Context, uint64, int64, string, string) (string, error) {
return "refunded", nil
})})
owner, renter, order := createDisputeOrderFixture(t, db, disputePureCoinOrder())
inviter := model.User{Phone: "13800000003", RealnameStatus: "verified", Status: "active"}
if err := db.Create(&inviter).Error; err != nil {
t.Fatalf("创建邀请人失败: %v", err)
}
verifiedAt := time.Now().AddDate(0, 0, -1).Truncate(time.Second)
if err := db.Create(&model.UserInvitation{
InviterID: inviter.ID, InviteeID: owner.ID, Status: "active", VerifiedAt: &verifiedAt,
}).Error; err != nil {
t.Fatalf("创建邀请关系失败: %v", err)
}
created, err := repo.Create(t.Context(), renter.ID, order.ID, CreateRequest{
Type: "haf_coin_dispute",
Description: "按实际消耗仲裁",
})
if err != nil {
t.Fatalf("创建申诉失败: %v", err)
}
actualCoinConsumedM := 50.0
actualConsumableAmountCent := int64(12000)
if _, err := repo.Arbitrate(t.Context(), 77, created.ID, ArbitrateRequest{
Result: "actual_settlement",
Remark: "按实际消耗结算",
ActualCoinConsumedM: &actualCoinConsumedM,
ActualConsumableAmountCent: &actualConsumableAmountCent,
}, AuditMeta{}); err != nil {
t.Fatalf("仲裁失败: %v", err)
}
var saved model.RentalOrder
if err := db.First(&saved, order.ID).Error; err != nil {
t.Fatalf("读取订单失败: %v", err)
}
actual := ordermodule.CalculateActualCheckoutSettlement(saved, actualConsumableAmountCent, actualCoinConsumedM, 0)
expectedBasis := actual.PlatformFeeCent / 2
expectedRebate := int64(math.Round(float64(expectedBasis) * 0.6))
var ledger model.InvitationRebateLedger
if err := db.Where("order_id = ? AND trade_role = 'seller'", order.ID).First(&ledger).Error; err != nil {
t.Fatalf("查询仲裁返利流水失败: %v", err)
}
if ledger.OrderProfitBasisCent != actual.PlatformFeeCent || ledger.SingleSideBasisCent != expectedBasis || ledger.RebateAmountCent != expectedRebate {
t.Fatalf("仲裁返利基数/单边/金额 = %d/%d/%d, want %d/%d/%d",
ledger.OrderProfitBasisCent, ledger.SingleSideBasisCent, ledger.RebateAmountCent,
actual.PlatformFeeCent, expectedBasis, expectedRebate)
}
}
func TestBuildArbitrationSettlementSkipsFrozenReleaseWhenNoFrozenBalance(t *testing.T) {
order := model.RentalOrder{
ID: 11,
backend/internal/modules/invitation/repository.go
+33 -5
View File
@@ -344,8 +344,20 @@ func CalculateRebateRate(verifiedAt time.Time, now time.Time, cfg *model.Invitat
return subsequentRate, CycleSubsequent, days
}
// OrderRebateOptions 允许调用方覆盖订单毛利基数与返利计算时刻。
// 仲裁按实际消耗结算后，订单快照金额仍是原预收金额，必须传入实际平台毛利。
type OrderRebateOptions struct {
GrossProfitCent *int64
RateReferenceAt time.Time
SettledAt time.Time
}
// ProcessOrderInvitationRebate 在订单终态结算时计算并分发买卖双边邀请返利。
func (r *Repository) ProcessOrderInvitationRebate(ctx context.Context, tx *gorm.DB, orderID uint64) error {
return r.processOrderInvitationRebate(ctx, tx, orderID, OrderRebateOptions{})
}
func (r *Repository) processOrderInvitationRebate(ctx context.Context, tx *gorm.DB, orderID uint64, opts OrderRebateOptions) error {
var order model.RentalOrder
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&order, orderID).Error; err != nil {
return err
@@ -355,6 +367,9 @@ func (r *Repository) ProcessOrderInvitationRebate(ctx context.Context, tx *gorm.
}
orderGrossProfitCent := order.RentAmountCent - order.OwnerRentAmountCent
if opts.GrossProfitCent != nil {
orderGrossProfitCent = *opts.GrossProfitCent
}
if orderGrossProfitCent <= 0 {
return nil
}
@@ -385,6 +400,14 @@ func (r *Repository) ProcessOrderInvitationRebate(ctx context.Context, tx *gorm.
}
now := time.Now()
rateReferenceAt := now
if !opts.RateReferenceAt.IsZero() {
rateReferenceAt = opts.RateReferenceAt
}
settledAt := now
if !opts.SettledAt.IsZero() {
settledAt = opts.SettledAt
}
// 返利归因站点（统一规则）：成本一律由「订单所属站点」承担，并使用该站点自己的返利配置。
// 订单未记录站点但存在分销拆分时，回退到拆分方站点（钱实际归它），
@@ -411,7 +434,7 @@ func (r *Repository) ProcessOrderInvitationRebate(ctx context.Context, tx *gorm.
if buyerBasisCent > 0 {
cfg, _ := r.GetRebateConfig(ctx, orderSiteID)
if cfg == nil || cfg.Enabled {
rate, cycle, days := CalculateRebateRate(*buyerInvitation.VerifiedAt, now, cfg)
rate, cycle, days := CalculateRebateRate(*buyerInvitation.VerifiedAt, rateReferenceAt, cfg)
rebateCent := int64(math.Round(float64(buyerBasisCent) * rate))
if rebateCent > 0 {
ledgerNo := fmt.Sprintf("REB-B-%s-%d", order.OrderNo, buyerInvitation.InviterID)
@@ -430,7 +453,7 @@ func (r *Repository) ProcessOrderInvitationRebate(ctx context.Context, tx *gorm.
RebateAmountCent: rebateCent,
WalletLedgerNo: ledgerNo,
Status: "settled",
SettledAt: now,
SettledAt: settledAt,
}
if err := tx.Clauses(clause.OnConflict{DoNothing: true}).Create(&ledger).Error; err == nil && ledger.ID > 0 {
_ = wallet.AppendEntries(tx, wallet.Entry{
@@ -468,7 +491,7 @@ func (r *Repository) ProcessOrderInvitationRebate(ctx context.Context, tx *gorm.
if sellerBasisCent > 0 {
cfg, _ := r.GetRebateConfig(ctx, orderSiteID)
if cfg == nil || cfg.Enabled {
rate, cycle, days := CalculateRebateRate(*sellerInvitation.VerifiedAt, now, cfg)
rate, cycle, days := CalculateRebateRate(*sellerInvitation.VerifiedAt, rateReferenceAt, cfg)
rebateCent := int64(math.Round(float64(sellerBasisCent) * rate))
if rebateCent > 0 {
ledgerNo := fmt.Sprintf("REB-S-%s-%d", order.OrderNo, sellerInvitation.InviterID)
@@ -487,7 +510,7 @@ func (r *Repository) ProcessOrderInvitationRebate(ctx context.Context, tx *gorm.
RebateAmountCent: rebateCent,
WalletLedgerNo: ledgerNo,
Status: "settled",
SettledAt: now,
SettledAt: settledAt,
}
if err := tx.Clauses(clause.OnConflict{DoNothing: true}).Create(&ledger).Error; err == nil && ledger.ID > 0 {
_ = wallet.AppendEntries(tx, wallet.Entry{
@@ -1018,11 +1041,16 @@ func (r *Repository) ListAdminRebateLedgers(ctx context.Context, query AdminReba
// ProcessOrderInvitationRebateTx 便捷事务入口，供订单结账完成终态时调用
func ProcessOrderInvitationRebateTx(tx *gorm.DB, orderID uint64) error {
return ProcessOrderInvitationRebateWithOptionsTx(tx, orderID, OrderRebateOptions{})
}
// ProcessOrderInvitationRebateWithOptionsTx 支持覆盖实际结算基数与计算时刻。
func ProcessOrderInvitationRebateWithOptionsTx(tx *gorm.DB, orderID uint64, opts OrderRebateOptions) error {
if tx == nil || orderID == 0 {
return nil
}
repo := NewRepository(tx)
return repo.ProcessOrderInvitationRebate(context.Background(), tx, orderID)
return repo.processOrderInvitationRebate(context.Background(), tx, orderID, opts)
}
// OnUserRealnameVerifiedTx 便捷事务入口，供实名认证通过时调用
backend/internal/modules/invitation/repository_test.go
+70
View File
@@ -192,6 +192,76 @@ func TestInvitationFlowAndOrderRebate(t *testing.T) {
}
}
func TestProcessOrderInvitationRebateUsesActualProfitBasis(t *testing.T) {
db := setupTestDB(t)
inviter := model.User{Phone: "13800000011", RealnameStatus: "verified", Status: "active"}
if err := db.Create(&inviter).Error; err != nil {
t.Fatalf("创建邀请人失败: %v", err)
}
seller := model.User{Phone: "13800000012", RealnameStatus: "verified", Status: "active"}
if err := db.Create(&seller).Error; err != nil {
t.Fatalf("创建卖家失败: %v", err)
}
verifiedAt := time.Now().AddDate(0, 0, -2).Truncate(time.Second)
if err := db.Create(&model.UserInvitation{
InviterID: inviter.ID, InviteeID: seller.ID, Status: StatusActive, VerifiedAt: &verifiedAt,
}).Error; err != nil {
t.Fatalf("创建邀请关系失败: %v", err)
}
order := model.RentalOrder{
OrderNo: fmt.Sprintf("ORD-ACTUAL-%d", time.Now().UnixNano()),
OwnerID: seller.ID,
RenterID: 99999,
Status: "completed",
SettlementStatus: "arbitrated",
RentAmountCent: 10670,
OwnerRentAmountCent: 7270,
}
if err := db.Create(&order).Error; err != nil {
t.Fatalf("创建订单失败: %v", err)
}
actualPlatformFeeCent := int64(933)
if err := ProcessOrderInvitationRebateWithOptionsTx(db, order.ID, OrderRebateOptions{
GrossProfitCent: &actualPlatformFeeCent,
RateReferenceAt: time.Now(),
}); err != nil {
t.Fatalf("按实际毛利处理返利失败: %v", err)
}
var ledger model.InvitationRebateLedger
if err := db.Where("order_id = ? AND trade_role = 'seller'", order.ID).First(&ledger).Error; err != nil {
t.Fatalf("查询返利流水失败: %v", err)
}
if ledger.OrderProfitBasisCent != 933 || ledger.SingleSideBasisCent != 466 || ledger.RebateAmountCent != 280 {
t.Fatalf("返利基数/单边/金额 = %d/%d/%d, want 933/466/280",
ledger.OrderProfitBasisCent, ledger.SingleSideBasisCent, ledger.RebateAmountCent)
}
var account model.WalletAccount
if err := db.Where("user_id = ? AND distribution_site_id = 0", inviter.ID).First(&account).Error; err != nil {
t.Fatalf("查询邀请人钱包失败: %v", err)
}
if account.AvailableBalanceCent != 280 {
t.Fatalf("邀请人余额 = %d, want 280", account.AvailableBalanceCent)
}
if err := ProcessOrderInvitationRebateWithOptionsTx(db, order.ID, OrderRebateOptions{
GrossProfitCent: &actualPlatformFeeCent,
RateReferenceAt: time.Now(),
}); err != nil {
t.Fatalf("重复调用返利失败: %v", err)
}
var ledgerCount, walletCount int64
db.Model(&model.InvitationRebateLedger{}).Where("order_id = ?", order.ID).Count(&ledgerCount)
db.Model(&model.WalletLedger{}).Where("biz_no = ? AND biz_type = 'invite_rebate'", order.OrderNo).Count(&walletCount)
if ledgerCount != 1 || walletCount != 1 {
t.Fatalf("重复调用产生重复流水: rebate=%d wallet=%d", ledgerCount, walletCount)
}
}
func TestCrossSiteDistributionRebate(t *testing.T) {
db := setupTestDB(t)
repo := NewRepository(db)