feat(withdrawal): 增加提现审核对账与历史记录
This commit is contained in:
yml2213
@@ -37,13 +37,9 @@ func (r *Repository) AdminList(ctx context.Context, query AdminListQuery) (*Admi
|
||||
return nil, err
|
||||
}
|
||||
|
||||
items := make([]WithdrawalDetailDTO, 0, len(withdrawals))
|
||||
for _, w := range withdrawals {
|
||||
dto, err := r.toDetailDTO(ctx, w)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
items = append(items, *dto)
|
||||
items, err := r.toAdminListItems(ctx, withdrawals)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &AdminPaginatedResult{
|
||||
|
||||
@@ -59,6 +59,108 @@ type WithdrawalDetailDTO struct {
|
||||
UpdatedAt time.Time `json:"updated_at"`
|
||||
}
|
||||
|
||||
// WithdrawalListItemDTO 是后台提现分页列表使用的轻量 DTO。
|
||||
// 收款二维码、完整收款账号、审核和打款详情只在打开详情时查询。
|
||||
type WithdrawalListItemDTO struct {
|
||||
ID uint64 `json:"id"`
|
||||
WithdrawNo string `json:"withdraw_no"`
|
||||
UserID uint64 `json:"user_id"`
|
||||
DistributionSiteID uint64 `json:"distribution_site_id"`
|
||||
DistributionSiteName string `json:"distribution_site_name"`
|
||||
UserNickname string `json:"user_nickname"`
|
||||
UserPhone string `json:"user_phone"`
|
||||
AmountCent int64 `json:"amount_cent"`
|
||||
FeeCent int64 `json:"fee_cent"`
|
||||
ActualAmountCent int64 `json:"actual_amount_cent"`
|
||||
AccountType string `json:"account_type"`
|
||||
AccountName string `json:"account_name"`
|
||||
AccountNo string `json:"account_no"`
|
||||
BankName string `json:"bank_name"`
|
||||
Status string `json:"status"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
}
|
||||
|
||||
// WithdrawalReviewSummaryDTO 汇总审核员核对提现时最关心的用户财务口径。
|
||||
// wallet_actual_income_cent 汇总普通钱包结算订单及站内钱包提号的有效结算额；
|
||||
// platform_managed_income_cent 汇总平台代管订单和平台代管提号的线下结算额。
|
||||
// reconcile_difference_amount_cent = 钱包收入 - 已打款 - 待处理提现。
|
||||
type WithdrawalReviewSummaryDTO struct {
|
||||
OwnerOrderCount int64 `json:"owner_order_count"`
|
||||
OwnerPickupCount int64 `json:"owner_pickup_count"`
|
||||
FinalizedOrderCount int64 `json:"finalized_order_count"`
|
||||
WalletActualIncomeCent int64 `json:"wallet_actual_income_cent"`
|
||||
PickupIncomeCent int64 `json:"pickup_income_cent"`
|
||||
WalletPickupIncomeCent int64 `json:"wallet_pickup_income_cent"`
|
||||
PlatformManagedPickupIncomeCent int64 `json:"platform_managed_pickup_income_cent"`
|
||||
PlatformManagedIncomeCent int64 `json:"platform_managed_income_cent"`
|
||||
WithdrawalCount int64 `json:"withdrawal_count"`
|
||||
WithdrawnAmountCent int64 `json:"withdrawn_amount_cent"`
|
||||
PendingWithdrawalAmountCent int64 `json:"pending_withdrawal_amount_cent"`
|
||||
RejectedWithdrawalCount int64 `json:"rejected_withdrawal_count"`
|
||||
ReconcileDifferenceAmountCent int64 `json:"reconcile_difference_amount_cent"`
|
||||
}
|
||||
|
||||
type WithdrawalReviewOrderDTO struct {
|
||||
ID uint64 `json:"id"`
|
||||
OrderNo string `json:"order_no"`
|
||||
ListingNo string `json:"listing_no"`
|
||||
Title string `json:"title"`
|
||||
Status string `json:"status"`
|
||||
SettlementStatus string `json:"settlement_status"`
|
||||
SettlementMode string `json:"settlement_mode"`
|
||||
RentAmountCent int64 `json:"rent_amount_cent"`
|
||||
OwnerActualIncomeCent *int64 `json:"owner_actual_income_cent,omitempty"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
SettledAt *time.Time `json:"settled_at,omitempty"`
|
||||
}
|
||||
|
||||
type WithdrawalReviewPickupDTO struct {
|
||||
ID uint64 `json:"id"`
|
||||
PickupNo string `json:"pickup_no"`
|
||||
ListingNo string `json:"listing_no"`
|
||||
Title string `json:"title"`
|
||||
Status string `json:"status"`
|
||||
SettlementMode string `json:"settlement_mode"`
|
||||
OfflineSettlementStatus string `json:"offline_settlement_status"`
|
||||
SettleAmountCent int64 `json:"settle_amount_cent"`
|
||||
SettleAdjustmentCent int64 `json:"settle_adjustment_cent"`
|
||||
EffectiveSettleAmountCent int64 `json:"effective_settle_amount_cent"`
|
||||
CompletedAt *time.Time `json:"completed_at,omitempty"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
}
|
||||
|
||||
type WithdrawalReviewHistoryDTO struct {
|
||||
ID uint64 `json:"id"`
|
||||
WithdrawNo string `json:"withdraw_no"`
|
||||
AmountCent int64 `json:"amount_cent"`
|
||||
FeeCent int64 `json:"fee_cent"`
|
||||
ActualAmountCent int64 `json:"actual_amount_cent"`
|
||||
Status string `json:"status"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
ReviewedAt *time.Time `json:"reviewed_at,omitempty"`
|
||||
PaidAt *time.Time `json:"paid_at,omitempty"`
|
||||
}
|
||||
|
||||
type WithdrawalReviewContextQuery struct {
|
||||
OrderPage int `form:"order_page"`
|
||||
PickupPage int `form:"pickup_page"`
|
||||
WithdrawalPage int `form:"withdrawal_page"`
|
||||
PageSize int `form:"page_size"`
|
||||
}
|
||||
|
||||
type WithdrawalReviewContextDTO struct {
|
||||
Summary WithdrawalReviewSummaryDTO `json:"summary"`
|
||||
Orders []WithdrawalReviewOrderDTO `json:"orders"`
|
||||
OrderPage int `json:"order_page"`
|
||||
OrderPageSize int `json:"order_page_size"`
|
||||
Pickups []WithdrawalReviewPickupDTO `json:"pickups"`
|
||||
PickupPage int `json:"pickup_page"`
|
||||
PickupPageSize int `json:"pickup_page_size"`
|
||||
Withdrawals []WithdrawalReviewHistoryDTO `json:"withdrawals"`
|
||||
WithdrawalPage int `json:"withdrawal_page"`
|
||||
WithdrawalPageSize int `json:"withdrawal_page_size"`
|
||||
}
|
||||
|
||||
type CreateWithdrawalRequest struct {
|
||||
PaymentAccountID uint64 `json:"payment_account_id" binding:"required"`
|
||||
AmountCent int64 `json:"amount_cent" binding:"required,gt=0"`
|
||||
@@ -82,10 +184,10 @@ type PaginatedResult struct {
|
||||
}
|
||||
|
||||
type AdminPaginatedResult struct {
|
||||
Items []WithdrawalDetailDTO `json:"items"`
|
||||
Total int64 `json:"total"`
|
||||
Page int `json:"page"`
|
||||
PageSize int `json:"page_size"`
|
||||
Items []WithdrawalListItemDTO `json:"items"`
|
||||
Total int64 `json:"total"`
|
||||
Page int `json:"page"`
|
||||
PageSize int `json:"page_size"`
|
||||
}
|
||||
|
||||
type AdminListQuery struct {
|
||||
|
||||
@@ -140,6 +140,25 @@ func (h *Handler) AdminFindByID(c *gin.Context) {
|
||||
response.OK(c, withdrawal)
|
||||
}
|
||||
|
||||
func (h *Handler) AdminReviewContext(c *gin.Context) {
|
||||
id, ok := parseID(c)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
var query WithdrawalReviewContextQuery
|
||||
if err := c.ShouldBindQuery(&query); err != nil {
|
||||
response.BadRequest(c, "请求参数错误")
|
||||
return
|
||||
}
|
||||
result, err := h.service.AdminReviewContext(c.Request.Context(), id, query)
|
||||
if err != nil {
|
||||
writeError(c, err)
|
||||
return
|
||||
}
|
||||
response.OK(c, result)
|
||||
}
|
||||
|
||||
func (h *Handler) Review(c *gin.Context) {
|
||||
adminID, ok := currentAdminID(c)
|
||||
if !ok {
|
||||
|
||||
@@ -32,6 +32,75 @@ func toDTO(w model.WithdrawalRequest) WithdrawalDTO {
|
||||
}
|
||||
}
|
||||
|
||||
// toAdminListItems 批量装配提现分页列表依赖的用户和站点信息，避免每条记录分别查库。
|
||||
func (r *Repository) toAdminListItems(ctx context.Context, withdrawals []model.WithdrawalRequest) ([]WithdrawalListItemDTO, error) {
|
||||
items := make([]WithdrawalListItemDTO, 0, len(withdrawals))
|
||||
if len(withdrawals) == 0 {
|
||||
return items, nil
|
||||
}
|
||||
|
||||
userIDs := make([]uint64, 0, len(withdrawals))
|
||||
siteIDs := make([]uint64, 0, len(withdrawals))
|
||||
seenUsers := make(map[uint64]struct{}, len(withdrawals))
|
||||
seenSites := make(map[uint64]struct{}, len(withdrawals))
|
||||
for _, withdrawal := range withdrawals {
|
||||
if _, ok := seenUsers[withdrawal.UserID]; !ok {
|
||||
seenUsers[withdrawal.UserID] = struct{}{}
|
||||
userIDs = append(userIDs, withdrawal.UserID)
|
||||
}
|
||||
if withdrawal.DistributionSiteID > 0 {
|
||||
if _, ok := seenSites[withdrawal.DistributionSiteID]; !ok {
|
||||
seenSites[withdrawal.DistributionSiteID] = struct{}{}
|
||||
siteIDs = append(siteIDs, withdrawal.DistributionSiteID)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
usersByID := make(map[uint64]model.User, len(userIDs))
|
||||
var users []model.User
|
||||
if err := r.db.WithContext(ctx).Select("id, nickname, phone").Where("id IN ?", userIDs).Find(&users).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, user := range users {
|
||||
usersByID[user.ID] = user
|
||||
}
|
||||
|
||||
sitesByID := make(map[uint64]model.DistributionSite, len(siteIDs))
|
||||
if len(siteIDs) > 0 {
|
||||
var sites []model.DistributionSite
|
||||
if err := r.db.WithContext(ctx).Select("id, site_name").Where("id IN ?", siteIDs).Find(&sites).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, site := range sites {
|
||||
sitesByID[site.ID] = site
|
||||
}
|
||||
}
|
||||
|
||||
for _, withdrawal := range withdrawals {
|
||||
user := usersByID[withdrawal.UserID]
|
||||
site := sitesByID[withdrawal.DistributionSiteID]
|
||||
items = append(items, WithdrawalListItemDTO{
|
||||
ID: withdrawal.ID,
|
||||
WithdrawNo: withdrawal.WithdrawNo,
|
||||
UserID: withdrawal.UserID,
|
||||
DistributionSiteID: withdrawal.DistributionSiteID,
|
||||
DistributionSiteName: site.SiteName,
|
||||
UserNickname: user.Nickname,
|
||||
UserPhone: user.Phone,
|
||||
AmountCent: withdrawal.AmountCent,
|
||||
FeeCent: withdrawal.FeeCent,
|
||||
ActualAmountCent: withdrawal.ActualAmountCent,
|
||||
AccountType: withdrawal.AccountType,
|
||||
AccountName: withdrawal.AccountName,
|
||||
AccountNo: withdrawal.AccountNo,
|
||||
BankName: withdrawal.BankName,
|
||||
Status: withdrawal.Status,
|
||||
CreatedAt: withdrawal.CreatedAt,
|
||||
})
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
// 转换为管理员详细DTO
|
||||
|
||||
// 转换为管理员详细DTO
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"hfb_sys/backend/internal/database"
|
||||
"hfb_sys/backend/internal/model"
|
||||
@@ -11,6 +12,7 @@ import (
|
||||
"hfb_sys/backend/pkg/crypto"
|
||||
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
)
|
||||
|
||||
type withdrawalFixture struct {
|
||||
@@ -31,6 +33,12 @@ func newWithdrawalFixture(t *testing.T) withdrawalFixture {
|
||||
&model.WithdrawalRequest{},
|
||||
&model.WalletAccount{},
|
||||
&model.WalletLedger{},
|
||||
&model.RentalListing{},
|
||||
&model.RentalOrder{},
|
||||
&model.GameAccount{},
|
||||
&model.AdminPickup{},
|
||||
&model.AdminPickupFinancialAdjustment{},
|
||||
&model.DistributionSite{},
|
||||
); err != nil {
|
||||
t.Fatalf("migrate fixture: %v", err)
|
||||
}
|
||||
@@ -62,6 +70,205 @@ func newWithdrawalFixture(t *testing.T) withdrawalFixture {
|
||||
}
|
||||
}
|
||||
|
||||
type withdrawalQueryCounter struct {
|
||||
logger.Interface
|
||||
count int
|
||||
}
|
||||
|
||||
func (c *withdrawalQueryCounter) Trace(_ context.Context, _ time.Time, fc func() (string, int64), _ error) {
|
||||
c.count++
|
||||
fc()
|
||||
}
|
||||
|
||||
func TestAdminListUsesBatchQueries(t *testing.T) {
|
||||
f := newWithdrawalFixture(t)
|
||||
for i := 0; i < 5; i++ {
|
||||
item := model.WithdrawalRequest{
|
||||
WithdrawNo: "WD-BATCH-" + string(rune('A'+i)),
|
||||
UserID: f.userID,
|
||||
AmountCent: int64(1000 + i),
|
||||
ActualAmountCent: int64(1000 + i),
|
||||
AccountType: "bank",
|
||||
AccountName: "Test User",
|
||||
AccountNo: "****0000",
|
||||
Status: "pending",
|
||||
}
|
||||
if err := f.db.Create(&item).Error; err != nil {
|
||||
t.Fatalf("create withdrawal: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
counter := &withdrawalQueryCounter{Interface: logger.Default.LogMode(logger.Silent)}
|
||||
repo := NewRepository(f.db.Session(&gorm.Session{Logger: counter}), f.repo.walletRepo, f.repo.encryptor)
|
||||
result, err := repo.AdminList(context.Background(), AdminListQuery{Page: 1, Size: 20})
|
||||
if err != nil {
|
||||
t.Fatalf("AdminList failed: %v", err)
|
||||
}
|
||||
if len(result.Items) != 5 {
|
||||
t.Fatalf("AdminList items = %d, want 5", len(result.Items))
|
||||
}
|
||||
if counter.count > 4 {
|
||||
t.Fatalf("AdminList queries = %d, want batch queries (<=4)", counter.count)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAdminReviewContextSummarizesIncomeAndHistory(t *testing.T) {
|
||||
f := newWithdrawalFixture(t)
|
||||
renter := model.User{Phone: "13800000002", Nickname: "renter", Status: "active"}
|
||||
if err := f.db.Create(&renter).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
account := model.GameAccount{OwnerID: f.userID, ServerRegion: "cn", LoginPlatform: "pc", Title: "审核订单"}
|
||||
if err := f.db.Create(&account).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
listing := model.RentalListing{ListingNo: "202610280362", AccountID: account.ID, OwnerID: f.userID, Status: "active"}
|
||||
if err := f.db.Create(&listing).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
orders := []model.RentalOrder{
|
||||
{OrderNo: "RO-WALLET", ListingID: listing.ID, AccountID: account.ID, OwnerID: f.userID, RenterID: renter.ID, Status: "completed", SettlementStatus: "settled", SettlementMode: "owner_wallet", RentAmountCent: 1000, OwnerRentAmountCent: 700},
|
||||
{OrderNo: "RO-PLATFORM", ListingID: listing.ID, AccountID: account.ID, OwnerID: f.userID, RenterID: renter.ID, Status: "completed", SettlementStatus: "arbitrated", SettlementMode: "platform_managed", RentAmountCent: 200, OwnerRentAmountCent: 100, OfflineSettlementStatus: "settled", OfflineSettlementAmountCent: 100},
|
||||
{OrderNo: "RO-OPEN", ListingID: listing.ID, AccountID: account.ID, OwnerID: f.userID, RenterID: renter.ID, Status: "renting", SettlementStatus: "unsettled", SettlementMode: "owner_wallet"},
|
||||
}
|
||||
for i := range orders {
|
||||
if err := f.db.Create(&orders[i]).Error; err != nil {
|
||||
t.Fatalf("create order: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
orderID := orders[0].ID
|
||||
ledgers := []model.WalletLedger{
|
||||
{LedgerNo: "WL-OWNER-INCOME", UserID: f.userID, OrderID: &orderID, Direction: "in", AmountCent: 700, BalanceType: "available", BizType: "owner_income", BizNo: "RO-WALLET"},
|
||||
{LedgerNo: "WL-DEPOSIT-COMP", UserID: f.userID, OrderID: &orderID, Direction: "in", AmountCent: 50, BalanceType: "available", BizType: "deposit_compensation", BizNo: "RO-WALLET"},
|
||||
}
|
||||
if err := f.db.Create(&ledgers).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
pickups := []model.AdminPickup{
|
||||
{PickupNo: "PK-WALLET", ListingID: listing.ID, AccountID: account.ID, OwnerID: f.userID, AdminID: f.adminID, Status: "completed", SettlementMode: "owner_wallet", SettleAmountCent: 200, CompletedAt: &now},
|
||||
{PickupNo: "PK-PLATFORM", ListingID: listing.ID, AccountID: account.ID, OwnerID: f.userID, AdminID: f.adminID, Status: "completed", SettlementMode: "platform_managed", SettleAmountCent: 100, OfflineSettlementStatus: "settled", CompletedAt: &now},
|
||||
}
|
||||
if err := f.db.Create(&pickups).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
adjustments := []model.AdminPickupFinancialAdjustment{
|
||||
{PickupID: pickups[0].ID, SettleDeltaCent: 50, SettlementMode: "owner_wallet", Status: "settled", Reason: "补款", CreatedBy: f.adminID},
|
||||
{PickupID: pickups[1].ID, SettleDeltaCent: 20, SettlementMode: "platform_managed", Status: "settled", Reason: "补款", CreatedBy: f.adminID},
|
||||
}
|
||||
if err := f.db.Create(&adjustments).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
withdrawals := []model.WithdrawalRequest{
|
||||
{WithdrawNo: "WD-CURRENT", UserID: f.userID, AmountCent: 300, ActualAmountCent: 300, AccountType: "bank", AccountName: "Test User", AccountNo: "****0000", Status: "pending", CreatedAt: now},
|
||||
{WithdrawNo: "WD-PAID", UserID: f.userID, AmountCent: 300, ActualAmountCent: 300, AccountType: "bank", AccountName: "Test User", AccountNo: "****0000", Status: "completed", CreatedAt: now.Add(-time.Hour)},
|
||||
{WithdrawNo: "WD-REJECTED", UserID: f.userID, AmountCent: 100, ActualAmountCent: 100, AccountType: "bank", AccountName: "Test User", AccountNo: "****0000", Status: "rejected", CreatedAt: now.Add(-2 * time.Hour)},
|
||||
}
|
||||
if err := f.db.Create(&withdrawals).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
contextDTO, err := f.repo.AdminReviewContext(context.Background(), withdrawals[0].ID, WithdrawalReviewContextQuery{PageSize: 10})
|
||||
if err != nil {
|
||||
t.Fatalf("AdminReviewContext failed: %v", err)
|
||||
}
|
||||
summary := contextDTO.Summary
|
||||
if summary.OwnerOrderCount != 3 || summary.FinalizedOrderCount != 2 {
|
||||
t.Fatalf("order summary = %+v", summary)
|
||||
}
|
||||
if summary.OwnerPickupCount != 2 || summary.PickupIncomeCent != 370 {
|
||||
t.Fatalf("pickup summary = %+v", summary)
|
||||
}
|
||||
if summary.WalletPickupIncomeCent != 250 || summary.PlatformManagedPickupIncomeCent != 120 {
|
||||
t.Fatalf("pickup income summary = %+v", summary)
|
||||
}
|
||||
if summary.WalletActualIncomeCent != 1000 || summary.PlatformManagedIncomeCent != 220 {
|
||||
t.Fatalf("income summary = %+v", summary)
|
||||
}
|
||||
if summary.WithdrawalCount != 3 || summary.WithdrawnAmountCent != 300 || summary.PendingWithdrawalAmountCent != 300 || summary.RejectedWithdrawalCount != 1 {
|
||||
t.Fatalf("withdrawal summary = %+v", summary)
|
||||
}
|
||||
if summary.ReconcileDifferenceAmountCent != 400 {
|
||||
t.Fatalf("reconcile difference = %d, want 400", summary.ReconcileDifferenceAmountCent)
|
||||
}
|
||||
if len(contextDTO.Orders) != 3 || contextDTO.Orders[0].ListingNo != listing.ListingNo {
|
||||
t.Fatalf("review orders = %+v", contextDTO.Orders)
|
||||
}
|
||||
if len(contextDTO.Pickups) != 2 || contextDTO.Pickups[0].ListingNo != listing.ListingNo {
|
||||
t.Fatalf("review pickups = %+v", contextDTO.Pickups)
|
||||
}
|
||||
if len(contextDTO.Withdrawals) != 3 || contextDTO.Withdrawals[0].WithdrawNo != "WD-CURRENT" {
|
||||
t.Fatalf("review withdrawals = %+v", contextDTO.Withdrawals)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAdminReviewContextScopesIncomeByWithdrawalSite(t *testing.T) {
|
||||
f := newWithdrawalFixture(t)
|
||||
siteA := model.DistributionSite{SiteCode: "audit-a", SiteName: "审核站A", Domain: "a.example.com", Status: "active"}
|
||||
siteB := model.DistributionSite{SiteCode: "audit-b", SiteName: "审核站B", Domain: "b.example.com", Status: "active"}
|
||||
if err := f.db.Create(&siteA).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := f.db.Create(&siteB).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
renter := model.User{Phone: "13800000003", Nickname: "renter-site", Status: "active"}
|
||||
if err := f.db.Create(&renter).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
account := model.GameAccount{OwnerID: f.userID, ServerRegion: "cn", LoginPlatform: "pc", Title: "分站审核"}
|
||||
if err := f.db.Create(&account).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
listingA := model.RentalListing{ListingNo: "SITE-A-LISTING", AccountID: account.ID, OwnerID: f.userID, Status: "active", DistributionSiteID: &siteA.ID}
|
||||
listingB := model.RentalListing{ListingNo: "SITE-B-LISTING", AccountID: account.ID, OwnerID: f.userID, Status: "active", DistributionSiteID: &siteB.ID}
|
||||
if err := f.db.Create(&listingA).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := f.db.Create(&listingB).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
orderA := model.RentalOrder{OrderNo: "RO-SITE-A", ListingID: listingA.ID, AccountID: account.ID, OwnerID: f.userID, RenterID: renter.ID, Status: "completed", SettlementStatus: "settled", SettlementMode: "owner_wallet", DistributionSiteID: &siteA.ID}
|
||||
orderB := model.RentalOrder{OrderNo: "RO-SITE-B", ListingID: listingB.ID, AccountID: account.ID, OwnerID: f.userID, RenterID: renter.ID, Status: "completed", SettlementStatus: "settled", SettlementMode: "owner_wallet", DistributionSiteID: &siteB.ID}
|
||||
if err := f.db.Create(&orderA).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := f.db.Create(&orderB).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := f.db.Create(&[]model.WalletLedger{
|
||||
{LedgerNo: "WL-SITE-A", UserID: f.userID, DistributionSiteID: siteA.ID, OrderID: &orderA.ID, Direction: "in", AmountCent: 100, BalanceType: "available", BizType: "owner_income", BizNo: orderA.OrderNo},
|
||||
{LedgerNo: "WL-SITE-B", UserID: f.userID, DistributionSiteID: siteB.ID, OrderID: &orderB.ID, Direction: "in", AmountCent: 999, BalanceType: "available", BizType: "owner_income", BizNo: orderB.OrderNo},
|
||||
}).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := f.db.Create(&[]model.AdminPickup{
|
||||
{PickupNo: "PK-SITE-A", ListingID: listingA.ID, AccountID: account.ID, OwnerID: f.userID, AdminID: f.adminID, Status: "completed", SettlementMode: "owner_wallet", SettleAmountCent: 100},
|
||||
{PickupNo: "PK-SITE-B", ListingID: listingB.ID, AccountID: account.ID, OwnerID: f.userID, AdminID: f.adminID, Status: "completed", SettlementMode: "owner_wallet", SettleAmountCent: 999},
|
||||
}).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
current := model.WithdrawalRequest{WithdrawNo: "WD-SITE-A", UserID: f.userID, DistributionSiteID: siteA.ID, AmountCent: 100, ActualAmountCent: 100, AccountType: "bank", AccountName: "Test User", AccountNo: "****0000", Status: "pending"}
|
||||
if err := f.db.Create(¤t).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
contextDTO, err := f.repo.AdminReviewContext(context.Background(), current.ID, WithdrawalReviewContextQuery{PageSize: 10})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if contextDTO.Summary.OwnerOrderCount != 1 || contextDTO.Summary.OwnerPickupCount != 1 {
|
||||
t.Fatalf("site-scoped business count = %+v", contextDTO.Summary)
|
||||
}
|
||||
if contextDTO.Summary.WalletActualIncomeCent != 200 || contextDTO.Summary.WithdrawalCount != 1 {
|
||||
t.Fatalf("site-scoped income/withdrawal = %+v", contextDTO.Summary)
|
||||
}
|
||||
}
|
||||
|
||||
func (f withdrawalFixture) create(t *testing.T, amountCent int64) *WithdrawalDTO {
|
||||
t.Helper()
|
||||
dto, err := f.repo.Create(context.Background(), f.userID, CreateWithdrawalRequest{
|
||||
|
||||
@@ -0,0 +1,368 @@
|
||||
package withdrawal
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"hfb_sys/backend/internal/model"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
var ownerIncomeBizTypes = []string{"owner_income", "deposit_compensation", "arbitration_owner_income"}
|
||||
|
||||
func normalizeReviewContextQuery(query WithdrawalReviewContextQuery) WithdrawalReviewContextQuery {
|
||||
if query.OrderPage < 1 {
|
||||
query.OrderPage = 1
|
||||
}
|
||||
if query.PickupPage < 1 {
|
||||
query.PickupPage = 1
|
||||
}
|
||||
if query.WithdrawalPage < 1 {
|
||||
query.WithdrawalPage = 1
|
||||
}
|
||||
if query.PageSize < 1 || query.PageSize > 50 {
|
||||
query.PageSize = 8
|
||||
}
|
||||
return query
|
||||
}
|
||||
|
||||
// AdminReviewContext 返回提现审核弹窗所需的用户财务汇总和最近历史记录。
|
||||
// 该数据只在打开单笔详情时查询，不进入提现分页列表，避免列表产生 N+1。
|
||||
func (r *Repository) AdminReviewContext(ctx context.Context, id uint64, query WithdrawalReviewContextQuery) (*WithdrawalReviewContextDTO, error) {
|
||||
query = normalizeReviewContextQuery(query)
|
||||
|
||||
var current model.WithdrawalRequest
|
||||
if err := r.db.WithContext(ctx).First(¤t, id).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return nil, ErrWithdrawalNotFound
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
|
||||
summary, err := r.withdrawalReviewSummary(ctx, current.UserID, current.DistributionSiteID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
orders, err := r.withdrawalReviewOrders(ctx, current.UserID, current.DistributionSiteID, query)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
pickups, err := r.withdrawalReviewPickups(ctx, current.UserID, current.DistributionSiteID, query)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
withdrawals, err := r.withdrawalReviewHistory(ctx, current.UserID, current.DistributionSiteID, query)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &WithdrawalReviewContextDTO{
|
||||
Summary: summary,
|
||||
Orders: orders,
|
||||
OrderPage: query.OrderPage,
|
||||
OrderPageSize: query.PageSize,
|
||||
Pickups: pickups,
|
||||
PickupPage: query.PickupPage,
|
||||
PickupPageSize: query.PageSize,
|
||||
Withdrawals: withdrawals,
|
||||
WithdrawalPage: query.WithdrawalPage,
|
||||
WithdrawalPageSize: query.PageSize,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func scopeWithdrawalSite(db *gorm.DB, column string, siteID uint64) *gorm.DB {
|
||||
if siteID > 0 {
|
||||
return db.Where(column+" = ?", siteID)
|
||||
}
|
||||
return db.Where("(" + column + " IS NULL OR " + column + " = 0)")
|
||||
}
|
||||
|
||||
func (r *Repository) withdrawalReviewSummary(ctx context.Context, userID, siteID uint64) (WithdrawalReviewSummaryDTO, error) {
|
||||
db := r.db.WithContext(ctx)
|
||||
var result WithdrawalReviewSummaryDTO
|
||||
|
||||
var orderSummary struct {
|
||||
OwnerOrderCount int64
|
||||
FinalizedOrderCount int64
|
||||
PlatformManagedIncomeCent int64
|
||||
}
|
||||
orderQuery := scopeWithdrawalSite(db.Table("rental_orders"), "distribution_site_id", siteID)
|
||||
if err := orderQuery.
|
||||
Select(`COUNT(*) AS owner_order_count,
|
||||
COALESCE(SUM(CASE WHEN settlement_status IN ('settled','arbitrated') THEN 1 ELSE 0 END), 0) AS finalized_order_count,
|
||||
COALESCE(SUM(CASE WHEN settlement_mode = 'platform_managed' AND settlement_status IN ('settled','arbitrated')
|
||||
THEN COALESCE(offline_settlement_amount_cent, 0) ELSE 0 END), 0) AS platform_managed_income_cent`).
|
||||
Where("owner_id = ?", userID).
|
||||
Scan(&orderSummary).Error; err != nil {
|
||||
return result, err
|
||||
}
|
||||
|
||||
var walletIncome int64
|
||||
walletQuery := scopeWithdrawalSite(db.Table("wallet_ledger AS wl"), "wl.distribution_site_id", siteID)
|
||||
if err := walletQuery.
|
||||
Select("COALESCE(SUM(wl.amount_cent), 0)").
|
||||
Joins("JOIN rental_orders AS o ON o.id = wl.order_id").
|
||||
Where("wl.user_id = ? AND o.owner_id = ? AND o.settlement_mode <> ?", userID, userID, "platform_managed").
|
||||
Where("wl.direction = ? AND wl.biz_type IN ?", "in", ownerIncomeBizTypes).
|
||||
Scan(&walletIncome).Error; err != nil {
|
||||
return result, err
|
||||
}
|
||||
|
||||
type pickupBaseRow struct {
|
||||
SettlementMode string
|
||||
Count int64
|
||||
AmountCent int64
|
||||
}
|
||||
var pickupBases []pickupBaseRow
|
||||
pickupBaseQuery := scopeWithdrawalSite(db.Table("admin_pickups AS p"), "l.distribution_site_id", siteID).
|
||||
Select("p.settlement_mode, COUNT(*) AS count, COALESCE(SUM(p.settle_amount_cent), 0) AS amount_cent").
|
||||
Joins("JOIN rental_listings AS l ON l.id = p.listing_id").
|
||||
Where("p.owner_id = ? AND p.status = ?", userID, "completed").
|
||||
Group("p.settlement_mode")
|
||||
if err := pickupBaseQuery.Scan(&pickupBases).Error; err != nil {
|
||||
return result, err
|
||||
}
|
||||
|
||||
type pickupAdjustmentRow struct {
|
||||
SettlementMode string
|
||||
AmountCent int64
|
||||
}
|
||||
var pickupAdjustments []pickupAdjustmentRow
|
||||
pickupAdjustmentQuery := scopeWithdrawalSite(db.Table("admin_pickup_financial_adjustments AS fa"), "l.distribution_site_id", siteID).
|
||||
Select("p.settlement_mode, COALESCE(SUM(fa.settle_delta_cent), 0) AS amount_cent").
|
||||
Joins("JOIN admin_pickups AS p ON p.id = fa.pickup_id AND p.status = ?", "completed").
|
||||
Joins("JOIN rental_listings AS l ON l.id = p.listing_id").
|
||||
Where("p.owner_id = ?", userID).
|
||||
Group("p.settlement_mode")
|
||||
if err := pickupAdjustmentQuery.Scan(&pickupAdjustments).Error; err != nil {
|
||||
return result, err
|
||||
}
|
||||
|
||||
pickupAmounts := make(map[string]int64, len(pickupBases))
|
||||
for _, row := range pickupBases {
|
||||
pickupAmounts[row.SettlementMode] += row.AmountCent
|
||||
result.OwnerPickupCount += row.Count
|
||||
}
|
||||
for _, row := range pickupAdjustments {
|
||||
pickupAmounts[row.SettlementMode] += row.AmountCent
|
||||
}
|
||||
result.WalletPickupIncomeCent = pickupAmounts["owner_wallet"]
|
||||
result.PlatformManagedPickupIncomeCent = pickupAmounts["platform_managed"]
|
||||
result.PickupIncomeCent = result.WalletPickupIncomeCent + result.PlatformManagedPickupIncomeCent
|
||||
|
||||
var withdrawalSummary struct {
|
||||
WithdrawalCount int64
|
||||
WithdrawnAmountCent int64
|
||||
PendingWithdrawalAmountCent int64
|
||||
RejectedWithdrawalCount int64
|
||||
}
|
||||
withdrawalQuery := scopeWithdrawalSite(db.Table("withdrawal_requests"), "distribution_site_id", siteID)
|
||||
if err := withdrawalQuery.
|
||||
Select(`COUNT(*) AS withdrawal_count,
|
||||
COALESCE(SUM(CASE WHEN status = 'completed' THEN actual_amount_cent ELSE 0 END), 0) AS withdrawn_amount_cent,
|
||||
COALESCE(SUM(CASE WHEN status IN ('pending','processing') THEN actual_amount_cent ELSE 0 END), 0) AS pending_withdrawal_amount_cent,
|
||||
COALESCE(SUM(CASE WHEN status = 'rejected' THEN 1 ELSE 0 END), 0) AS rejected_withdrawal_count`).
|
||||
Where("user_id = ?", userID).
|
||||
Scan(&withdrawalSummary).Error; err != nil {
|
||||
return result, err
|
||||
}
|
||||
|
||||
result.OwnerOrderCount = orderSummary.OwnerOrderCount
|
||||
result.FinalizedOrderCount = orderSummary.FinalizedOrderCount
|
||||
result.WalletActualIncomeCent = walletIncome + result.WalletPickupIncomeCent
|
||||
result.PlatformManagedIncomeCent = orderSummary.PlatformManagedIncomeCent + result.PlatformManagedPickupIncomeCent
|
||||
result.WithdrawalCount = withdrawalSummary.WithdrawalCount
|
||||
result.WithdrawnAmountCent = withdrawalSummary.WithdrawnAmountCent
|
||||
result.PendingWithdrawalAmountCent = withdrawalSummary.PendingWithdrawalAmountCent
|
||||
result.RejectedWithdrawalCount = withdrawalSummary.RejectedWithdrawalCount
|
||||
result.ReconcileDifferenceAmountCent = result.WalletActualIncomeCent - withdrawalSummary.WithdrawnAmountCent - withdrawalSummary.PendingWithdrawalAmountCent
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (r *Repository) withdrawalReviewOrders(ctx context.Context, userID, siteID uint64, query WithdrawalReviewContextQuery) ([]WithdrawalReviewOrderDTO, error) {
|
||||
type orderRow struct {
|
||||
ID uint64
|
||||
OrderNo string
|
||||
ListingNo string
|
||||
Title string
|
||||
Status string
|
||||
SettlementStatus string
|
||||
SettlementMode string
|
||||
RentAmountCent int64
|
||||
OfflineSettlementAmountCent int64
|
||||
CreatedAt time.Time
|
||||
SettledAt *time.Time
|
||||
}
|
||||
|
||||
var rows []orderRow
|
||||
offset := (query.OrderPage - 1) * query.PageSize
|
||||
orderQuery := scopeWithdrawalSite(r.db.WithContext(ctx), "o.distribution_site_id", siteID)
|
||||
if err := orderQuery.
|
||||
Table("rental_orders AS o").
|
||||
Select(`o.id, o.order_no, l.listing_no, a.title, o.status, o.settlement_status, o.settlement_mode,
|
||||
o.rent_amount_cent, COALESCE(o.offline_settlement_amount_cent, 0) AS offline_settlement_amount_cent,
|
||||
o.created_at, o.settled_at`).
|
||||
Joins("JOIN rental_listings AS l ON l.id = o.listing_id").
|
||||
Joins("JOIN game_accounts AS a ON a.id = o.account_id").
|
||||
Where("o.owner_id = ?", userID).
|
||||
Order("o.id DESC").
|
||||
Offset(offset).Limit(query.PageSize).
|
||||
Scan(&rows).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(rows) == 0 {
|
||||
return []WithdrawalReviewOrderDTO{}, nil
|
||||
}
|
||||
|
||||
orderIDs := make([]uint64, 0, len(rows))
|
||||
for _, row := range rows {
|
||||
orderIDs = append(orderIDs, row.ID)
|
||||
}
|
||||
var walletRows []struct {
|
||||
OrderID uint64
|
||||
AmountCent int64
|
||||
}
|
||||
if err := r.db.WithContext(ctx).
|
||||
Table("wallet_ledger").
|
||||
Select("order_id, COALESCE(SUM(amount_cent), 0) AS amount_cent").
|
||||
Where("order_id IN ? AND user_id = ? AND direction = ? AND biz_type IN ?", orderIDs, userID, "in", ownerIncomeBizTypes).
|
||||
Group("order_id").
|
||||
Scan(&walletRows).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
walletIncome := make(map[uint64]int64, len(walletRows))
|
||||
for _, row := range walletRows {
|
||||
walletIncome[row.OrderID] = row.AmountCent
|
||||
}
|
||||
|
||||
items := make([]WithdrawalReviewOrderDTO, 0, len(rows))
|
||||
for _, row := range rows {
|
||||
var income *int64
|
||||
if row.SettlementStatus == "settled" || row.SettlementStatus == "arbitrated" {
|
||||
amount := walletIncome[row.ID]
|
||||
if row.SettlementMode == "platform_managed" {
|
||||
amount = row.OfflineSettlementAmountCent
|
||||
}
|
||||
income = &amount
|
||||
}
|
||||
items = append(items, WithdrawalReviewOrderDTO{
|
||||
ID: row.ID,
|
||||
OrderNo: row.OrderNo,
|
||||
ListingNo: row.ListingNo,
|
||||
Title: row.Title,
|
||||
Status: row.Status,
|
||||
SettlementStatus: row.SettlementStatus,
|
||||
SettlementMode: row.SettlementMode,
|
||||
RentAmountCent: row.RentAmountCent,
|
||||
OwnerActualIncomeCent: income,
|
||||
CreatedAt: row.CreatedAt,
|
||||
SettledAt: row.SettledAt,
|
||||
})
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
func (r *Repository) withdrawalReviewPickups(ctx context.Context, userID, siteID uint64, query WithdrawalReviewContextQuery) ([]WithdrawalReviewPickupDTO, error) {
|
||||
type pickupRow struct {
|
||||
ID uint64
|
||||
PickupNo string
|
||||
ListingNo string
|
||||
Title string
|
||||
Status string
|
||||
SettlementMode string
|
||||
OfflineSettlementStatus string
|
||||
SettleAmountCent int64
|
||||
CompletedAt *time.Time
|
||||
CreatedAt time.Time
|
||||
}
|
||||
|
||||
var rows []pickupRow
|
||||
offset := (query.PickupPage - 1) * query.PageSize
|
||||
pickupQuery := scopeWithdrawalSite(r.db.WithContext(ctx), "l.distribution_site_id", siteID)
|
||||
if err := pickupQuery.
|
||||
Table("admin_pickups AS p").
|
||||
Select(`p.id, p.pickup_no, l.listing_no, a.title, p.status, p.settlement_mode,
|
||||
p.offline_settlement_status, p.settle_amount_cent, p.completed_at, p.created_at`).
|
||||
Joins("JOIN rental_listings AS l ON l.id = p.listing_id").
|
||||
Joins("JOIN game_accounts AS a ON a.id = p.account_id").
|
||||
Where("p.owner_id = ? AND p.status = ?", userID, "completed").
|
||||
Order("p.id DESC").
|
||||
Offset(offset).Limit(query.PageSize).
|
||||
Scan(&rows).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(rows) == 0 {
|
||||
return []WithdrawalReviewPickupDTO{}, nil
|
||||
}
|
||||
|
||||
pickupIDs := make([]uint64, 0, len(rows))
|
||||
for _, row := range rows {
|
||||
pickupIDs = append(pickupIDs, row.ID)
|
||||
}
|
||||
var adjustmentRows []struct {
|
||||
PickupID uint64
|
||||
AmountCent int64
|
||||
}
|
||||
if err := r.db.WithContext(ctx).
|
||||
Table("admin_pickup_financial_adjustments").
|
||||
Select("pickup_id, COALESCE(SUM(settle_delta_cent), 0) AS amount_cent").
|
||||
Where("pickup_id IN ?", pickupIDs).
|
||||
Group("pickup_id").
|
||||
Scan(&adjustmentRows).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
adjustments := make(map[uint64]int64, len(adjustmentRows))
|
||||
for _, row := range adjustmentRows {
|
||||
adjustments[row.PickupID] = row.AmountCent
|
||||
}
|
||||
|
||||
items := make([]WithdrawalReviewPickupDTO, 0, len(rows))
|
||||
for _, row := range rows {
|
||||
adjustment := adjustments[row.ID]
|
||||
items = append(items, WithdrawalReviewPickupDTO{
|
||||
ID: row.ID,
|
||||
PickupNo: row.PickupNo,
|
||||
ListingNo: row.ListingNo,
|
||||
Title: row.Title,
|
||||
Status: row.Status,
|
||||
SettlementMode: row.SettlementMode,
|
||||
OfflineSettlementStatus: row.OfflineSettlementStatus,
|
||||
SettleAmountCent: row.SettleAmountCent,
|
||||
SettleAdjustmentCent: adjustment,
|
||||
EffectiveSettleAmountCent: row.SettleAmountCent + adjustment,
|
||||
CompletedAt: row.CompletedAt,
|
||||
CreatedAt: row.CreatedAt,
|
||||
})
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
func (r *Repository) withdrawalReviewHistory(ctx context.Context, userID, siteID uint64, query WithdrawalReviewContextQuery) ([]WithdrawalReviewHistoryDTO, error) {
|
||||
var rows []model.WithdrawalRequest
|
||||
offset := (query.WithdrawalPage - 1) * query.PageSize
|
||||
historyQuery := scopeWithdrawalSite(r.db.WithContext(ctx), "distribution_site_id", siteID)
|
||||
if err := historyQuery.
|
||||
Where("user_id = ?", userID).
|
||||
Order("created_at DESC, id DESC").
|
||||
Offset(offset).Limit(query.PageSize).
|
||||
Find(&rows).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items := make([]WithdrawalReviewHistoryDTO, 0, len(rows))
|
||||
for _, row := range rows {
|
||||
items = append(items, WithdrawalReviewHistoryDTO{
|
||||
ID: row.ID,
|
||||
WithdrawNo: row.WithdrawNo,
|
||||
AmountCent: row.AmountCent,
|
||||
FeeCent: row.FeeCent,
|
||||
ActualAmountCent: row.ActualAmountCent,
|
||||
Status: row.Status,
|
||||
CreatedAt: row.CreatedAt,
|
||||
ReviewedAt: row.ReviewedAt,
|
||||
PaidAt: row.PaidAt,
|
||||
})
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
@@ -96,6 +96,13 @@ func (s *Service) AdminFindByID(ctx context.Context, id uint64) (*WithdrawalDeta
|
||||
return s.repo.AdminFindByID(ctx, id)
|
||||
}
|
||||
|
||||
func (s *Service) AdminReviewContext(ctx context.Context, id uint64, query WithdrawalReviewContextQuery) (*WithdrawalReviewContextDTO, error) {
|
||||
if s.repo == nil {
|
||||
return nil, ErrDependencyUnavailable
|
||||
}
|
||||
return s.repo.AdminReviewContext(ctx, id, query)
|
||||
}
|
||||
|
||||
func (s *Service) Review(ctx context.Context, adminID, id uint64, req ReviewWithdrawalRequest) (*WithdrawalDetailDTO, error) {
|
||||
if s.repo == nil {
|
||||
return nil, ErrDependencyUnavailable
|
||||
|
||||
Reference in New Issue
Block a user