1) 工作台速录 - 手机尾号输入框下方新增 3×4 触摸小键盘(1-9、0、⌫、✓),点 ✓ 直接提交;实体键盘仍可输入 - 抽屉顶部新增秒级时钟(HH:MM:SS),位于日期标题上方 2) 日历格子 - 移除排单缩略信息(客户名/套餐色签/“x/y 单”小字) - 保留左侧打手颜色竖条,中间改为大字「待完成 / 总数」,例如 1/2 = 还剩 1 单、共 2 单 - 大屏格子按此前约定保持原样 3) 客户停用 / 恢复 / 彻底删除 - customers 新增 archived 列(0/1);停用后默认从客户列表、日历、待办、大屏、到期提醒、徽标中隐藏,订阅与打卡记录原样保留 - 恢复后立即回到日历;列表右上角可切换「显示已停用」,已停用行带标记 - 彻底删除为二次确认操作,依赖外键级联清理订阅、打卡、暂停、追加记录与加急标记 - 停用/恢复/删除都会写入操作日志 4) 按钮收纳 - 任务行只露出「完成」,跳过 / 加急(取消加急)/ 追加收进「⋯」菜单;已完成行只露「撤销打卡」等,点空白处自动收起 - 加急、跳过等原有能力不变,仅入口折叠 5) 顶栏 - 在「今日到期」「3 天内到期」右侧新增「7 天内到期」徽标,固定统计未来 7 天 6) 视觉 - 移除管理端背景的横线装饰,改为纯底色;大屏网格背景保留 数据库兼容性: - 只新增 customers.archived 一列,老库启动时自动 ALTER,可重复迁移;原有表结构与接口不变 测试: - 新增单测 TestCustomerArchiveFilters:停用后日历/到期/徽标/搜索/列表全部过滤、恢复回日历、彻底删除级联清理订阅与打卡 - 功能验证 20 项(键盘、格子计数、折叠菜单、7 天徽标、时钟、停用/恢复/删除、背景)全部通过 - 原有 119 项验收回归全绿;go vet / go test ./... 通过;版本号 1.5.0
This commit is contained in:
@@ -343,7 +343,7 @@ func TestSettingsAndBadges(t *testing.T) {
|
||||
_, _ = db.CreateSub(CreateSubInput{
|
||||
CustomerID: cid, PackageID: pkg.ID, StartDate: domain.Date(domain.AddDays(today, -30)), Days: 31,
|
||||
})
|
||||
due, due3, err := db.Badges(today)
|
||||
due, due3, _, err := db.Badges(today)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -357,14 +357,14 @@ func TestSearchByTail(t *testing.T) {
|
||||
mustCustomer(t, db, "8899", "阿飞")
|
||||
mustCustomer(t, db, "8890", "阿飞二号")
|
||||
today := domain.Today()
|
||||
list, total, err := db.ListCustomers("8899", 20, 0, domain.Date(today), 3)
|
||||
list, total, err := db.ListCustomers("8899", 20, 0, domain.Date(today), 3, false)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if total != 1 || len(list) != 1 || list[0].Name != "阿飞" {
|
||||
t.Fatalf("搜索命中 %d 条", total)
|
||||
}
|
||||
list, total, _ = db.ListCustomers("889", 20, 0, domain.Date(today), 3)
|
||||
list, total, _ = db.ListCustomers("889", 20, 0, domain.Date(today), 3, false)
|
||||
if total != 2 {
|
||||
t.Fatalf("前缀搜索应命中 2 条,实际 %d", total)
|
||||
}
|
||||
@@ -1019,3 +1019,90 @@ func TestUpdateUserByAdmin(t *testing.T) {
|
||||
t.Fatalf("首个账户 id 应为 1,实际 %d", admin.ID)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCustomerArchiveFilters(t *testing.T) {
|
||||
db := newTestDB(t)
|
||||
pkg := mustPackage(t, db, "包月日常", domain.UnitDay, 30)
|
||||
|
||||
// 一个正常客户 + 一个按次客户
|
||||
cid := mustCustomer(t, db, "7001", "小张")
|
||||
sub, err := db.CreateSub(CreateSubInput{
|
||||
CustomerID: cid, PackageID: pkg.ID, StartDate: domain.Date(domain.Today()), Days: 10,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// 打卡 + 加急,稍后验证级联删除
|
||||
if err := db.SaveCheckin(sub.ID, domain.Date(domain.Today()), "done", "", 0); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.SetUrgent(sub.ID, domain.Date(domain.Today()), true); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
today := domain.Date(domain.Today())
|
||||
subs, err := db.CalendarSubs(today, today)
|
||||
if err != nil || len(subs) != 1 {
|
||||
t.Fatalf("停用前日历应有 1 条: %v err=%v", len(subs), err)
|
||||
}
|
||||
if n, _ := db.CustomerCount(); n != 1 {
|
||||
t.Fatalf("停用前客户数=1, got %d", n)
|
||||
}
|
||||
|
||||
// 停用
|
||||
if err := db.SetCustomerArchived(cid, true); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if subs, _ := db.CalendarSubs(today, today); len(subs) != 0 {
|
||||
t.Fatalf("停用后不应上日历: %d", len(subs))
|
||||
}
|
||||
if due, _ := db.DueOn(domain.Date(domain.AddDays(domain.Today(), 9))); len(due) != 0 {
|
||||
t.Fatalf("停用后不应提醒到期: %d", len(due))
|
||||
}
|
||||
if n, _ := db.CustomerCount(); n != 0 {
|
||||
t.Fatalf("停用后客户数应为 0, got %d", n)
|
||||
}
|
||||
if list, total, _ := db.ListCustomers("", 50, 0, today, 3, false); total != 0 || len(list) != 0 {
|
||||
t.Fatalf("默认列表不应包含停用客户: total=%d", total)
|
||||
}
|
||||
if list, total, _ := db.ListCustomers("", 50, 0, today, 3, true); total != 1 || len(list) != 1 || !list[0].Archived {
|
||||
t.Fatalf("已停用视图应包含: total=%d list=%+v", total, list)
|
||||
}
|
||||
if c, _ := db.Customer(cid); !c.Archived {
|
||||
t.Fatal("Customer() 应返回 Archived=true")
|
||||
}
|
||||
if due, _, _, _ := db.Badges(domain.Today()); due != 0 {
|
||||
t.Fatalf("停用后徽标应为 0, got %d", due)
|
||||
}
|
||||
if all, _ := db.CustomersByTail("7001"); len(all) != 0 {
|
||||
t.Fatalf("停用客户不应被尾号搜到: %d", len(all))
|
||||
}
|
||||
|
||||
// 恢复
|
||||
if err := db.SetCustomerArchived(cid, false); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if subs, _ := db.CalendarSubs(today, today); len(subs) != 1 {
|
||||
t.Fatalf("恢复后应回到日历: %d", len(subs))
|
||||
}
|
||||
|
||||
// 彻底删除:订阅/打卡/加急一起消失
|
||||
if err := db.DeleteCustomer(cid); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := db.Customer(cid); err == nil {
|
||||
t.Fatal("删除后不应还能查到客户")
|
||||
}
|
||||
if subs, _ := db.CalendarSubs(today, today); len(subs) != 0 {
|
||||
t.Fatalf("删除后订阅应级联消失: %d", len(subs))
|
||||
}
|
||||
var flags, checkins int
|
||||
_ = db.sql.QueryRow(`SELECT COUNT(*) FROM task_flags`).Scan(&flags)
|
||||
_ = db.sql.QueryRow(`SELECT COUNT(*) FROM checkins`).Scan(&checkins)
|
||||
if flags != 0 || checkins != 0 {
|
||||
t.Fatalf("删除后打卡/加急应级联删除: flags=%d checkins=%d", flags, checkins)
|
||||
}
|
||||
if err := db.DeleteCustomer(9999); err == nil {
|
||||
t.Fatal("删除不存在的客户应报错")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user