- 修复 FindOrder 在收号站模式(two_party_distributor_receive / three_party)下的 403 权限判定,放行参与方站点成员并精准计算收益 - 串联 distribution_site_payment_channels 至 payment.Start 核心支付发起流程,分销订单优先使用绑定的专属商户通道 - 修复数据大盘 GetDashboardAnalytics 趋势中 ReceivedCount 恒为 0 的问题,并对齐今日订单与 GMV 统计 - 修复 dispute/arbitration.go 仲裁完成时向分销租客发放成长积分的泄漏风险 - 提现管理新增 distribution_site_name/distribution_site_code 字段并在后台列表与详情弹窗中区分展示分销站 - GetPublicSiteInfo 增加 X-Distribution-Site-Code 请求头兜底支持
122 lines
3.5 KiB
Go
122 lines
3.5 KiB
Go
package withdrawal
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
|
|
"hfb_sys/backend/internal/model"
|
|
)
|
|
|
|
// 转换为用户DTO
|
|
func toDTO(w model.WithdrawalRequest) WithdrawalDTO {
|
|
return WithdrawalDTO{
|
|
ID: w.ID,
|
|
WithdrawNo: w.WithdrawNo,
|
|
UserID: w.UserID,
|
|
DistributionSiteID: w.DistributionSiteID,
|
|
AmountCent: w.AmountCent,
|
|
FeeCent: w.FeeCent,
|
|
ActualAmountCent: w.ActualAmountCent,
|
|
AccountType: w.AccountType,
|
|
AccountName: w.AccountName,
|
|
AccountNo: w.AccountNo,
|
|
BankName: w.BankName,
|
|
Status: w.Status,
|
|
ReviewRemark: w.ReviewRemark,
|
|
CreatedAt: w.CreatedAt,
|
|
UpdatedAt: w.UpdatedAt,
|
|
ReviewedAt: w.ReviewedAt,
|
|
PaidAt: w.PaidAt,
|
|
}
|
|
}
|
|
|
|
// 转换为管理员详细DTO
|
|
|
|
// 转换为管理员详细DTO
|
|
func (r *Repository) toDetailDTO(ctx context.Context, w model.WithdrawalRequest) (*WithdrawalDetailDTO, error) {
|
|
db := r.db.WithContext(ctx)
|
|
// 查询用户信息
|
|
var user model.User
|
|
db.Select("nickname, phone").First(&user, w.UserID)
|
|
|
|
// 查询审核人信息
|
|
var reviewedByName string
|
|
if w.ReviewedBy != nil {
|
|
var admin model.AdminUser
|
|
if err := db.Select("nickname").First(&admin, *w.ReviewedBy).Error; err == nil {
|
|
reviewedByName = admin.Nickname
|
|
}
|
|
}
|
|
|
|
// 查询打款人信息
|
|
var paidByName string
|
|
if w.PaidBy != nil {
|
|
var admin model.AdminUser
|
|
if err := db.Select("nickname").First(&admin, *w.PaidBy).Error; err == nil {
|
|
paidByName = admin.Nickname
|
|
}
|
|
}
|
|
|
|
// 获取完整账号和收款二维码(管理员可见)
|
|
fullAccountNo := w.AccountNo
|
|
var certificateURLs []string
|
|
if w.PaymentAccountID != nil {
|
|
var paymentAccount model.UserPaymentAccount
|
|
if err := db.First(&paymentAccount, *w.PaymentAccountID).Error; err == nil {
|
|
// 解密账号
|
|
decrypted, err := r.encryptor.Decrypt(paymentAccount.AccountNo)
|
|
if err == nil {
|
|
fullAccountNo = decrypted
|
|
}
|
|
// 解析收款二维码
|
|
if paymentAccount.CertificateURLs != nil {
|
|
json.Unmarshal(paymentAccount.CertificateURLs, &certificateURLs)
|
|
}
|
|
}
|
|
}
|
|
|
|
var siteName, siteCode string
|
|
if w.DistributionSiteID > 0 {
|
|
var site model.DistributionSite
|
|
if err := db.Select("site_name, site_code").First(&site, w.DistributionSiteID).Error; err == nil {
|
|
siteName = site.SiteName
|
|
siteCode = site.SiteCode
|
|
}
|
|
}
|
|
|
|
return &WithdrawalDetailDTO{
|
|
ID: w.ID,
|
|
WithdrawNo: w.WithdrawNo,
|
|
UserID: w.UserID,
|
|
DistributionSiteID: w.DistributionSiteID,
|
|
DistributionSiteName: siteName,
|
|
DistributionSiteCode: siteCode,
|
|
UserNickname: user.Nickname,
|
|
UserPhone: user.Phone,
|
|
AmountCent: w.AmountCent,
|
|
FeeCent: w.FeeCent,
|
|
ActualAmountCent: w.ActualAmountCent,
|
|
PaymentAccountID: w.PaymentAccountID,
|
|
AccountType: w.AccountType,
|
|
AccountName: w.AccountName,
|
|
AccountNo: fullAccountNo,
|
|
BankName: w.BankName,
|
|
BankBranch: w.BankBranch,
|
|
CertificateURLs: certificateURLs,
|
|
Status: w.Status,
|
|
ReviewedBy: w.ReviewedBy,
|
|
ReviewedByName: reviewedByName,
|
|
ReviewedAt: w.ReviewedAt,
|
|
ReviewRemark: w.ReviewRemark,
|
|
PaidBy: w.PaidBy,
|
|
PaidByName: paidByName,
|
|
PaidAt: w.PaidAt,
|
|
PaymentProofURL: w.PaymentProofURL,
|
|
PaymentRemark: w.PaymentRemark,
|
|
CreatedAt: w.CreatedAt,
|
|
UpdatedAt: w.UpdatedAt,
|
|
}, nil
|
|
}
|
|
|
|
// 生成提现单号
|