tb-order-sync 0.3.1 → 0.4.1

package/services/daemon_service.py

@@ -22,6 +22,8 @@ logger = get_logger(__name__)
 _PID_FILENAME = "scheduler.pid"
 _META_FILENAME = "scheduler.meta.json"
 _LOG_FILENAME = "scheduler.console.log"
+_AUTOSTART_LABEL = "com.tb-order-sync.scheduler"
+_WINDOWS_TASK_NAME = "TBOrderSyncScheduler"
 _WINDOWS_PROCESS_TERMINATE = 0x0001
 _WINDOWS_QUERY_LIMITED_INFORMATION = 0x1000
 _WINDOWS_STILL_ACTIVE = 259
@@ -41,6 +43,15 @@ class DaemonStatus:
     stale: bool = False
 
 
+@dataclass(slots=True)
+class AutostartStatus:
+    """Current login-start status."""
+
+    enabled: bool
+    message: str
+    target: str
+
+
 class DaemonService:
     """Manage a single detached scheduler process."""
 
@@ -225,11 +236,134 @@ class DaemonService:
         with self._log_path.open("r", encoding="utf-8", errors="replace") as handle:
             return "".join(deque(handle, maxlen=max(1, lines)))
 
+    def autostart_status(self) -> AutostartStatus:
+        """Return whether login-start is enabled for the current user."""
+        if os.name == "nt":
+            try:
+                result = subprocess.run(
+                    ["schtasks", "/Query", "/TN", _WINDOWS_TASK_NAME],
+                    capture_output=True,
+                    text=True,
+                )
+                enabled = result.returncode == 0
+                return AutostartStatus(
+                    enabled=enabled,
+                    message="已启用登录自启" if enabled else "未启用登录自启",
+                    target=_WINDOWS_TASK_NAME,
+                )
+            except FileNotFoundError:
+                return AutostartStatus(False, "系统未找到 schtasks，无法检查登录自启。", _WINDOWS_TASK_NAME)
+
+        plist_path = self._launch_agent_path()
+        enabled = plist_path.exists()
+        return AutostartStatus(
+            enabled=enabled,
+            message="已启用登录自启" if enabled else "未启用登录自启",
+            target=str(plist_path),
+        )
+
+    def enable_autostart(self) -> AutostartStatus:
+        """Enable login-start for the current user."""
+        if os.name == "nt":
+            try:
+                command = self._autostart_command_line()
+                result = subprocess.run(
+                    [
+                        "schtasks",
+                        "/Create",
+                        "/F",
+                        "/SC",
+                        "ONLOGON",
+                        "/RL",
+                        "LIMITED",
+                        "/TN",
+                        _WINDOWS_TASK_NAME,
+                        "/TR",
+                        command,
+                    ],
+                    capture_output=True,
+                    text=True,
+                )
+                if result.returncode != 0:
+                    msg = (result.stderr or result.stdout or "未知错误").strip()
+                    return AutostartStatus(False, f"启用登录自启失败: {msg}", _WINDOWS_TASK_NAME)
+                return AutostartStatus(True, "已启用登录自启（Windows 任务计划）", _WINDOWS_TASK_NAME)
+            except FileNotFoundError:
+                return AutostartStatus(False, "系统未找到 schtasks，无法启用登录自启。", _WINDOWS_TASK_NAME)
+
+        plist_path = self._launch_agent_path()
+        plist_path.parent.mkdir(parents=True, exist_ok=True)
+        plist_path.write_text(self._launch_agent_plist(), encoding="utf-8")
+        try:
+            subprocess.run(["launchctl", "unload", str(plist_path)], capture_output=True, text=True)
+            result = subprocess.run(["launchctl", "load", str(plist_path)], capture_output=True, text=True)
+            if result.returncode != 0:
+                msg = (result.stderr or result.stdout or "未知错误").strip()
+                return AutostartStatus(False, f"启用登录自启失败: {msg}", str(plist_path))
+            return AutostartStatus(True, "已启用登录自启（macOS LaunchAgent）", str(plist_path))
+        except FileNotFoundError:
+            return AutostartStatus(False, "系统未找到 launchctl，无法启用登录自启。", str(plist_path))
+
+    def disable_autostart(self) -> AutostartStatus:
+        """Disable login-start for the current user."""
+        if os.name == "nt":
+            try:
+                result = subprocess.run(
+                    ["schtasks", "/Delete", "/F", "/TN", _WINDOWS_TASK_NAME],
+                    capture_output=True,
+                    text=True,
+                )
+                if result.returncode != 0:
+                    msg = (result.stderr or result.stdout or "任务不存在").strip()
+                    return AutostartStatus(False, f"停用登录自启失败: {msg}", _WINDOWS_TASK_NAME)
+                return AutostartStatus(False, "已停用登录自启（Windows 任务计划）", _WINDOWS_TASK_NAME)
+            except FileNotFoundError:
+                return AutostartStatus(False, "系统未找到 schtasks，无法停用登录自启。", _WINDOWS_TASK_NAME)
+
+        plist_path = self._launch_agent_path()
+        if plist_path.exists():
+            try:
+                subprocess.run(["launchctl", "unload", str(plist_path)], capture_output=True, text=True)
+            except FileNotFoundError:
+                return AutostartStatus(False, "系统未找到 launchctl，无法停用登录自启。", str(plist_path))
+            plist_path.unlink(missing_ok=True)
+        return AutostartStatus(False, "已停用登录自启（macOS LaunchAgent）", str(plist_path))
+
     def _build_spawn_command(self) -> list[str]:
         if getattr(sys, "frozen", False):
             return [str(Path(sys.executable).resolve()), "schedule"]
         return [sys.executable, str(PROJECT_ROOT / "main.py"), "schedule"]
 
