合并 main 分支并融合订单列表最小化与 SQL 治理
- Auth/权限中间件取 main 演进版(错误细分、token 来源),保留 dev 的用户 cookie 与登出撤销语义 - 后台订单列表:融合 main 的首页免 COUNT 优化与关键词索引路由,保留 dev 的最小化 AdminOrderListItemDTO(结账明细仍由详情接口返回,同步调整对应集成测试) - 保留 dev 的 token_version 冻结/解冻递增与 main 的状态变化判断及通知 - 前端:保留 dev 登出接口与 main 的 fetchMe silent 参数、SSE 登录跳转;后台订单表按 dev 最小化 DTO 移除号主到手列
This commit is contained in:
@@ -604,6 +604,9 @@ func TestExternalAccountToCreateRequestMapsUploadFields(t *testing.T) {
|
||||
if req.AssetSummary["online_time_text"] != "08:00 至 01:00" {
|
||||
t.Fatalf("online_time_text = %#v", req.AssetSummary["online_time_text"])
|
||||
}
|
||||
if req.AssetSummary["early_morning_response"] != "否" {
|
||||
t.Fatalf("early_morning_response = %#v, want 否", req.AssetSummary["early_morning_response"])
|
||||
}
|
||||
onlineTime, ok := req.AssetSummary["online_time"].(map[string]any)
|
||||
if !ok {
|
||||
t.Fatalf("online_time missing: %#v", req.AssetSummary["online_time"])
|
||||
@@ -640,6 +643,28 @@ func TestExternalAccountToCreateRequestMapsUploadFields(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestServerRegionFromLoginMethod(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
loginMethod string
|
||||
want string
|
||||
}{
|
||||
{name: "QQ账号密码", loginMethod: "QQ账号密码", want: "QQ"},
|
||||
{name: "微信扫码", loginMethod: "微信扫码", want: "微信"},
|
||||
{name: "VX扫码", loginMethod: "VX扫码", want: "微信"},
|
||||
{name: "小写WX扫码", loginMethod: "wx扫码", want: "微信"},
|
||||
{name: "Steam", loginMethod: "Steam令牌", want: "Steam"},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if got := serverRegionFromLoginMethod(tt.loginMethod); got != tt.want {
|
||||
t.Fatalf("serverRegionFromLoginMethod(%q) = %q, want %q", tt.loginMethod, got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestExternalAccountToCreateRequestSeparatesPureCoinAndExtraItems(t *testing.T) {
|
||||
req := externalAccountToCreateRequest("客服1", 1772526103000, ExternalAccountData{
|
||||
LoginMethod: "QQ账号密码",
|
||||
|
||||
Reference in New Issue
Block a user