trustbase-seller-backend 0.1.8 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trustbase-seller-backend",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "TrustBase Seller Backend (merchant edition) — 商品上链/订单/支付/质押 write API for TrustBase 保障链生态. 单卖家自托管形态: 签名 key 即卖家身份, 私钥不出门.",
   "main": "run-unified.js",
   "bin": {

package/routes/onboard.html

@@ -273,15 +273,25 @@ function renderProgress(s){
   document.getElementById('shop-desc').textContent=s.shop_admin_url
     ? ('后台账号: '+(s.shop_admin_user||'admin')+' (密码见安装时输出); 上架后商品自动进入可信目录')
     : '后台入口路径见安装器输出 (形如 tbXXXXXXXX.php); 上架后商品自动进入可信目录';
-  // 实名认证状态 (链上真状态 + 查询时间, 页面 15s 自动刷新)
+  // 实名认证状态 — 三态区分 (2026-09-25 实测反馈修复):
+  //   进件完成 (applyment.done) → 打勾, 藏表单
+  //   链上 KYC 过但进件未完成 → 不打勾, 文案说清两件事, 表单保持可填
+  //   其余 → 引导提交
   var vs=s.verification||{submitted:false,status:'none'};
   var qat=vs.queried_at?(' · 查询于 '+new Date(vs.queried_at*1000).toLocaleTimeString()):'';
   var chainTxt=vs.raw_status?('链上状态 '+vs.raw_status):'链上状态未知';
   var vStep=document.getElementById('st-verification');
-  if(vs.status && vs.status.indexOf('approved')>=0){
+  var ap=s.applyment||null;
+  var apDone=!!(ap&&ap.done);
+  var kycOk=!!(vs.status && vs.status.indexOf('approved')>=0);
+  var applyForm=document.getElementById('apply-form');
+  if(apDone){
     vStep.className='step done'; vStep.querySelector('.mark').textContent='✅';
     document.getElementById('btn-verify').style.display='none';
-    document.getElementById('verify-desc').textContent='认证已通过 (链上已 APPROVED), 引导金自动发放'+qat;
+    if(applyForm) applyForm.style.display='none';
+    document.getElementById('verify-desc').textContent='微信收款进件已完成 (sub_mchid='+(ap.sub_mchid||'')+'), 收款通道就绪'+qat;
+  } else if(kycOk){
+    document.getElementById('verify-desc').textContent='链上身份认证已过 ✅ · 微信收款进件未完成 — 请填写下方进件资料, 微信审核通过后收款通道才开通'+qat;
   } else if(vs.submitted){
     document.getElementById('verify-desc').textContent='实名已提交, 等待服务商审核 ('+chainTxt+qat+')';
   } else {

package/routes/onboard.js

@@ -149,6 +149,17 @@ function createOnboardRouter(deps) {
                     }
                 } catch (_) { /* 链不可达: 保持默认 */ }
             }
+            // 进件状态 (2026-09-25 实测反馈修复): 第③步 done 以「微信特约商户进件完成」为准 —
+            // 链上 KYC APPROVED 只是身份认证辅助标记 (历史测试可遗留), 两者混用会让
+            // "链上已认证但进件没做"的商户看到"认证已通过"的误导文案。
+            let applyment = null;
+            try {
+                applyment = db.prepare("SELECT business_code, applyment_id, status, sub_mchid, sign_url FROM onboard_applyments ORDER BY created_at DESC LIMIT 1").get() || null;
+            } catch (_) { applyment = null; }
+            const applymentDone = !!(applyment && (
+                (applyment.sub_mchid && !String(applyment.sub_mchid).startsWith("pending-"))
+                || /finished/i.test(String(applyment.status || ""))
+            ));
             // 签名通道现状: 页面/客服诊断用 (只回路径与模式, 绝不回助记词/私钥)
             let signMode = null;
             try { signMode = chainWrites.signModeInfo(); } catch (_) { signMode = null; }
@@ -157,9 +168,15 @@ function createOnboardRouter(deps) {
                 identity_created: !!tbAddress,
                 tb_address: tbAddress,
                 shop_name: shop ? shop.merchant_shortname : null,
-                sub_mchid: shop ? shop.sub_mchid : "none",
+                sub_mchid: (applyment && applyment.sub_mchid) || (shop ? shop.sub_mchid : "none"),
                 verification,
                 grant,
+                applyment: applyment ? {
+                    business_code: applyment.business_code,
+                    status: applyment.status,
+                    sub_mchid: applyment.sub_mchid || null,
+                    done: applymentDone,
+                } : null,
                 // 签名通道 + 目录 (页面显示, 客服排障; 2026-09-22 .215 签名故障暴露)
                 sign_mode: signMode ? signMode.effective : null,
                 sign_mode_configured: signMode ? signMode.configured : null,
@@ -172,7 +189,7 @@ function createOnboardRouter(deps) {
                 steps: [
                     { key: "identity", label: "卖家身份", done: !!tbAddress },
                     { key: "backup", label: "备份纸密钥", done: null },
-                    { key: "verification", label: "微信收款认证", done: /approved/i.test(verification.status) },
+                    { key: "verification", label: "微信收款认证", done: applymentDone, kyc_approved: /approved/i.test(verification.status) },
                     { key: "grant", label: "引导金 100 TCT", done: grant.status === "issued" },
                     { key: "listing", label: "上架商品", done: false },
                 ],