build / build-and-test (push) Successful in 3m18s
- 路由:从 screen_public 拆出 portal_public(默认 true),关掉大屏不再连带 404; 设置页显示客户自助状态;/customer 与 /screen 各自独立。 - 查询:尾号只接受 4–8 位数字,服务端精确匹配,去掉 LIKE 模糊回退;按 IP 40 次/分钟限流;页面 noindex。 - 语义:修正「今日待完成」把已完成数当待完成数的问题;0/0 改为「今日无排单」; 无订阅走空态;删掉进度条和重复的今日文案,只留一个状态。 - 订阅:复用管理端 SubView / calSub;通行证 1/1、深渊 x/y 周期;过期、暂停、 按次用尽、跳过都有独立口径;「最近到期」只取未来日期。 - 日历:与主日历一致,只在本月格显示任务;通行证/深渊整段色块(深渊按周期 减淡),日常任务用空心/实心点;每格带读屏描述;today 加「今天」文字标记。 - 错误:只渲染一次并放回内容容器,字段加 aria-invalid;删掉顶部重复横幅。 - 多客户:显示掩码姓名 + 卡内补姓名表单;姓名回填;翻月用 url.Values 编码; 1 位尾号不触发查询;只有空态/补姓名时 autofocus。 - UI:品牌头、可折叠「查询其他尾号」、订阅全宽列表、状态统一用现有 chip、 月份按钮 44px、去掉卡中卡 / opacity / 满屏 0/1。 - 版本 1.11.3;README 增加 4.4 与 portal_public 配置说明。 验证:gofmt / go vet / go test 全绿;portal_public=true 时 /customer 200、 false 时 404;screen_public=false + portal_public=true 时 /customer 200、 /screen 302;尾号 2 与 % 被拒;2222 多客户掩码;9900 日常点、3321 通行证 1/1、6677 深渊 1/4 + 已到期订阅;明暗 1440 与 390 截图无对比度/溢出问题。
258 lines
8.0 KiB
Go
258 lines
8.0 KiB
Go
package store
|
|
|
|
import (
|
|
"database/sql"
|
|
"errors"
|
|
|
|
"daili/internal/domain"
|
|
)
|
|
|
|
// Checkin 每日服务打卡。
|
|
type Checkin struct {
|
|
ID int64
|
|
SubID int64
|
|
ServiceDate string
|
|
Status string
|
|
Note string
|
|
OperatorID int64
|
|
OperatorName string
|
|
CreatedAt string
|
|
UpdatedAt string
|
|
}
|
|
|
|
// SaveCheckin 打卡(同订阅同日覆盖),按次套餐完成时扣次。
|
|
func (db *DB) SaveCheckin(subID int64, date, status, note string, operatorID int64) error {
|
|
if status != "done" && status != "skipped" {
|
|
return errors.New("打卡状态不正确")
|
|
}
|
|
if _, err := domain.ParseDate(date); err != nil {
|
|
return errors.New("日期格式不正确")
|
|
}
|
|
return db.withTx(func(tx *sql.Tx) error {
|
|
s, err := scanSub(tx.QueryRow(subSelect+` WHERE s.id=?`, subID))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if s.Status == domain.StatusClosed {
|
|
return errors.New("订阅已结束,无法打卡")
|
|
}
|
|
var oldStatus string
|
|
err = tx.QueryRow(`SELECT status FROM checkins WHERE sub_id=? AND service_date=?`, subID, date).Scan(&oldStatus)
|
|
hasOld := err == nil
|
|
if err != nil && !errors.Is(err, sql.ErrNoRows) {
|
|
return err
|
|
}
|
|
|
|
delta := 0
|
|
if s.Abyss {
|
|
if s.CycleDays <= 0 {
|
|
return errors.New("该深渊套餐未设置周期天数")
|
|
}
|
|
d, _ := domain.ParseDate(date)
|
|
start := domain.ParseDateOr(s.StartDate, domain.Today())
|
|
idx := domain.CycleIndex(start, d, s.CycleDays)
|
|
if idx < 0 || idx >= s.TotalCount {
|
|
return errors.New("日期不在深渊周期内")
|
|
}
|
|
cycStart := domain.Date(domain.CycleStart(start, s.CycleDays, idx))
|
|
cycEnd := domain.Date(domain.CycleEnd(start, s.CycleDays, idx))
|
|
var otherDone int
|
|
if err := tx.QueryRow(`SELECT COUNT(*) FROM checkins WHERE sub_id=? AND status='done'
|
|
AND service_date BETWEEN ? AND ? AND service_date<>?`, subID, cycStart, cycEnd, date).Scan(&otherDone); err != nil {
|
|
return err
|
|
}
|
|
oldDone := hasOld && oldStatus == "done"
|
|
newDone := status == "done"
|
|
switch {
|
|
case newDone && !oldDone && otherDone == 0:
|
|
if s.UsedCount >= s.TotalCount {
|
|
return errors.New("所有周期已完成")
|
|
}
|
|
delta = 1
|
|
case !newDone && oldDone && otherDone == 0:
|
|
delta = -1
|
|
}
|
|
} else if s.Unit == domain.UnitCount {
|
|
oldDone := hasOld && oldStatus == "done"
|
|
newDone := status == "done"
|
|
switch {
|
|
case newDone && !oldDone:
|
|
if s.UsedCount+1 > s.TotalCount {
|
|
return errors.New("剩余次数不足,请先追加次数")
|
|
}
|
|
delta = 1
|
|
case !newDone && oldDone:
|
|
delta = -1
|
|
}
|
|
}
|
|
|
|
now := nowStamp()
|
|
if hasOld {
|
|
if _, err := tx.Exec(`UPDATE checkins SET status=?, note=?, operator_id=?, updated_at=? WHERE sub_id=? AND service_date=?`,
|
|
status, note, nullIfZero(operatorID), now, subID, date); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
if _, err := tx.Exec(`INSERT INTO checkins(sub_id,service_date,status,note,operator_id,created_at,updated_at)
|
|
VALUES(?,?,?,?,?,?,?)`, subID, date, status, note, nullIfZero(operatorID), now, now); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
if delta != 0 {
|
|
newUsed := s.UsedCount + delta
|
|
if newUsed < 0 {
|
|
newUsed = 0
|
|
}
|
|
if _, err := tx.Exec(`UPDATE subscriptions SET used_count=?, updated_at=? WHERE id=?`, newUsed, now, subID); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
}
|
|
|
|
// DeleteCheckin 撤销打卡(按次套餐返还次数),返回所属订阅 ID。
|
|
func (db *DB) DeleteCheckin(id, operatorID int64) (int64, error) {
|
|
var subID int64
|
|
var status string
|
|
var date string
|
|
err := db.withTx(func(tx *sql.Tx) error {
|
|
if err := tx.QueryRow(`SELECT sub_id,status,service_date FROM checkins WHERE id=?`, id).
|
|
Scan(&subID, &status, &date); err != nil {
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return ErrNotFound
|
|
}
|
|
return err
|
|
}
|
|
if _, err := tx.Exec(`DELETE FROM checkins WHERE id=?`, id); err != nil {
|
|
return err
|
|
}
|
|
s, err := scanSub(tx.QueryRow(subSelect+` WHERE s.id=?`, subID))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
delta := 0
|
|
if s.Unit == domain.UnitCount && status == "done" {
|
|
delta = -1
|
|
}
|
|
if s.Abyss && status == "done" && s.CycleDays > 0 {
|
|
d, _ := domain.ParseDate(date)
|
|
start := domain.ParseDateOr(s.StartDate, domain.Today())
|
|
idx := domain.CycleIndex(start, d, s.CycleDays)
|
|
if idx >= 0 {
|
|
cycStart := domain.Date(domain.CycleStart(start, s.CycleDays, idx))
|
|
cycEnd := domain.Date(domain.CycleEnd(start, s.CycleDays, idx))
|
|
var remain int
|
|
if err := tx.QueryRow(`SELECT COUNT(*) FROM checkins WHERE sub_id=? AND status='done'
|
|
AND service_date BETWEEN ? AND ?`, subID, cycStart, cycEnd).Scan(&remain); err != nil {
|
|
return err
|
|
}
|
|
if remain == 0 {
|
|
delta = -1
|
|
}
|
|
}
|
|
}
|
|
if delta != 0 {
|
|
newUsed := s.UsedCount + delta
|
|
if newUsed < 0 {
|
|
newUsed = 0
|
|
}
|
|
if _, err := tx.Exec(`UPDATE subscriptions SET used_count=?, updated_at=? WHERE id=?`,
|
|
newUsed, nowStamp(), subID); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
return subID, err
|
|
}
|
|
|
|
// CheckinsBetween 取区间内打卡,索引为 [subID][date]。
|
|
func (db *DB) CheckinsBetween(from, to string) (map[int64]map[string]Checkin, error) {
|
|
rows, err := db.sql.Query(`SELECT c.id,c.sub_id,c.service_date,c.status,c.note,IFNULL(c.operator_id,0),
|
|
IFNULL(u.display_name,''),c.created_at,c.updated_at
|
|
FROM checkins c LEFT JOIN users u ON u.id=c.operator_id
|
|
WHERE c.service_date BETWEEN ? AND ?`, from, to)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return scanCheckinMap(rows)
|
|
}
|
|
|
|
// CheckinsForSubs 只取指定订阅在区间内的打卡,避免客户自助页把全部客户的打卡读进内存。
|
|
func (db *DB) CheckinsForSubs(ids []int64, from, to string) (map[int64]map[string]Checkin, error) {
|
|
out := map[int64]map[string]Checkin{}
|
|
if len(ids) == 0 {
|
|
return out, nil
|
|
}
|
|
args := make([]any, 0, len(ids)+2)
|
|
for _, id := range ids {
|
|
args = append(args, id)
|
|
}
|
|
args = append(args, from, to)
|
|
rows, err := db.sql.Query(`SELECT c.id,c.sub_id,c.service_date,c.status,c.note,IFNULL(c.operator_id,0),
|
|
IFNULL(u.display_name,''),c.created_at,c.updated_at
|
|
FROM checkins c LEFT JOIN users u ON u.id=c.operator_id
|
|
WHERE c.sub_id IN (`+placeholders(len(ids))+`) AND c.service_date BETWEEN ? AND ?`, args...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return scanCheckinMap(rows)
|
|
}
|
|
|
|
func scanCheckinMap(rows *sql.Rows) (map[int64]map[string]Checkin, error) {
|
|
out := map[int64]map[string]Checkin{}
|
|
defer rows.Close()
|
|
for rows.Next() {
|
|
var c Checkin
|
|
if err := rows.Scan(&c.ID, &c.SubID, &c.ServiceDate, &c.Status, &c.Note, &c.OperatorID,
|
|
&c.OperatorName, &c.CreatedAt, &c.UpdatedAt); err != nil {
|
|
return nil, err
|
|
}
|
|
if out[c.SubID] == nil {
|
|
out[c.SubID] = map[string]Checkin{}
|
|
}
|
|
out[c.SubID][c.ServiceDate] = c
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
// CheckinsForSub 某订阅的打卡历史。
|
|
func (db *DB) CheckinsForSub(subID int64, limit int) ([]Checkin, error) {
|
|
rows, err := db.sql.Query(`SELECT c.id,c.sub_id,c.service_date,c.status,c.note,IFNULL(c.operator_id,0),
|
|
IFNULL(u.display_name,''),c.created_at,c.updated_at
|
|
FROM checkins c LEFT JOIN users u ON u.id=c.operator_id
|
|
WHERE c.sub_id=? ORDER BY c.service_date DESC LIMIT ?`, subID, limit)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer rows.Close()
|
|
out := []Checkin{}
|
|
for rows.Next() {
|
|
var c Checkin
|
|
if err := rows.Scan(&c.ID, &c.SubID, &c.ServiceDate, &c.Status, &c.Note, &c.OperatorID,
|
|
&c.OperatorName, &c.CreatedAt, &c.UpdatedAt); err != nil {
|
|
return nil, err
|
|
}
|
|
out = append(out, c)
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
// CheckinFor 取某订阅某天的打卡。
|
|
func (db *DB) CheckinFor(subID int64, date string) (*Checkin, error) {
|
|
var c Checkin
|
|
err := db.sql.QueryRow(`SELECT c.id,c.sub_id,c.service_date,c.status,c.note,IFNULL(c.operator_id,0),
|
|
IFNULL(u.display_name,''),c.created_at,c.updated_at
|
|
FROM checkins c LEFT JOIN users u ON u.id=c.operator_id
|
|
WHERE c.sub_id=? AND c.service_date=?`, subID, date).
|
|
Scan(&c.ID, &c.SubID, &c.ServiceDate, &c.Status, &c.Note, &c.OperatorID, &c.OperatorName, &c.CreatedAt, &c.UpdatedAt)
|
|
if err != nil {
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return nil, ErrNotFound
|
|
}
|
|
return nil, err
|
|
}
|
|
return &c, nil
|
|
}
|