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

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
@@ -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
@@ -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,