修复资金出款表排序规则冲突

This commit is contained in:
yml2213
2026-09-04 20:41:28 +08:00
parent f1281a9734
commit 7a8773d25d
2 changed files with 53 additions and 0 deletions
@@ -0,0 +1,35 @@
package adminfinance
import (
"os"
"testing"
"time"
"gorm.io/driver/mysql"
"gorm.io/gorm"
)
func TestDisbursementQueryOnMySQL(t *testing.T) {
dsn := os.Getenv("HFB_ADMIN_FINANCE_TEST_DSN")
if dsn == "" {
t.Skip("设置 HFB_ADMIN_FINANCE_TEST_DSN 后运行 MySQL 资金出款查询测试")
}
db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{})
if err != nil {
t.Fatalf("连接 MySQL 失败: %v", err)
}
result, err := NewRepository(db).Disbursements(t.Context(), DisbursementQuery{
DateType: "created",
StartDate: time.Now().AddDate(-1, 0, 0),
EndDate: time.Now().AddDate(0, 0, 1),
Page: 1,
PageSize: 20,
})
if err != nil {
t.Fatalf("MySQL 资金出款查询失败: %v", err)
}
if result == nil || result.Items == nil {
t.Fatalf("MySQL 资金出款查询返回异常: %+v", result)
}
}
@@ -0,0 +1,18 @@
-- +goose Up
-- 000021/000049 创建表时未显式指定排序规则,在 MySQL 8 中会继承
-- utf8mb4_0900_ai_ci。财务出款查询会与 utf8mb4_unicode_ci 的订单、
-- 提现和手工出款表做 UNION,混用排序规则会触发 Error 1271。
ALTER TABLE admin_pickups
CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
ALTER TABLE admin_pickup_financial_adjustments
CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-- +goose Down
ALTER TABLE admin_pickup_financial_adjustments
CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
ALTER TABLE admin_pickups
CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;