测试库不再使用 SQLite 内存库,改为每个测试包独立的 MySQL 库, 表结构由 backend/migrations 的真实迁移建立。 基础设施 - 新增 internal/database/testdb.go:NewTestDB() 保持原签名(28 处调用零改动), 内部连接 MySQL 测试库,首次调用重建库并执行全部真实迁移,之后每次调用清空全表 - 库名 = 测试库基础名 + 包目录名,同包共享、跨包隔离,使 go test ./... 可并发执行 (共用一库时各包会互相 DROP/CREATE 导致 database exists) - 新增 NewDryRunDB():MySQL 方言 + DryRun,供断言 SQL 形态的 5 处测试使用 - 新增 AutoMigrateIfMissing():只对不存在的表 AutoMigrate, 避免改动迁移定义的索引与约束 - 新增 scripts/prepare-test-db.sh:建库与通配授权,可重复执行 - 33 处 sqlite.Open 全部替换,26 个测试文件改用 MySQL - 删除 46 处手写 SQLite 方言 DDL(AUTOINCREMENT / INTEGER PRIMARY KEY / TEXT), 表统一由真实迁移建立 - go.mod 移除 gorm.io/driver/sqlite 与 mattn/go-sqlite3 - 删除生产代码里 distribution/repository.go 的 sqlite 方言分支(strftime) 对齐环境后暴露并修复的真实问题 - DATE(col) 在 MySQL 返回 DATE 类型,使 Date string 字段变成 RFC3339 时间串, 大盘日期会带出时间部分;28 处改为 DATE_FORMAT(col, '%Y-%m-%d') - 系统自动创建分销结算批次时 created_by 写入 0,违反指向 admin_users 的外键, 生产会直接插入失败;改为写 NULL(新增 adminRef helper) - MySQL DATETIME 仅到秒,静默截断 Go 侧写入的时间, 导致租用时长计算与结算时点回读比对偏差; rental_orders 的 9 个业务时间列提到 DATETIME(6) - 测试数据补齐严格模式要求的 NOT NULL 列、修正超出列长的取值、补齐外键父记录 迁移 - 000065 的 ALTER TABLE rental_orders 一并完成业务时间列精度调整, feature 侧不再单开迁移文件 脚本与文档 - check.sh / check-backend-coverage.sh 去掉 -p 1 串行与 SQLite 相关注释 - 更新 docs/Repository层测试补充总结.md 的测试运行说明
111 lines
3.1 KiB
Go
111 lines
3.1 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)
|
|
}
|
|
}
|
|
}
|
|
|
|
return &WithdrawalDetailDTO{
|
|
ID: w.ID,
|
|
WithdrawNo: w.WithdrawNo,
|
|
UserID: w.UserID,
|
|
DistributionSiteID: w.DistributionSiteID,
|
|
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
|
|
}
|
|
|
|
// 生成提现单号
|