+    def _autostart_command_line(self) -> str:
+        return subprocess.list2cmdline(self._build_spawn_command())
+
+    @staticmethod
+    def _launch_agent_path() -> Path:
+        return Path.home() / "Library" / "LaunchAgents" / f"{_AUTOSTART_LABEL}.plist"
+
+    def _launch_agent_plist(self) -> str:
+        command = self._build_spawn_command()
+        args = "\n".join(f"      <string>{arg}</string>" for arg in command)
+        return (
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+            "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" "
+            "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
+            "<plist version=\"1.0\">\n"
+            "<dict>\n"
+            f"  <key>Label</key>\n  <string>{_AUTOSTART_LABEL}</string>\n"
+            "  <key>ProgramArguments</key>\n"
+            "  <array>\n"
+            f"{args}\n"
+            "  </array>\n"
+            f"  <key>WorkingDirectory</key>\n  <string>{PROJECT_ROOT}</string>\n"
+            "  <key>RunAtLoad</key>\n  <true/>\n"
+            "  <key>KeepAlive</key>\n  <false/>\n"
+            f"  <key>StandardOutPath</key>\n  <string>{self._log_path}</string>\n"
+            f"  <key>StandardErrorPath</key>\n  <string>{self._log_path}</string>\n"
+            "</dict>\n"
+            "</plist>\n"
+        )
+
     def _read_pid(self) -> int | None:
         if not self._pid_path.exists():
             return None

package/services/gross_profit_service.py

@@ -145,7 +145,10 @@ class GrossProfitService:
             e = parse_number(rec.freight)
             f = parse_number(rec.customer_quote)
 
-            if any(v is None for v in (c, d, e, f)):
+            if self._all_cost_fields_blank(rec):
+                # Treat rows with empty C/D/E as unused rows and keep G blank.
+                new_val = ""
+            elif any(v is None for v in (c, d, e, f)):
                 # Data error
                 new_val = self._settings.data_error_text
                 errors += 1
@@ -200,3 +203,14 @@ class GrossProfitService:
     def _safe_get_str(row: list[Any], idx: int) -> Optional[str]:
         val = row[idx] if idx < len(row) else None
         return str(val) if val is not None else None
