feat(v1.5): 触摸键盘、格子大字计数、客户停用/删除、按钮收纳、7 天徽标、抽屉时钟
build / build-and-test (push) Successful in 3m19s

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:
subtrack
2026-10-19 02:12:25 +08:00
parent 95fa4fd6fd
commit 1f7d0f0cc4
16 changed files with 447 additions and 72 deletions
+54 -7
View File
@@ -28,6 +28,9 @@ type Customer struct {
AssigneeName string
AssigneeColor string
// Archived 停用(软删除):默认隐藏,订阅保留但不上日历
Archived bool
// 列表聚合
SubCount int
Summary string
@@ -46,19 +49,21 @@ func (c *Customer) TagList() []string {
return out
}
const customerCols = `id,tail,name,game_name,game_server,contact,tags,source,note,created_at,updated_at,IFNULL(assignee_id,0),IFNULL((SELECT u.display_name FROM users u WHERE u.id=customers.assignee_id),''),IFNULL((SELECT u.color FROM users u WHERE u.id=customers.assignee_id),'')`
const customerCols = `id,tail,name,game_name,game_server,contact,tags,source,note,created_at,updated_at,IFNULL(assignee_id,0),IFNULL((SELECT u.display_name FROM users u WHERE u.id=customers.assignee_id),''),IFNULL((SELECT u.color FROM users u WHERE u.id=customers.assignee_id),''),IFNULL(archived,0)`
func scanCustomer(row interface{ Scan(dest ...any) error }) (*Customer, error) {
var c Customer
var archived int
err := row.Scan(&c.ID, &c.Tail, &c.Name, &c.GameName, &c.GameServer, &c.Contact,
&c.Tags, &c.Source, &c.Note, &c.CreatedAt, &c.UpdatedAt,
&c.AssigneeID, &c.AssigneeName, &c.AssigneeColor)
&c.AssigneeID, &c.AssigneeName, &c.AssigneeColor, &archived)
if err != nil {
if errors.Is(err, sql.ErrNoRows) {
return nil, ErrNotFound
}
return nil, err
}
c.Archived = archived == 1
return &c, nil
}
@@ -96,12 +101,19 @@ func (db *DB) Customer(id int64) (*Customer, error) {
}
// ListCustomers 分页查询客户,并聚合订阅摘要。
func (db *DB) ListCustomers(q string, limit, offset int, today string, warnDays int) ([]Customer, int, error) {
func (db *DB) ListCustomers(q string, limit, offset int, today string, warnDays int, includeArchived bool) ([]Customer, int, error) {
where := "1=1"
args := []any{}
if !includeArchived {
where = "IFNULL(archived,0)=0"
}
if q = strings.TrimSpace(q); q != "" {
like := "%" + q + "%"
where = "(tail LIKE ? OR name LIKE ? OR game_name LIKE ? OR contact LIKE ? OR tags LIKE ?)"
if includeArchived {
where = "(tail LIKE ? OR name LIKE ? OR game_name LIKE ? OR contact LIKE ? OR tags LIKE ?)"
} else {
where = "IFNULL(archived,0)=0 AND (tail LIKE ? OR name LIKE ? OR game_name LIKE ? OR contact LIKE ? OR tags LIKE ?)"
}
args = append(args, like, like, like, like, like)
}
var total int
@@ -202,7 +214,7 @@ func (db *DB) FindCustomerByTailName(tail, name string) (*Customer, error) {
// CustomerCount 客户总数。
func (db *DB) CustomerCount() (int, error) {
var n int
err := db.sql.QueryRow(`SELECT COUNT(*) FROM customers`).Scan(&n)
err := db.sql.QueryRow(`SELECT COUNT(*) FROM customers WHERE IFNULL(archived,0)=0`).Scan(&n)
return n, err
}
@@ -212,14 +224,14 @@ func (db *DB) CustomersByTail(tail string) ([]Customer, error) {
if tail == "" {
return nil, nil
}
out, err := db.queryCustomers(`SELECT `+customerCols+` FROM customers WHERE tail = ? ORDER BY id`, tail)
out, err := db.queryCustomers(`SELECT `+customerCols+` FROM customers WHERE IFNULL(archived,0)=0 AND tail = ? ORDER BY id`, tail)
if err != nil {
return nil, err
}
if len(out) > 0 {
return out, nil
}
return db.queryCustomers(`SELECT `+customerCols+` FROM customers WHERE tail LIKE ? ORDER BY id LIMIT 20`, "%"+tail+"%")
return db.queryCustomers(`SELECT `+customerCols+` FROM customers WHERE IFNULL(archived,0)=0 AND tail LIKE ? ORDER BY id LIMIT 20`, "%"+tail+"%")
}
func (db *DB) queryCustomers(q string, args ...any) ([]Customer, error) {
@@ -238,3 +250,38 @@ func (db *DB) queryCustomers(q string, args ...any) ([]Customer, error) {
}
return out, rows.Err()
}
// SetCustomerArchived 停用/恢复客户。停用后其订阅保留,但不再上日历与大屏。
func (db *DB) SetCustomerArchived(id int64, archived bool) error {
v := 0
if archived {
v = 1
}
res, err := db.sql.Exec(`UPDATE customers SET archived=?, updated_at=? WHERE id=?`, v, nowStamp(), id)
if err != nil {
return err
}
if n, _ := res.RowsAffected(); n == 0 {
return ErrNotFound
}
return nil
}
// DeleteCustomer 彻底删除客户;订阅、打卡、暂停、追加记录随外键级联删除。
func (db *DB) DeleteCustomer(id int64) error {
res, err := db.sql.Exec(`DELETE FROM customers WHERE id=?`, id)
if err != nil {
return err
}
if n, _ := res.RowsAffected(); n == 0 {
return ErrNotFound
}
return nil
}
// CountArchivedCustomers 统计已停用客户数。
func (db *DB) CountArchivedCustomers() (int, error) {
var n int
err := db.sql.QueryRow(`SELECT COUNT(*) FROM customers WHERE IFNULL(archived,0)=1`).Scan(&n)
return n, err
}
+5
View File
@@ -130,6 +130,10 @@ func (db *DB) Migrate() error {
"ALTER TABLE customers ADD COLUMN assignee_id INTEGER REFERENCES users(id)"); err != nil {
return err
}
if err := db.ensureColumn("customers", "archived",
"ALTER TABLE customers ADD COLUMN archived INTEGER NOT NULL DEFAULT 0"); err != nil {
return err
}
return nil
}
@@ -206,6 +210,7 @@ var schemaStatements = []string{
source TEXT NOT NULL DEFAULT '',
note TEXT NOT NULL DEFAULT '',
assignee_id INTEGER REFERENCES users(id),
archived INTEGER NOT NULL DEFAULT 0,
created_at TEXT NOT NULL,
updated_at TEXT NOT NULL,
UNIQUE (tail, name)
+21 -12
View File
@@ -22,13 +22,18 @@ type Stats struct {
}
// Badges 顶栏常驻徽标。
func (db *DB) Badges(today time.Time) (dueToday, due3 int, err error) {
func (db *DB) Badges(today time.Time) (dueToday, due3, due7 int, err error) {
t := domain.Date(today)
if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date=?`, t).Scan(&dueToday); err != nil {
const notArchived = ` AND IFNULL((SELECT archived FROM customers c WHERE c.id=customer_id),0)=0`
if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date=?`+notArchived, t).Scan(&dueToday); err != nil {
return
}
err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date BETWEEN ? AND ?`,
t, domain.Date(domain.AddDays(today, 2))).Scan(&due3)
if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date BETWEEN ? AND ?`+notArchived,
t, domain.Date(domain.AddDays(today, 2))).Scan(&due3); err != nil {
return
}
err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date BETWEEN ? AND ?`+notArchived,
t, domain.Date(domain.AddDays(today, 6))).Scan(&due7)
return
}
@@ -42,14 +47,17 @@ func (db *DB) ScreenStats(today time.Time, warnDays int) (*Stats, error) {
if st.ActiveSubs, err = db.CountActiveSubs(domain.Date(today)); err != nil {
return nil, err
}
if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status='paused'`).Scan(&st.PausedSubs); err != nil {
if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status='paused'
AND IFNULL((SELECT archived FROM customers c WHERE c.id=customer_id),0)=0`).Scan(&st.PausedSubs); err != nil {
return nil, err
}
if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date=?`,
if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date=?
AND IFNULL((SELECT archived FROM customers c WHERE c.id=customer_id),0)=0`,
domain.Date(today)).Scan(&st.DueToday); err != nil {
return nil, err
}
if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date BETWEEN ? AND ?`,
if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date BETWEEN ? AND ?
AND IFNULL((SELECT archived FROM customers c WHERE c.id=customer_id),0)=0`,
domain.Date(today), domain.Date(domain.AddDays(today, 6))).Scan(&st.Due7); err != nil {
return nil, err
}
@@ -60,8 +68,9 @@ func (db *DB) ScreenStats(today time.Time, warnDays int) (*Stats, error) {
// 本月到期热力
ms := domain.MonthStart(today.Year(), today.Month())
me := domain.MonthEnd(today.Year(), today.Month())
rows, err := db.sql.Query(`SELECT end_date, COUNT(*) FROM subscriptions
WHERE status<>'closed' AND end_date BETWEEN ? AND ? GROUP BY end_date`,
rows, err := db.sql.Query(`SELECT end_date, COUNT(*) FROM subscriptions s
JOIN customers c ON c.id=s.customer_id
WHERE s.status<>'closed' AND IFNULL(c.archived,0)=0 AND s.end_date BETWEEN ? AND ? GROUP BY s.end_date`,
domain.Date(ms), domain.Date(me))
if err != nil {
return nil, err
@@ -80,12 +89,12 @@ func (db *DB) ScreenStats(today time.Time, warnDays int) (*Stats, error) {
// TOP:按日按剩余天数、按次按剩余次数,各自排序后交替取前 10
t := domain.Date(today)
daySubs, err := db.querySubs(subSelect+` WHERE s.status<>'closed' AND s.unit='day' AND s.end_date>=?
daySubs, err := db.querySubs(subSelect+` WHERE s.status<>'closed' AND IFNULL(c.archived,0)=0 AND s.unit='day' AND s.end_date>=?
ORDER BY s.end_date ASC LIMIT 12`, t)
if err != nil {
return nil, err
}
cntSubs, err := db.querySubs(subSelect+` WHERE s.status<>'closed' AND s.unit='count' AND s.used_count < s.total_count
cntSubs, err := db.querySubs(subSelect+` WHERE s.status<>'closed' AND IFNULL(c.archived,0)=0 AND s.unit='count' AND s.used_count < s.total_count
AND (IFNULL(s.end_date,'')='' OR s.end_date>=?)
ORDER BY (s.total_count - s.used_count) ASC LIMIT 12`, t)
if err != nil {
@@ -109,6 +118,6 @@ func (db *DB) ScreenStats(today time.Time, warnDays int) (*Stats, error) {
// RecentDue 返回未来 n 天内到期的订阅(按到期日排序)。
func (db *DB) RecentDue(from string, days int) ([]Subscription, error) {
to := domain.Date(domain.AddDays(domain.ParseDateOr(from, domain.Today()), days-1))
return db.querySubs(subSelect+` WHERE s.status<>'closed' AND s.end_date BETWEEN ? AND ?
return db.querySubs(subSelect+` WHERE s.status<>'closed' AND IFNULL(c.archived,0)=0 AND s.end_date BETWEEN ? AND ?
ORDER BY s.end_date, s.id`, from, to)
}
+90 -3
View File
@@ -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("删除不存在的客户应报错")
}
}
+4 -3
View File
@@ -232,14 +232,14 @@ func (db *DB) ListSubs(f SubFilter) ([]Subscription, int, error) {
// CalendarSubs 取与 [from,to] 日期区间相交的订阅(用于日历)。
func (db *DB) CalendarSubs(from, to string) ([]Subscription, error) {
return db.querySubs(subSelect+` WHERE s.status<>'closed'
return db.querySubs(subSelect+` WHERE s.status<>'closed' AND IFNULL(c.archived,0)=0
AND s.start_date <= ? AND IFNULL(s.end_date,'')<>'' AND s.end_date >= ?
ORDER BY s.id`, to, from)
}
// DueOn 某天到期的订阅。
func (db *DB) DueOn(date string) ([]Subscription, error) {
return db.querySubs(subSelect+` WHERE s.status<>'closed' AND s.end_date=? ORDER BY s.id`, date)
return db.querySubs(subSelect+` WHERE s.status<>'closed' AND IFNULL(c.archived,0)=0 AND s.end_date=? ORDER BY s.id`, date)
}
// CreateSubInput 新建订阅入参。
@@ -593,7 +593,8 @@ func (db *DB) PausesForSubs(ids []int64) (map[int64][]Pause, error) {
// CountActiveSubs 活跃订阅数。
func (db *DB) CountActiveSubs(today string) (int, error) {
var n int
err := db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions s WHERE s.status='active' AND (
err := db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions s WHERE s.status='active'
AND IFNULL((SELECT archived FROM customers c WHERE c.id=s.customer_id),0)=0 AND (
(s.unit='day' AND s.end_date >= ?) OR
(s.unit='count' AND (IFNULL(s.end_date,'')='' OR s.end_date >= ?) AND s.used_count < s.total_count)
)`, today, today).Scan(&n)