refactor: 重构为可部署到服务器的模块化结构(v5.0.0)
- 拆包 fengxiang/:config/client/store/notify/monitor/admin/tts,统一入口 order_monitor.py - 服务器形态:Docker 常驻,Cookie 由本机登录后 POST 上传并热加载,不再依赖桌面弹窗 - 修复:首次启动重推历史订单、speak() 阻塞主循环、夜间 sleep 10h 不可中断 - 修复:test_push.py 残留 miservice 依赖(小爱已移除)、run_monitor.bat 写死盘符 - 配置化:webhook/shopId 移出源码(环境变量 > config.yaml > 默认值) - 可观测:滚动文件日志 + /healthz + Docker HEALTHCHECK + 告警冷却 - 飞书通道保留配置位,默认关闭(原 token 已失效 code=19001) - 新增 22 项单元测试(不联网)
This commit is contained in:
1 parent
ab6a2bb7ea
commit
4ee30399bf
30 files changed
+2410
-825
No files matched your search
+68
-69
@@ -1,91 +1,90 @@
|
||||
"""获取最新一条订单并推送到企业微信群"""
|
||||
"""手动推送最新一单(用于验证通道 / 补发)。
|
||||
|
||||
python push_latest_order.py # 拉最新一单,推送到已配置通道
|
||||
python push_latest_order.py --dry # 只打印不推送
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import datetime
|
||||
import requests
|
||||
import json
|
||||
import logging
|
||||
import sys
|
||||
|
||||
DATA_API = "https://fs.szfx.com/saasmerchant/pcweb/order/quickpayorder/list"
|
||||
SHOP_ID = "20434543575189"
|
||||
WEBHOOK_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=644ab6d9-3b66-4166-88e9-5a8a89e3731d"
|
||||
from fengxiang.client import FengxiangClient, FengxiangError
|
||||
from fengxiang.config import load_config
|
||||
from fengxiang.logger import setup_logging
|
||||
from fengxiang.notify import Dispatcher, build_channels
|
||||
|
||||
STATUS_MAP = {1: "已完成", 3: "已退款", 4: "退款中", 5: "已关闭"}
|
||||
STATUS_MAP = {1: "已完成", 2: "待支付", 3: "已退款", 4: "退款中", 5: "已关闭"}
|
||||
|
||||
|
||||
def fmt_ts(ts):
|
||||
return datetime.datetime.fromtimestamp(ts).strftime("%Y-%m-%d %H:%M:%S") if ts else "-"
|
||||
def fmt_ts(ts) -> str:
|
||||
try:
|
||||
return datetime.datetime.fromtimestamp(int(ts)).strftime("%Y-%m-%d %H:%M:%S")
|
||||
except (TypeError, ValueError, OSError):
|
||||
return "-"
|
||||
|
||||
|
||||
def fmt_money(cents):
|
||||
return f"{cents / 100:.2f}元" if cents else "0.00元"
|
||||
def fmt_money(cents) -> str:
|
||||
try:
|
||||
return f"{int(cents) / 100:.2f}元"
|
||||
except (TypeError, ValueError):
|
||||
return "0.00元"
|
||||
|
||||
|
||||
def load_cookies():
|
||||
with open("cookies.json", "r", encoding="utf-8") as f:
|
||||
return json.load(f)
|
||||
|
||||
|
||||
def fetch_latest_order():
|
||||
cookies = load_cookies()
|
||||
headers = {
|
||||
"Content-Type": "application/json",
|
||||
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36",
|
||||
"Referer": "https://fs.szfx.com/MMS",
|
||||
"Origin": "https://fs.szfx.com",
|
||||
}
|
||||
payload = {"shopId": SHOP_ID, "page": 1, "pageSize": 1}
|
||||
resp = requests.post(DATA_API, json=payload, headers=headers, cookies=cookies, timeout=30)
|
||||
data = resp.json()
|
||||
if data.get("errno") != 0:
|
||||
print(f"请求失败: {data}")
|
||||
return None
|
||||
return data["data"]["list"][0]
|
||||
|
||||
|
||||
def format_order(order):
|
||||
status = STATUS_MAP.get(order["status"], str(order["status"]))
|
||||
def format_order(o: dict) -> str:
|
||||
return (
|
||||
f"【新订单通知】\n"
|
||||
f"订单号:{order['orderId']}\n"
|
||||
f"店铺:{order['shopName']}\n"
|
||||
f"城市:{order['city']}\n"
|
||||
f"大区:{order['largeAreaName']}\n"
|
||||
f"企业:{order['companyName']}\n"
|
||||
f"用餐地点:{order['workplaceName']}\n"
|
||||
f"下单时间:{fmt_ts(order['createTime'])}\n"
|
||||
f"支付时间:{fmt_ts(order['payTime'])}\n"
|
||||
f"完成时间:{fmt_ts(order['finishTime'])}\n"
|
||||
f"订单金额:{fmt_money(order['allPrice'])}\n"
|
||||
f"实付金额:{fmt_money(order['amountPayable'])}\n"
|
||||
f"支付方式:{order['payTypeName']}\n"
|
||||
f"订单来源:{order['orderSourceName']}\n"
|
||||
f"状态:{status}"
|
||||
"【丰享订单详情】\n"
|
||||
f"订单号:{o.get('orderId', '-')}\n"
|
||||
f"店铺:{o.get('shopName', '-')}\n"
|
||||
f"城市:{o.get('city', '-')} / {o.get('largeAreaName', '-')}\n"
|
||||
f"企业:{o.get('companyName', '-')}\n"
|
||||
f"用餐地点:{o.get('workplaceName', '-')}\n"
|
||||
f"下单时间:{fmt_ts(o.get('createTime'))}\n"
|
||||
f"支付时间:{fmt_ts(o.get('payTime'))}\n"
|
||||
f"订单金额:{fmt_money(o.get('allPrice'))}\n"
|
||||
f"实付金额:{fmt_money(o.get('amountPayable'))}\n"
|
||||
f"支付方式:{o.get('payTypeName', '-')}\n"
|
||||
f"状态:{STATUS_MAP.get(o.get('status'), str(o.get('status', '-')))}\n"
|
||||
)
|
||||
|
||||
|
||||
def send_to_wecom(text):
|
||||
payload = {
|
||||
"msgtype": "text",
|
||||
"text": {"content": text}
|
||||
}
|
||||
resp = requests.post(WEBHOOK_URL, json=payload, timeout=10)
|
||||
result = resp.json()
|
||||
if result.get("errcode") == 0:
|
||||
print("推送成功!")
|
||||
else:
|
||||
print(f"推送失败: {result}")
|
||||
return result
|
||||
def main(argv: list[str]) -> int:
|
||||
cfg = load_config()
|
||||
setup_logging(cfg.paths.logs, cfg.log.level, cfg.log.max_bytes, cfg.log.backup_count)
|
||||
logging.getLogger("fengxiang").setLevel(logging.WARNING)
|
||||
dry = "--dry" in argv
|
||||
|
||||
if not cfg.paths.cookies.exists():
|
||||
print(f"未找到 Cookie:{cfg.paths.cookies}", file=sys.stderr)
|
||||
return 1
|
||||
with open(cfg.paths.cookies, "r", encoding="utf-8") as f:
|
||||
cookies = json.load(f)
|
||||
|
||||
def main():
|
||||
order = fetch_latest_order()
|
||||
if not order:
|
||||
return
|
||||
client = FengxiangClient(cfg)
|
||||
client.set_cookies(cookies)
|
||||
try:
|
||||
orders = client.list_orders(page_size=1)
|
||||
except FengxiangError as exc:
|
||||
print(f"拉取失败:{exc}", file=sys.stderr)
|
||||
return 2
|
||||
if not orders:
|
||||
print("没有订单数据", file=sys.stderr)
|
||||
return 3
|
||||
|
||||
order = orders[0]
|
||||
msg = format_order(order)
|
||||
print(msg)
|
||||
print("\n--- 正在推送到企业微信群 ---\n")
|
||||
send_to_wecom(msg)
|
||||
if dry:
|
||||
print("[dry-run] 未推送")
|
||||
return 0
|
||||
|
||||
dispatcher = Dispatcher(build_channels(cfg), cfg.notify.alert_cooldown_sec)
|
||||
result = dispatcher.notify(msg)
|
||||
print(f"推送结果:{result}")
|
||||
return 0 if all(result.values()) or not result else 4
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
sys.exit(main(sys.argv[1:]))
|
||||
Reference in new issue
Block a user