+
+    @staticmethod
+    def _is_blank(value: Optional[str]) -> bool:
+        return value is None or value.strip() == ""
+
+    def _all_cost_fields_blank(self, rec: OrderRecord) -> bool:
+        return (
+            self._is_blank(rec.product_price)
+            and self._is_blank(rec.packaging_price)
+            and self._is_blank(rec.freight)
+        )

package/services/refund_match_service.py

@@ -3,19 +3,21 @@
 Business rules:
   - Read B table column A (order numbers) to build refund set
   - Scan A table column H (order numbers)
-  - If A row's order_no is in refund set → write "进入退款流程" to A table I column
+  - If A row's order_no is in refund set → write "已退款" to A table I column
   - If not in refund set → clear I column
-  - Optional: set/clear row background color
+  - Optional: set/clear row-level highlight style
 """
 
 from __future__ import annotations
 
 from datetime import datetime
+import time
 from typing import Any, Optional
 
 from config.mappings import ColumnMapping, get_column_mapping
 from config.settings import Settings, SyncMode, get_settings
 from connectors.base import BaseSheetConnector, CellUpdate
+from models.state_models import SyncState
 from models.task_models import TaskName, TaskResult
 from services.state_service import StateService
 from utils.diff import row_fingerprint, set_hash
@@ -24,7 +26,7 @@ from utils.parser import normalize_order_no
 
 logger = get_logger(__name__)
 
-# Background colors for optional style update
+# Text highlight colors for optional style update
 _BG_RED = "#FF4D4F"
 _BG_DEFAULT = None  # None means reset / no color
 
@@ -66,9 +68,14 @@ class RefundMatchService:
             # 2. Read A table
             a_rows = self._read_a_table()
             result.rows_read = len(a_rows)
-
-            # 3. Incremental short-circuit: if refund set unchanged and mode=incremental
-            if mode == SyncMode.INCREMENTAL and new_refund_hash == state.b_table_refund_hash:
+            a_scan_hash = self._build_a_scan_hash(a_rows)
+
+            # 3. Incremental short-circuit: only skip when both B refunds and A scan are unchanged
+            if (
+                mode == SyncMode.INCREMENTAL
+                and new_refund_hash == state.b_table_refund_hash
+                and a_scan_hash == state.a_table_refund_scan_hash
+            ):
                 logger.info("Refund set unchanged, skipping (incremental mode)")
                 result.finish()
                 return result
@@ -91,6 +98,7 @@ class RefundMatchService:
 
                 state.b_table_refund_hash = new_refund_hash
                 state.b_table_refund_set = sorted(refund_set)
+                state.a_table_refund_scan_hash = self._build_desired_scan_hash(a_rows, refund_set)
                 state.last_run_at = datetime.now()
                 self._state_svc.save(state)
             else:
@@ -132,6 +140,29 @@ class RefundMatchService:
         )
         return rows[1:] if rows else []
 
+    def _build_a_scan_hash(self, a_rows: list[list[Any]]) -> str:
+        m = self._map
+        row_hashes = []
+        for idx, row in enumerate(a_rows):
+            order_no = normalize_order_no(row[m.a_order_no] if m.a_order_no < len(row) else None)
+            current_status = (
+                str(row[m.a_refund_status]).strip()
+                if m.a_refund_status < len(row) and row[m.a_refund_status] is not None
+                else ""
+            )
+            row_hashes.append(row_fingerprint([idx, order_no, current_status]))
+        return row_fingerprint(row_hashes)
+
+    def _build_desired_scan_hash(self, a_rows: list[list[Any]], refund_set: set[str]) -> str:
+        m = self._map
+        refund_text = self._settings.refund_status_text
+        row_hashes = []
+        for idx, row in enumerate(a_rows):
+            order_no = normalize_order_no(row[m.a_order_no] if m.a_order_no < len(row) else None)
+            desired = refund_text if order_no and order_no in refund_set else ""
+            row_hashes.append(row_fingerprint([idx, order_no, desired]))
+        return row_fingerprint(row_hashes)
+
     def _match(
         self,
         a_rows: list[list[Any]],
@@ -151,12 +182,17 @@ class RefundMatchService:
 
         for idx, row in enumerate(a_rows):
             row_num = idx + 1  # 1-based (0 is header)
+            current_status = str(row[m.a_refund_status]).strip() if m.a_refund_status < len(row) and row[m.a_refund_status] is not None else ""
             order_no = normalize_order_no(row[m.a_order_no] if m.a_order_no < len(row) else None)
 
             if not order_no:
+                if current_status:
+                    updates.append(CellUpdate(row=row_num, col=m.a_refund_status, value=""))
+                    style_ops.append((row_num, _BG_DEFAULT))
+                    changed += 1
+                    logger.info("Row %d: 单号为空，清除退款标记", row_num)
                 continue
 
-            current_status = str(row[m.a_refund_status]).strip() if m.a_refund_status < len(row) and row[m.a_refund_status] is not None else ""
             is_refund = order_no in refund_set
 
             if is_refund:
@@ -184,7 +220,9 @@ class RefundMatchService:
         return updates, style_ops, changed
 
     def _apply_styles(self, ops: list[tuple[int, Optional[str]]]) -> None:
-        for row_idx, color in ops:
+        failures: list[str] = []
+        total = len(ops)
+        for index, (row_idx, color) in enumerate(ops):
             try:
                 self._conn.update_row_style(
                     self._settings.tencent_a_file_id,
@@ -192,5 +230,10 @@ class RefundMatchService:
                     row_idx,
                     bg_color=color,
                 )
+                if index + 1 < total:
+                    time.sleep(0.2)
             except Exception as exc:
-                logger.warning("Failed to update style for row %d: %s", row_idx, exc)
+                failures.append(f"row={row_idx} error={exc}")
+
+        if failures:
+            raise RuntimeError("Style update failed: " + "; ".join(failures))

package/services/scheduler_service.py

@@ -11,6 +11,7 @@ from apscheduler.triggers.interval import IntervalTrigger
 
 from config.settings import Settings, SyncMode, get_settings
 from connectors.base import BaseSheetConnector
+from models.task_models import RunSummary
 from services.gross_profit_service import GrossProfitService
 from services.refund_match_service import RefundMatchService
 from services.state_service import StateService
@@ -39,8 +40,32 @@ class SchedulerService:
     def _run_all(self) -> None:
         """Execute all tasks in sequence."""
         logger.info("--- Scheduled run: all tasks ---")
-        self._gp_svc.run()
-        self._rm_svc.run()
+        gp_result = self._gp_svc.run()
+        rm_result = self._rm_svc.run()
+        try:
+            self._state_svc.save_last_run(self._build_summary([gp_result, rm_result], trigger="scheduled"))
+        except Exception as exc:
+            logger.warning("Failed to save scheduled run summary: %s", exc)
+
+    @staticmethod
+    def _build_summary(results, *, trigger: str) -> RunSummary:
+        finished_values = [item.finished_at for item in results if item.finished_at is not None]
+        success = all(item.success for item in results)
+        message = None
+        if not success:
+            errors = [f"{item.task_name.value}: {item.error_message}" for item in results if item.error_message]
+            message = " | ".join(errors) if errors else "存在任务失败，请检查后台日志。"
+        return RunSummary(
+            trigger=trigger,
+            success=success,
+            finished_at=max(finished_values) if finished_values else None,
+            task_count=len(results),
+            rows_read=sum(item.rows_read for item in results),
+            rows_changed=sum(item.rows_changed for item in results),
+            rows_error=sum(item.rows_error for item in results),
+            tasks=results,
+            message=message,
+        )
 
     def start(self) -> None:
         """Start the blocking scheduler with configured interval and jitter."""

package/services/state_service.py

@@ -5,12 +5,14 @@ from __future__ import annotations
 import json
 from pathlib import Path
 
+from models.task_models import RunSummary
 from models.state_models import SyncState
 from utils.logger import get_logger
 
 logger = get_logger(__name__)
 
 STATE_FILENAME = "sync_state.json"
+LAST_RUN_FILENAME = "last_run.json"
 
 
 class StateService:
@@ -20,6 +22,7 @@ class StateService:
         self._dir = Path(state_dir)
         self._dir.mkdir(parents=True, exist_ok=True)
         self._path = self._dir / STATE_FILENAME
+        self._last_run_path = self._dir / LAST_RUN_FILENAME
 
     def load(self, *, quiet: bool = False) -> SyncState:
         """Load state from disk. Returns fresh state if file missing / corrupt."""
@@ -48,3 +51,25 @@ class StateService:
         except Exception as exc:
             logger.error("Failed to save state: %s", exc)
             raise
+
+    def load_last_run(self, *, quiet: bool = False) -> RunSummary | None:
+        """Load the most recent execution summary if present."""
+        if not self._last_run_path.exists():
+            return None
+        try:
+            raw = self._last_run_path.read_text(encoding="utf-8")
+            return RunSummary.model_validate_json(raw)
+        except Exception as exc:
+            if not quiet:
+                logger.warning("Failed to load last run summary (%s): %s", exc, self._last_run_path)
+            return None
+
+    def save_last_run(self, summary: RunSummary) -> None:
+        """Persist the most recent execution summary."""
+        try:
+            raw = summary.model_dump_json(indent=2)
+            self._last_run_path.write_text(raw, encoding="utf-8")
+            logger.info("Saved last run summary to %s", self._last_run_path)
+        except Exception as exc:
+            logger.error("Failed to save last run summary: %s", exc)
+            raise

package/sync_service.spec

@@ -22,6 +22,8 @@ a = Analysis(
     datas=[
         # Bundle .env.example so first-run setup can use it as template
         (str(root / '.env.example'), '.'),
+        (str(root / '快速开始.txt'), '.'),
+        (str(root / '公司同事使用说明.md'), '.'),
     ],
     hiddenimports=[
         'config',

package/utils/retry.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from tenacity import (
     retry,
-    retry_if_exception_type,
+    retry_if_exception,
     stop_after_attempt,
     wait_exponential,
     before_sleep_log,
@@ -15,12 +15,30 @@ from utils.logger import get_logger
 logger = get_logger(__name__)
 
 
+def is_retryable_exception(exc: BaseException) -> bool:
+    """Return whether an exception is worth retrying."""
+    if isinstance(exc, (IOError, ConnectionError, TimeoutError)):
+        return True
+
+    if isinstance(exc, RuntimeError):
+        text = str(exc)
+        retry_markers = (
+            "code=400007",
+            "Requests Over Limit",
+            "HTTP 429",
+            "temporarily unavailable",
+        )
+        return any(marker in text for marker in retry_markers)
+
+    return False
+
+
 def default_retry(max_attempts: int = 3):
     """Decorator: retry with exponential backoff on transient errors."""
     return retry(
         stop=stop_after_attempt(max_attempts),
         wait=wait_exponential(multiplier=1, min=2, max=30),
-        retry=retry_if_exception_type((IOError, ConnectionError, TimeoutError)),
+        retry=retry_if_exception(is_retryable_exception),
         before_sleep=before_sleep_log(logger, log_level=20),  # INFO
         reraise=True,
     )

package//345/277/253/351/200/237/345/274/200/345/247/213.txt

@@ -0,0 +1,31 @@
+TB Order Sync 快速开始
+
+1. 双击启动
+- Windows: 启动.bat
+- macOS: 启动.command
+
+2. 首次运行
+- 如果本机还没配置，程序会自动进入 setup 配置向导
+- 配好腾讯文档信息后，建议先执行一次 `tb check`
+
+3. 常用命令
+- tb all              执行毛利计算 + 退款匹配
+- tb all --dry-run    仅演练，不写回
+- tb daemon start     后台持续运行
+- tb daemon status    查看后台状态
+- tb daemon logs      查看后台日志
+
+4. 登录自启
+- tb daemon autostart-enable
+- tb daemon autostart-status
+- tb daemon autostart-disable
+
+5. 日志与状态文件
+- state/scheduler.console.log
+- state/last_run.json
+- state/sync_state.json
+
+6. 常见问题
+- 缺配置：运行 tb setup
+- 想做启动自检：运行 tb check
+- 接口限流：稍等后重试，不要连续高频重复执行