正式环境:爱发电收款全自动(精确反查 + 定时对账 + 买家自查),修复付款区拿不到专链;支付宝预留待开通;维护页开关
- 修线上 bug:付款配置真实键名是 afdian / afdian_uid,后端只认 payplatform* → 页面拿不到专链,
付款区只显示「付款方式找金钻要」。现在两种键名都认、都返回(含价格档位)。
- 回调反查先按 out_trade_no 精确查,查不到再翻页;去掉「金额唯一匹配」猜单。
- 新增定时对账(每分钟,有待付款单才调接口):回调丢了也自动激活;与回调走同一套处理(账本去重 / 金额闸门 / 激活)。
- 买家点「我已经付好了」先当场对账,付过就直接排队;没付照旧登记待确认。
- 付款信息带 alipay:{on:false, note:待开通},下单页显示灰色「支付宝扫码 · 待开通」,不接任何通道。
- 一起上线 c8f3ae4(进下单页闪黑修复)。
- 新测试《收款对账测试》14 条;回执复现 33、数据库 38、内容后台 86 全过。
- nginx 维护页开关写进部署文档(只拦页面,接口 / 回调 / 同域应用放行)。
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+101
-19
@@ -42,6 +42,14 @@ def payplatform_creds():
|
||||
return "", ""
|
||||
|
||||
|
||||
def _pp_key(d, suffix=""):
|
||||
"""读付款配置:真实配置文件里的键是 afdian / afdian_uid,代码里叫 payplatform / payplatform_uid。
|
||||
⚠️ 2026-10-07 实测:正式站只认后者 → 读到空 → 下单页拿不到专链,付款区只剩「付款方式找金钻要」。两种都认。"""
|
||||
if not isinstance(d, dict):
|
||||
return ""
|
||||
return str(d.get("afdian" + suffix) or d.get("payplatform" + suffix) or "").strip()
|
||||
|
||||
|
||||
def payplatform_api(path, params=None):
|
||||
"""调爱发电开放接口。签名算法:md5(token + 'params' + params + 'ts' + ts + 'user_id' + user_id)。"""
|
||||
uid, tok = payplatform_creds()
|
||||
@@ -74,7 +82,13 @@ def _hook_unverified(oid_af, order, why, ip):
|
||||
|
||||
|
||||
def payplatform_find_order(out_trade_no, pages=3):
|
||||
"""按订单号反查(确认这笔真的存在、真的付款了)。返回订单 dict 或 None。"""
|
||||
"""按订单号反查(确认这笔真的存在、真的付款了)。返回订单 dict 或 None。
|
||||
2026-10-07:开放接口支持直接按 out_trade_no 查 —— 先精确查,查不到(接口延迟等)再翻页兜底。"""
|
||||
r = payplatform_api("query-order", {"out_trade_no": str(out_trade_no)})
|
||||
if r.get("ec") == 200:
|
||||
for o in ((r.get("data") or {}).get("list") or []):
|
||||
if str(o.get("out_trade_no")) == str(out_trade_no):
|
||||
return o
|
||||
for pg in range(1, pages + 1):
|
||||
r = payplatform_api("query-order", {"page": pg})
|
||||
if r.get("ec") != 200:
|
||||
@@ -635,10 +649,10 @@ def price_for(n_img, tiers=None):
|
||||
def payplatform_link_for(n_img):
|
||||
"""n 张图该跳哪个爱发电商品;这档没配就回落到总链接。"""
|
||||
t = (price_tiers().get("tiers") or {}).get(str(max(1, int(n_img or 1))))
|
||||
if isinstance(t, dict) and (t.get("payplatform") or "").strip():
|
||||
return t["payplatform"].strip()
|
||||
if isinstance(t, dict) and _pp_key(t):
|
||||
return _pp_key(t)
|
||||
d = jload(PAYINFO_FILE, {}) or {}
|
||||
return (d.get("payplatform") or "").strip()
|
||||
return _pp_key(d)
|
||||
TERMS_VERSION = "2026-10-04.1"
|
||||
|
||||
|
||||
@@ -652,6 +666,69 @@ def _recent(bucket, ip, win):
|
||||
return lst
|
||||
|
||||
|
||||
class _ReconcileCall:
|
||||
"""对账时借用回调处理逻辑(账本去重、金额闸门、激活、通知全一样)的「替身请求」。"""
|
||||
headers = {}
|
||||
client_address = ("reconcile", 0)
|
||||
|
||||
def __init__(self):
|
||||
self.out = None
|
||||
|
||||
def js(self, obj, code=200):
|
||||
self.out = obj
|
||||
|
||||
|
||||
RECONCILE_LAST = {"at": 0.0}
|
||||
|
||||
|
||||
def payplatform_reconcile(only_oid=None, pages=5):
|
||||
"""主动对账(2026-10-07):去爱发电拉最近的订单,凡是带回了**待付款网页单**订单号、而账本里还没有的,
|
||||
按回调同样的流程处理一遍(反查 → 金额闸门 → 激活)。返回激活了的订单号列表。
|
||||
- 定时线程每分钟跑一次(有待付款单才真的去调接口);
|
||||
- 买家点「我付好了」时只针对这一单立刻跑一次(only_oid)。"""
|
||||
pend = {m["oid"] for m in list_orders(("unpaid", "paid"))}
|
||||
if only_oid:
|
||||
pend &= {only_oid}
|
||||
if not pend:
|
||||
return []
|
||||
led = STORE.ledger_all()
|
||||
done = []
|
||||
for pg in range(1, pages + 1):
|
||||
r = payplatform_api("query-order", {"page": pg})
|
||||
if r.get("ec") != 200:
|
||||
break
|
||||
data = r.get("data") or {}
|
||||
for o in (data.get("list") or []):
|
||||
otn = str(o.get("out_trade_no") or "")
|
||||
if not otn or otn in led or int(o.get("status") or 0) != 2:
|
||||
continue
|
||||
coid = str(o.get("custom_order_id") or "").strip().upper()
|
||||
rm = re.sub(r"[^0-9A-Z]", "", str(o.get("remark") or "").upper())
|
||||
hit = coid if coid in pend else next((x for x in pend if x in rm), None)
|
||||
if not hit:
|
||||
continue
|
||||
call = _ReconcileCall()
|
||||
with HOOK_LOCK:
|
||||
H._payplatform_hook_locked(call, {"data": {"type": "order", "order": o}})
|
||||
m = read_meta(hit) or {}
|
||||
if m.get("state") not in ("unpaid", "paid"):
|
||||
done.append(hit)
|
||||
log("对账:爱发电订单 %s → 激活了网页单 %s" % (otn[-8:], hit))
|
||||
if pg >= int(data.get("total_page") or 1):
|
||||
break
|
||||
RECONCILE_LAST["at"] = time.time()
|
||||
return done
|
||||
|
||||
|
||||
def reconcile_loop():
|
||||
while True:
|
||||
time.sleep(60)
|
||||
try:
|
||||
payplatform_reconcile()
|
||||
except Exception as e:
|
||||
log("对账出错:%r" % e)
|
||||
|
||||
|
||||
def ip_of(handler):
|
||||
return (handler.headers.get("X-Real-IP") or handler.client_address[0] or "?").strip()
|
||||
|
||||
@@ -2345,7 +2422,6 @@ class H(BaseHTTPRequestHandler):
|
||||
# ===== 先看这笔付款是不是"网页单来付的"(金钻 2026-10-01 的状态机)=====
|
||||
# 线索优先级:⓪ 回调带回的订单号 custom_order_id(专链里塞的,金钻 2026-10-03 新加,最硬)
|
||||
# ① 留言里写了我方的兑换码(YS-XXXX-….)② 留言里写了订单号(YS7ZBZW6)
|
||||
# ③ 留言空着,但**只有一笔**待付款单的金额对得上(唯一才敢自动认,两笔就人工)
|
||||
rm_up = str(real.get("remark") or "").upper()
|
||||
target, how = None, ""
|
||||
# ⓪ 专链下单:前端把订单号写进 custom_order_id,爱发电下单后原样带回来。
|
||||
@@ -2365,14 +2441,8 @@ class H(BaseHTTPRequestHandler):
|
||||
h2 = re.search(r"YS[0-9A-Z]{6}", rm_up.replace("-", ""))
|
||||
if h2 and read_meta(h2.group(0)):
|
||||
target, how = h2.group(0), "留言里的订单号"
|
||||
if not target:
|
||||
try:
|
||||
amt = int(round(float(str(real.get("show_amount") or real.get("total_amount")))))
|
||||
except (TypeError, ValueError):
|
||||
amt = -1
|
||||
cands = [x for x in list_orders(("unpaid", "paid")) if int(x.get("amount") or 0) == amt]
|
||||
if len(cands) == 1:
|
||||
target, how = cands[0]["oid"], "唯一一笔金额对得上的待付款单"
|
||||
# 2026-10-07:去掉了「只有一笔待付款单金额对得上就自动认」—— 纯猜测,两笔同金额就会认错单。
|
||||
# 专链会带回订单号(custom_order_id),对不上的按「买卡密」处理或进人工,不再猜。
|
||||
if target:
|
||||
m_t = read_meta(target)
|
||||
# ⚠️ 金额闸门(金钻 2026-10-03 提的洞):留言里的凭证/订单号只能说明"这笔钱想付哪一单",
|
||||
@@ -2614,17 +2684,19 @@ class H(BaseHTTPRequestHandler):
|
||||
d = jload(PAYINFO_FILE, {})
|
||||
if not isinstance(d, dict):
|
||||
d = {}
|
||||
link, uid = _pp_key(d), _pp_key(d, "_uid")
|
||||
return self.js({"ok": True,
|
||||
"payplatform": (d.get("payplatform") or "").strip(),
|
||||
# 创作者 ID:前端用它拼「按本单金额生成的专链」
|
||||
# (pay-platform.example/order/create?user_id=…&custom_price=…&custom_order_id=…&remark=…)。
|
||||
# 没配就回落上面的固定商品链接 payplatform(兜底,金钻 2026-10-03)。
|
||||
"payplatform_uid": (d.get("payplatform_uid") or "").strip(),
|
||||
# 两种键名都给:下单页读 afdian / afdian_uid(2026-10-07 修:原来只给 payplatform*,页面拿不到专链)
|
||||
"afdian": link, "afdian_uid": uid,
|
||||
"payplatform": link, "payplatform_uid": uid,
|
||||
"qr_img": (d.get("qr_img") or "").strip(), # 服务器上的相对路径,比如 payme.png
|
||||
"note": (d.get("note") or "").strip(),
|
||||
# 支付宝当面付:审批还没过,只预留入口(页面显示灰色「待开通」),后端不接任何通道
|
||||
"alipay": {"on": False, "label": "支付宝扫码", "note": "待开通"},
|
||||
"price": PRICE_UNIT,
|
||||
# 价格档位表(金钻 2026-10-01):页面按买家选的张数取档位价 + 对应商品链接
|
||||
"tiers": price_tiers().get("tiers") or {},
|
||||
"tiers": {k: (dict(v, afdian=_pp_key(v), payplatform=_pp_key(v)) if isinstance(v, dict) else v)
|
||||
for k, v in (price_tiers().get("tiers") or {}).items()},
|
||||
"per": price_tiers().get("per") or PRICE_UNIT})
|
||||
|
||||
def redo(self):
|
||||
@@ -2818,6 +2890,15 @@ class H(BaseHTTPRequestHandler):
|
||||
m = read_meta(oid)
|
||||
if not m or not hmac.compare_digest(m.get("token", ""), tok):
|
||||
return self.err("not found", 404)
|
||||
# 2026-10-07:先当场去爱发电对一次账 —— 已经付了就直接激活,不用等人工
|
||||
if m.get("state") in ("unpaid", "paid"):
|
||||
try:
|
||||
if payplatform_reconcile(only_oid=oid):
|
||||
return self.js({"ok": True, "state": "waiting", "found": True,
|
||||
"msg": "查到你的付款了,已经开始排队出图。"})
|
||||
except Exception as e:
|
||||
log("买家自查对账出错:%r" % e)
|
||||
m = read_meta(oid) or m
|
||||
if m.get("state") == "paid":
|
||||
return self.js({"ok": True, "state": "paid", "at": m.get("paid_at")})
|
||||
if m.get("state") != "unpaid":
|
||||
@@ -3570,6 +3651,7 @@ def main():
|
||||
os.makedirs(d, exist_ok=True)
|
||||
srv = ThreadingHTTPServer((HOST, PORT), H)
|
||||
srv.daemon_threads = True
|
||||
threading.Thread(target=reconcile_loop, daemon=True).start() # 主动对账(回调丢了也能自动激活)
|
||||
log("ys-order 启动 %s:%d | 数据 %s | 保留 %dh" % (HOST, PORT, ROOT, KEEP_HOURS))
|
||||
srv.serve_forever()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user