trustbase-seller-backend 0.1.12 → 0.2.0

package/core/chain-signer.js

@@ -47,6 +47,8 @@ const CUSTOM_TYPE_URLS = [
     "/trustchain.economy.v1.MsgGrantCredits",
     // N13 (2026-09-23): trustcoin 账户自助注册 (上架/下单前置; signer=creator, 商户本人签)
     "/trustchain.trustcoin.v1.MsgRegisterAccount",
+    // N17 (2026-10): 引导金池自动回补 (oracle c5-glue stepPoolRefill, authority 签)
+    "/trustchain.reward.v1.MsgRewardPoolTransfer",
 ];
 
 let _root = null;
@@ -68,6 +70,8 @@ function protoRoot() {
         "trustchain/economy/v1/tx.proto",
         // N13 (2026-09-23): trustcoin 账户注册
         "trustchain/trustcoin/v1/tx.proto",
+        // N17 (2026-10): reward 池划转 (MsgRewardPoolTransfer)
+        "trustchain/reward/v1/tx.proto",
     ], { keepCase: true });
     _root = root;
     return root;
@@ -192,7 +196,12 @@ async function pollFinalTx(lcdUrl, txhash) {
     return null;
 }
 
-class SequenceMismatchErrorJs extends Error {}
+/** P4: sequence mismatch 统一抛 routes/chain-writes 的 SequenceMismatchError —
+ *  c5-glue/sp-notify/chain-writes 三处 "重查序号重试一次" 的 instanceof 判断对 JS 通道同样生效。
+ *  延迟 require 规避循环依赖 (chain-writes.js 顶部即 require 本模块, 加载期取不到其 class)。 */
+function newSequenceMismatchError(msg) {
+    return new (require("../routes/chain-writes").SequenceMismatchError)(msg);
+}
 
 /**
  * JS 直签 + 广播完整流程。入参/返回与 chain-writes.js 的 CLI 路径对齐:
@@ -201,7 +210,8 @@ class SequenceMismatchErrorJs extends Error {}
  *   account: {accountNumber, sequence} (字符串)
  * 返回 {txhash, code, raw_log} (code!=0 也返回, 由调用方判 502)
  * memo: 可选; 下单 (MsgCreateOrder) 走 "tb-auth:<sha256>" 意愿摘要, 其余写路径留空
- * 抛 SequenceMismatchErrorJs (message 含 "account sequence mismatch")
+ * 抛 chain-writes.SequenceMismatchError (message 含 "account sequence mismatch") — P4 统一后
+ *   调用方 instanceof chainWrites.SequenceMismatchError 的重试逻辑对 JS 通道同样生效
  * 抛 Error("tx_delivery_timeout: ...") 当 15s 未入块
  */
 async function jsSignAndBroadcast(c, messages, account, baseDir, memo) {
@@ -228,7 +238,7 @@ async function jsSignAndBroadcast(c, messages, account, baseDir, memo) {
     const txBytes = TxRaw.encode(txRaw).finish();
     const checkTx = await broadcastTxSync(c.rpcUrl, txBytes);
     if (/account sequence mismatch/i.test(checkTx.raw_log)) {
-        throw new SequenceMismatchErrorJs(`account sequence mismatch: ${checkTx.raw_log}`);
+        throw newSequenceMismatchError(`account sequence mismatch: ${checkTx.raw_log}`);
     }
     if (checkTx.code !== 0) {
         // CheckTx 拒绝 (码/ccodespace/log 原样回传, 语义同 CLI broadcast 的 code!=0)
@@ -237,7 +247,7 @@ async function jsSignAndBroadcast(c, messages, account, baseDir, memo) {
     const final = await pollFinalTx(c.lcdUrl, checkTx.txhash);
     if (final) {
         if (/account sequence mismatch/i.test(final.raw_log)) {
-            throw new SequenceMismatchErrorJs(`account sequence mismatch: ${final.raw_log}`);
+            throw newSequenceMismatchError(`account sequence mismatch: ${final.raw_log}`);
         }
         return final;
     }
@@ -254,5 +264,5 @@ module.exports = {
     jsSignerAddress,
     jsSignAndBroadcast,
     toEncodeObjects,
-    SequenceMismatchErrorJs,
+    newSequenceMismatchError,
 };

package/oracle/c5-glue.js

@@ -80,6 +80,9 @@ const SIGNER_FORBIDDEN_RE = /intended signer does not match|signature verificati
 // N14: settle 幂等 (已结算/状态已变/订单不存在 → 按完成处理, 不再重试)
 const SETTLE_DONE_RE = /already settled|not in confirmed status|order not found/i;
 
+// E6 P2: 链上 reason_kind+ref_id 幂等命中 (上轮 tx 实际已入块但本地未记 done, 如交付超时后重发被链拒)
+const GRANT_DUP_RE = /already granted|duplicate|grant already exists/i;
+
 function sha256Hex(s) {
     return crypto.createHash("sha256").update(String(s)).digest("hex");
 }
@@ -566,8 +569,21 @@ function createOracleGlue(deps) {
                 amount: String(g.amount),
                 reason_kind: reasonKind,
                 ref_id: g.refId,
-            }]);
+            }]).catch((e) => {
+                // sendTx 异常 (链抖动/超时): 留 pending 等下轮 retryPendingGrants 补发,
+                // 不上抛 — 避免中断本批后续 grant (此前异常会丢失同批剩余 grant 的台账行)
+                warn(`[oracle-glue] E6 发放异常 ${reasonKind}/${g.refId}: ${e.message} (留 pending 下轮重试)`);
+                return null;
+            });
+            if (!r) continue;
             if (r.code !== 0) {
+                if (GRANT_DUP_RE.test(r.raw_log)) {
+                    // 链上幂等命中: 该笔实际已发放 (本地没落 done), 按完成处理
+                    db.prepare("UPDATE oracle_credit_grants SET status='done', note=?, updated_at=? WHERE reason_kind=? AND ref_id=?")
+                        .run(`链上幂等命中: ${String(r.raw_log).slice(0, 160)}`, nowSec(), reasonKind, g.refId);
+                    log(`[oracle-glue] E6 ${reasonKind}/${g.refId} 链上已发放 (幂等命中), 按完成处理`);
+                    continue;
+                }
                 const status = MODULE_NOT_LIVE_RE.test(r.raw_log) ? "pending" : "failed";
                 db.prepare("UPDATE oracle_credit_grants SET status=?, note=?, updated_at=? WHERE reason_kind=? AND ref_id=?")
                     .run(status, `code=${r.code}: ${String(r.raw_log).slice(0, 200)}`, nowSec(), reasonKind, g.refId);
@@ -580,8 +596,49 @@ function createOracleGlue(deps) {
         }
     }
 
-    /** E6 一轮: 拉 CONFIRMED 事实 → 逐笔结算 */
+    /** P2: 存量 pending 行补发 (上轮 economy 未上线/sendTx 异常遗留 — 此前永不再试)。
+     *  每轮结算开头先扫台账重发; 链上 reason_kind+ref_id 幂等是第二道保险:
+     *  重复发放被链拒 (GRANT_DUP_RE) 按完成处理。返回本轮处理的 pending 行数。 */
+    async function retryPendingGrants(oracleAddr) {
+        const rows = db.prepare("SELECT * FROM oracle_credit_grants WHERE status='pending'").all();
+        for (const row of rows) {
+            let r;
+            try {
+                r = await sendTx([{
+                    "@type": "/trustchain.economy.v1.MsgGrantCredits",
+                    issuer: oracleAddr,
+                    recipient: row.recipient,
+                    amount: String(row.amount),
+                    reason_kind: row.reason_kind,
+                    ref_id: row.ref_id,
+                }]);
+            } catch (e) {
+                warn(`[oracle-glue] E6 pending 补发 ${row.reason_kind}/${row.ref_id} 异常: ${e.message} (留 pending 下轮重试)`);
+                continue;
+            }
+            if (r.code !== 0) {
+                if (GRANT_DUP_RE.test(r.raw_log)) {
+                    db.prepare("UPDATE oracle_credit_grants SET status='done', note=?, updated_at=? WHERE reason_kind=? AND ref_id=?")
+                        .run(`链上幂等命中: ${String(r.raw_log).slice(0, 160)}`, nowSec(), row.reason_kind, row.ref_id);
+                    log(`[oracle-glue] E6 pending 补发 ${row.reason_kind}/${row.ref_id} 链上已发放 (幂等命中), 按完成处理`);
+                } else if (!MODULE_NOT_LIVE_RE.test(r.raw_log)) {
+                    db.prepare("UPDATE oracle_credit_grants SET status='failed', note=?, updated_at=? WHERE reason_kind=? AND ref_id=?")
+                        .run(`补发 code=${r.code}: ${String(r.raw_log).slice(0, 200)}`, nowSec(), row.reason_kind, row.ref_id);
+                    warn(`[oracle-glue] E6 pending 补发失败 ${row.reason_kind}/${row.ref_id} code=${r.code}: ${String(r.raw_log).slice(0, 200)}`);
+                }
+                // 模块未上线 → 留 pending 下轮再试
+                continue;
+            }
+            db.prepare("UPDATE oracle_credit_grants SET status='done', txhash=?, updated_at=? WHERE reason_kind=? AND ref_id=?")
+                .run(r.txhash, nowSec(), row.reason_kind, row.ref_id);
+            log(`[oracle-glue] E6 pending 已补发 ${row.reason_kind}/${row.ref_id} → ${row.recipient} +${row.amount} (tx=${r.txhash})`);
+        }
+        return rows.length;
+    }
+
+    /** E6 一轮: 先补发存量 pending (P2) → 拉 CONFIRMED 事实 → 逐笔结算 */
     async function settleConfirmedFacts(oracleAddr) {
+        await retryPendingGrants(oracleAddr); // 不依赖链上 params, 先清存量
         const params = await getEconomyParams();
         if (!params) { warn("[oracle-glue] economy params 查询失败 (模块未上线?), 本轮 E6 跳过"); return; }
         const pj = await lcdGet("/oxiaom/trustchain/serviceprovider/v1/providers");
@@ -732,7 +789,7 @@ function createOracleGlue(deps) {
         await settleExpiredOrders(oracleAddr);
     }
 
-    return { tick, enqueueBootstrapGrant, settleConfirmedFacts, settleExpiredOrders, stepBootstrapGrant, getEconomyParams, monthlyUsed, resolveOrderParties, settleFact, grantFeegrant, grantFeegrantFor, findFeegrant, stepPoolRefill, refillEnabled, poolBalanceUtct, refillWindow };
+    return { tick, enqueueBootstrapGrant, settleConfirmedFacts, settleExpiredOrders, stepBootstrapGrant, getEconomyParams, monthlyUsed, resolveOrderParties, settleFact, retryPendingGrants, grantFeegrant, grantFeegrantFor, findFeegrant, stepPoolRefill, refillEnabled, poolBalanceUtct, refillWindow };
 }
 
 module.exports = { createOracleGlue, oracleCfg, sha256Hex, MODULE_NOT_LIVE_RE };

package/package.json

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

package/payments/wechat/profitsharing.js

@@ -49,6 +49,8 @@ async function wxCall(method, urlPath, bodyObj) {
             "Authorization": agentPay.wxSignAuth(method, urlPath, bodyStr, spOverride(c)),
             "Content-Type": "application/json",
             "Accept": "application/json",
+            // 微信 APIv3 拒 undici 默认 Accept-Language: * (2026-09-25 实测 PARAM_ERROR) — 与 agent-pay wxApiCall 对齐
+            "Accept-Language": "zh-CN",
             "User-Agent": "trustbase-seller-backend/1.0",
         },
         body: method === "GET" ? undefined : bodyStr,

package/proto/trustchain/reward/v1/params.proto

@@ -0,0 +1,44 @@
+syntax = "proto3";
+package trustchain.reward.v1;
+
+import "amino/amino.proto";
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/oxiaom/trustchain/x/reward/types";
+
+message Params {
+  option (amino.name) = "trustchain/x/reward/Params";
+  option (gogoproto.equal) = true;
+
+  // reward per purchase (microTCT)
+  string purchase_reward = 1;
+
+  // reward per positive review (microTCT)
+  string review_reward = 2;
+
+  // reward per invitation (microTCT)
+  string invite_reward = 3;
+
+  // daily reward cap per user (microTCT)
+  string daily_cap = 4;
+
+  // registration reward, locked until verified (microTCT) — v0.20.0
+  string registration_reward = 5;
+
+  // invite reward when invitee role=buyer/both activates (microTCT) — v0.20.0 (PRD §4.9 default 5 TCT)
+  string invite_buyer_reward = 6;
+
+  // invite reward when invitee role=seller activates (microTCT) — v0.20.0 (PRD §4.9 default 10 TCT)
+  string invite_seller_reward = 7;
+}
+
+// RewardEvent tracks a single reward distribution.
+message RewardEvent {
+  option (amino.name) = "trustchain/x/reward/RewardEvent";
+
+  string recipient = 1;
+  string amount = 2;         // microTCT
+  string reward_type = 3;   // "purchase", "review", "invite", "listing"
+  uint64 reference_id = 4; // order_id or invite_id
+  uint64 created_at = 5;
+}

package/proto/trustchain/reward/v1/tx.proto

@@ -0,0 +1,62 @@
+syntax = "proto3";
+package trustchain.reward.v1;
+
+import "amino/amino.proto";
+import "cosmos/msg/v1/msg.proto";
+import "gogoproto/gogo.proto";
+import "trustchain/reward/v1/params.proto";
+
+option go_package = "github.com/oxiaom/trustchain/x/reward/types";
+
+// Msg defines the Msg service.
+service Msg {
+  option (cosmos.msg.v1.service) = true;
+
+  // UpdateParams defines a (governance) operation for updating the module
+  // parameters. The authority defaults to the x/gov module account.
+  rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
+
+  // RewardPoolTransfer — 奖励池定向划转 (authority/emergency 双轨, 池间调拨用)
+  rpc RewardPoolTransfer(MsgRewardPoolTransfer) returns (MsgRewardPoolTransferResponse);
+}
+
+// MsgRewardPoolTransfer 从 x/reward 奖励池向目标地址划转 TCT (池间调拨, 如: 奖励池 → 引导金池)
+message MsgRewardPoolTransfer {
+  option (cosmos.msg.v1.signer) = "authority";
+  option (amino.name) = "trustchain/x/reward/MsgRewardPoolTransfer";
+
+  // authority 是划转签名人 (gov 模块地址或应急密钥, 双轨)
+  string authority = 1;
+
+  // recipient 是收款地址 (普通账户或目标模块账户, 如 subchain 引导金池)
+  string recipient = 2;
+
+  // amount 是划转金额 (utct)
+  string amount = 3;
+}
+
+message MsgRewardPoolTransferResponse {
+  // amount 回显实际划转金额 (utct)
+  string amount = 1;
+}
+
+// MsgUpdateParams is the Msg/UpdateParams request type.
+message MsgUpdateParams {
+  option (cosmos.msg.v1.signer) = "authority";
+  option (amino.name) = "trustchain/x/reward/MsgUpdateParams";
+
+  // authority is the address that controls the module (defaults to x/gov unless overwritten).
+  string authority = 1;
+
+  // params defines the module parameters to update.
+  //
+  // NOTE: All parameters must be supplied.
+  Params params = 2 [
+    (gogoproto.nullable) = false,
+    (amino.dont_omitempty) = true
+  ];
+}
+
+// MsgUpdateParamsResponse defines the response structure for executing a
+// MsgUpdateParams message.
+message MsgUpdateParamsResponse {}

package/routes/onboard.html

@@ -178,6 +178,10 @@ img.auprev{display:none;width:100%;max-height:140px;object-fit:cover;border-radi
         <div class="agrid">
           <div class="afield"><label for="a_legal_name">法人/经营者姓名</label><input id="a_legal_name" placeholder="与身份证一致"></div>
           <div class="afield"><label for="a_legal_id_number">法人身份证号</label><input id="a_legal_id_number" placeholder="17 位数字 + 数字或 X"></div>
+          <div class="afield afield-full" id="afield_idaddr" style="display:none"><label for="a_legal_id_address">身份证居住地址 <span class="aopt">企业主体必填, 本机加密</span></label><input id="a_legal_id_address" placeholder="与身份证住址一致, 如: 广东省深圳市南山区xx路xx号"></div>
+          <div class="afield afield-full" id="afield_ubo_note" style="display:none">
+            <div class="ahint" style="margin-top:0">企业主体：若最终受益人只有法定代表人本人，无需填写受益人信息 (微信自动回填)；否则暂不支持，请联系服务商协助进件</div>
+          </div>
           <div class="afield"><label for="a_period_begin">身份证有效期开始</label><input id="a_period_begin" placeholder="YYYY-MM-DD"></div>
           <div class="afield"><label for="a_period_end">有效期结束</label><input id="a_period_end" placeholder="YYYY-MM-DD 或 长期"></div>
           <div class="afield"><label for="a_contact_name">超级管理员姓名</label><input id="a_contact_name" placeholder="与微信实名一致"></div>
@@ -487,6 +491,7 @@ function applyFormBody(){
     legal_id_period_begin:aval('a_period_begin'),legal_id_period_end:aval('a_period_end'),
     account_type:aval('a_account_type'),account_name:aval('a_account_name'),account_number:aval('a_account_number'),
     account_bank:aval('a_account_bank'),bank_name:aval('a_bank_name'),bank_address_code:aval('a_bank_address_code'),
+    legal_id_address:aval('a_legal_id_address'), // 企业主体必填 (F4), 个体户留空
     sales_scene:scene,
     license_media_id:_aMedia.license_media_id||'',legal_id_front_media_id:_aMedia.legal_id_front_media_id||'',
     legal_id_back_media_id:_aMedia.legal_id_back_media_id||''
@@ -588,7 +593,53 @@ async function retryApplyment(){
   else{var msg=document.getElementById('apply-msg');msg.style.display='block';msg.textContent=j.message||'重试失败, 请稍后再试';}
 }
 async function queryApplyment(){
-  try{renderApplyment(await readJson(await fetch('/api/onboard/applyment/status')));}catch(e){}
+  try{
+    var j=await readJson(await fetch('/api/onboard/applyment/status'));
+    renderApplyment(j);
+    if(j && j.form_snapshot) prefillApplyForm(j.form_snapshot); // F1: 驳回/暂存后预填
+  }catch(e){}
+}
+// F1 预填: 台账快照回填非敏感字段 + 照片 media_id 复用 (敏感字段是密文/脱敏, 需重填)
+var PREFILL_MAP={subject_type:'a_subject_type',merchant_shortname:'a_shortname',merchant_name:'a_merchant_name',
+  license_number:'a_license_number',service_phone:'a_service_phone',settlement_id:'a_settlement_id',
+  qualification_type:'a_qualification_type',contact_email:'a_contact_email',legal_name:'a_legal_name',
+  legal_id_period_begin:'a_period_begin',legal_id_period_end:'a_period_end',
+  account_type:'a_account_type',account_bank:'a_account_bank',bank_name:'a_bank_name',bank_address_code:'a_bank_address_code',
+  store_name:'a_store_name',store_address_code:'a_store_address_code',store_address:'a_store_address',
+  website_url:'a_website_url',appid:'a_appid',appid_type:'a_appid_type'};
+var PREFILL_MEDIA=['license_media_id','legal_id_front_media_id','legal_id_back_media_id',
+  'store_entrance_media_id','store_indoor_media_id','web_home_media_id','web_product_media_id','mp_media_id'];
+var _prefilled=false;
+function prefillApplyForm(snap){
+  if(_prefilled||!snap||typeof snap!=='object') return;
+  _prefilled=true;
+  // 场景先切 (setScene 会重挂上传槽, 必须在写媒体状态前)
+  if(snap.sales_scene){
+    var r=document.querySelector('input[name="sales_scene"][value="'+snap.sales_scene+'"]');
+    if(r){r.checked=true;setScene(snap.sales_scene);}
+  }
+  // 主体类型联动先触发 (居住地址/UBO 说明显示 + 类目默认), 再写快照值 (避免类目被联动覆盖)
+  var subj=document.getElementById('a_subject_type');
+  if(subj&&snap.subject_type){subj.value=snap.subject_type;subj.dispatchEvent(new Event('change'));}
+  for(var k in PREFILL_MAP){
+    if(k==='subject_type') continue; // 上面已处理
+    var v=snap[k];
+    if(!v||v==='无') continue; // 敏感字段快照是脱敏的 ***后4位, 不会命中这里 (值带 *** 前缀也跳过)
+    if(String(v).indexOf('***')===0) continue;
+    var e=document.getElementById(PREFILL_MAP[k]);
+    if(e&&!e.value) e.value=v;
+  }
+  // 照片复用: media_id 还在微信侧有效, 标已传
+  var reused=0;
+  PREFILL_MEDIA.forEach(function(k){
+    if(!snap[k]) return;
+    _aMedia[k]=snap[k]; reused++;
+    var st=document.getElementById('st_'+k);
+    if(st){st.style.color='#16A34A';st.textContent='✓ 已上传过, 无需重传';}
+  });
+  var msg=document.getElementById('apply-msg');
+  msg.style.display='block';
+  msg.textContent='ℹ️ 已预填上次提交的资料; 身份证号/手机号/卡号等敏感字段需重新填写'+(reused?' (照片已传过, 无需重传)':'');
 }
 async function loadApplymentStatus(){queryApplyment();}
 function markStepDone(id){
@@ -659,6 +710,10 @@ async function submit(){
   if(subj&&stl){
     subj.addEventListener('change',function(){
       stl.value = subj.value==='SUBJECT_TYPE_ENTERPRISE' ? '716' : '719';
+      // F4: 企业主体显示身份证居住地址(必填) + UBO 说明; 个体户隐藏
+      var ent = subj.value==='SUBJECT_TYPE_ENTERPRISE';
+      var ia=document.getElementById('afield_idaddr'); if(ia) ia.style.display=ent?'':'none';
+      var un=document.getElementById('afield_ubo_note'); if(un) un.style.display=ent?'':'none';
     });
   }
   // 省市编码选项 (国标区划码, 两处下拉共用; 微信官方对照表口径)

package/routes/onboard.js

@@ -459,12 +459,12 @@ function createOnboardRouter(deps) {
     const spApplyment = require("./sp-applyment");
     /** 在卖家本机就要加密的敏感字段 (与 sp-applyment buildApplymentBody 加密清单一致;
      *  注意 legal_name 不在内: 营业执照 legal_person 按微信文档是明文, 加密版单独走 legal_name_cipher) */
-    const APPLY_SENSITIVE = ["contact_name", "contact_mobile", "contact_email", "legal_id_number", "account_name", "account_number"];
+    const APPLY_SENSITIVE = ["contact_name", "contact_mobile", "contact_email", "legal_id_number", "account_name", "account_number", "legal_id_address"];
     // 字段名 → 中文 (错误提示直接给中文, 前端无需翻译表 — 2026-10-03 xiaomu 实测 "没反应" fix)
     const APPLY_LABELS = {
         contact_name: "超管姓名", contact_mobile: "超管手机号", contact_email: "联系邮箱",
         merchant_shortname: "商户简称", merchant_name: "营业执照名称", license_number: "统一社会信用代码",
-        legal_name: "法人/经营者姓名", legal_id_number: "法人身份证号",
+        legal_name: "法人/经营者姓名", legal_id_number: "法人身份证号", legal_id_address: "身份证居住地址",
         legal_id_period_begin: "身份证有效期开始", legal_id_period_end: "身份证有效期结束",
         account_name: "开户名称", account_number: "银行账号", account_bank: "开户银行",
         store_name: "门店名称", store_address_code: "门店省市编码", store_address: "门店详细地址",
@@ -479,9 +479,10 @@ function createOnboardRouter(deps) {
         "legal_name", "legal_id_number", "legal_id_period_begin", "legal_id_period_end",
         "account_name", "account_number", "account_bank", "service_phone", "settlement_id"];
     // 场景化必填 (2026-10-03 xiaomu 拍板三场景: 线下门店 / 互联网网站 / 公众号·小程序)
+    // F2 fix: WEB 场景微信端只有 web_info.domain 无 pics — 截图降为可选 (收集进台账备用, 不进微信 body)
     const APPLY_SCENE_CFG = {
         SALES_SCENES_STORE: { fields: ["store_name", "store_address_code", "store_address"], media: ["store_entrance_media_id", "store_indoor_media_id"] },
-        SALES_SCENES_WEB: { fields: ["website_url"], media: ["web_home_media_id", "web_product_media_id"] },
+        SALES_SCENES_WEB: { fields: ["website_url"], media: [] },
         SALES_SCENES_MP: { fields: ["appid"], media: ["mp_media_id"] },
     };
     const APPLY_MEDIA_COMMON = ["license_media_id", "legal_id_front_media_id", "legal_id_back_media_id"];
@@ -497,12 +498,20 @@ function createOnboardRouter(deps) {
             method,
             headers: Object.assign({ "Content-Type": "application/json" }, token ? { "x-sp-admin-key": token } : {}),
             body: bodyObj ? JSON.stringify(bodyObj) : undefined,
-            signal: AbortSignal.timeout(15000),
+            signal: AbortSignal.timeout(30000), // F3: 必须大于 SP 侧 wxRequest 的 20s 超时
         });
         const j = await r.json().catch(() => ({}));
         return { status: r.status, json: j };
     }
 
+    /** 敏感字段校验 helper: 加密清单里的字段若表单给了值, 必须在 payload 里有对应明文可被加密;
+     *  legal_id_address 只在企业主体必填 (F4), 个体户选填 */
+    function applyRequiredExtra(b, scene) {
+        const reqs = APPLY_REQUIRED_COMMON.concat(APPLY_SCENE_CFG[scene].fields);
+        if (b.subject_type === "SUBJECT_TYPE_ENTERPRISE") reqs.push("legal_id_address");
+        return reqs;
+    }
+
     /** 本地进件台账 (一台机器一个卖家, 取最新一行; business_code 未拿到前 status=PENDING_PUSH 可重试) */
     db.exec(`
 CREATE TABLE IF NOT EXISTS onboard_applyments (
@@ -554,8 +563,12 @@ CREATE TABLE IF NOT EXISTS onboard_applyments (
         try {
             const b = req.body || {};
             const latest = latestApplyment();
-            // 幂等: 已拿到 business_code → 直接返回, 不再调 SP
-            if (latest && latest.business_code) {
+            // 幂等 vs 驳回重提 (2026-10-03 F1): 已拿到 business_code 且状态非驳回类 → 幂等返回;
+            // REJECTED/EDITTING/CANCELED → 微信支持同 business_code 覆盖修改重提, 放行走正常提交流程
+            // F3 注意: business_code 现在 PENDING_PUSH 阶段就生成了, 幂等必须排除 PENDING_PUSH
+            // (SP 还没收到的暂存单绝不当已提交, 否则重试通道被堵死)
+            const RETRYABLE = ["APPLYMENT_STATE_REJECTED", "APPLYMENT_STATE_EDITTING", "APPLYMENT_STATE_CANCELED", "PENDING_PUSH"];
+            if (latest && latest.business_code && !RETRYABLE.includes(latest.status)) {
                 return res.json({ ok: true, idempotent: true, business_code: latest.business_code, applyment_id: latest.applyment_id, status: latest.status });
             }
             const hasForm = APPLY_REQUIRED_COMMON.some((k) => b[k]) || Object.keys(b).some((k) => /_media_id$/.test(k));
@@ -565,8 +578,8 @@ CREATE TABLE IF NOT EXISTS onboard_applyments (
                 // 经营场景 (非法值回落线下门店)
                 const scene = APPLY_SCENE_CFG[b.sales_scene] ? b.sales_scene : "SALES_SCENES_STORE";
                 const sceneCfg = APPLY_SCENE_CFG[scene];
-                // 校验必填字段 (中文提示 + field 名回传, 前端红卡 + 字段定位)
-                for (const k of APPLY_REQUIRED_COMMON.concat(sceneCfg.fields)) {
+                // 校验必填字段 (中文提示 + field 名回传, 前端红卡 + 字段定位; 企业主体加验身份证居住地址 F4)
+                for (const k of applyRequiredExtra(b, scene)) {
                     if (!String(b[k] || "").trim()) {
                         const label = APPLY_LABELS[k] || k;
                         return res.status(400).json({ ok: false, error: "invalid_param", field: k, message: `缺少必填字段: ${label} (${k})` });
@@ -593,7 +606,11 @@ CREATE TABLE IF NOT EXISTS onboard_applyments (
                 payload.sales_scene = scene; // 场景必带 (SP 侧按它组装 biz_store_info/web_info/mp_info)
                 // 通用类目资质留空 → 默认 "无" (微信通用场景接受, 避免留空被 SP 拒)
                 if (!payload.qualification_type) payload.qualification_type = "无";
-                for (const k of APPLY_SENSITIVE) payload[k] = spApplyment.encryptSensitive(payload[k], pem);
+                // F3: business_code 卖家侧首次提交时本地生成 (TB{毫秒}{rand6}), 台账暂存/转发/重试都带同号;
+                // SP 侧收到带号的提交不再新生成 (驳回重提也复用原号 — 微信同号覆盖)
+                const businessCode = (latest && latest.business_code) || spApplyment.genBusinessCode();
+                payload.business_code = businessCode;
+                for (const k of APPLY_SENSITIVE) if (payload[k]) payload[k] = spApplyment.encryptSensitive(payload[k], pem); // 选填敏感字段 (legal_id_address 个体户可空) 跳过空值
                 // 法人姓名双轨: legal_person 要明文 (payload.legal_name 不动),
                 // id_card_info.id_card_name 要密文 (单独字段, SP 侧 already_encrypted 时优先取它)
                 payload.legal_name_cipher = spApplyment.encryptSensitive(payload.legal_name, pem);
@@ -605,11 +622,11 @@ CREATE TABLE IF NOT EXISTS onboard_applyments (
                 delete snapshot.legal_name_cipher; // 密文不进展示快照
                 const payloadStr = JSON.stringify(payload);
                 if (latest) {
-                    db.prepare("UPDATE onboard_applyments SET status='PENDING_PUSH', encrypted_payload=?, form_snapshot=?, push_error='', updated_at=? WHERE id=?")
-                        .run(payloadStr, JSON.stringify(snapshot), now, latest.id);
+                    db.prepare("UPDATE onboard_applyments SET status='PENDING_PUSH', business_code=?, encrypted_payload=?, form_snapshot=?, push_error='', updated_at=? WHERE id=?")
+                        .run(businessCode, payloadStr, JSON.stringify(snapshot), now, latest.id);
                 } else {
-                    db.prepare("INSERT INTO onboard_applyments (status, encrypted_payload, form_snapshot, created_at, updated_at) VALUES ('PENDING_PUSH',?,?,?,?)")
-                        .run(payloadStr, JSON.stringify(snapshot), now, now);
+                    db.prepare("INSERT INTO onboard_applyments (status, business_code, encrypted_payload, form_snapshot, created_at, updated_at) VALUES ('PENDING_PUSH',?,?,?,?,?)")
+                        .run(businessCode, payloadStr, JSON.stringify(snapshot), now, now);
                 }
             } else if (latest && latest.encrypted_payload) {
                 payload = JSON.parse(latest.encrypted_payload); // 重试: 用暂存密文
@@ -645,13 +662,20 @@ CREATE TABLE IF NOT EXISTS onboard_applyments (
         }
     });
 
-    /** GET /applyment/status — 代理查 SP 网关状态 → 更新本地台账 → 回页面 (SP 不可达回台账缓存) */
+    /** GET /applyment/status — 代理查 SP 网关状态 → 更新本地台账 → 回页面 (SP 不可达回台账缓存)
+     *  附带 form_snapshot (脱敏表单快照), 前端用于驳回/暂存后的表单预填 (F1) */
     router.get("/applyment/status", async (req, res) => {
         try {
             const latest = latestApplyment();
             if (!latest) return res.json({ ok: true, status: "NOT_SUBMITTED" });
+            let snapshot;
+            try { snapshot = latest.form_snapshot ? JSON.parse(latest.form_snapshot) : undefined; } catch (_) { snapshot = undefined; }
+            if (latest.status === "PENDING_PUSH") {
+                // 暂存单可能已有 business_code (F3 本地生成) 但 SP 还没收到 — 如实回 PENDING_PUSH
+                return res.json({ ok: true, status: "PENDING_PUSH", business_code: latest.business_code || undefined, push_error: latest.push_error || undefined, form_snapshot: snapshot });
+            }
             if (!latest.business_code) {
-                return res.json({ ok: true, status: latest.status, push_error: latest.push_error || undefined });
+                return res.json({ ok: true, status: latest.status, push_error: latest.push_error || undefined, form_snapshot: snapshot });
             }
             const now = Math.floor(Date.now() / 1000);
             try {
@@ -661,18 +685,20 @@ CREATE TABLE IF NOT EXISTS onboard_applyments (
                     db.prepare(`UPDATE onboard_applyments SET status=?, sign_url=?, sub_mchid=?, state_msg=?, updated_at=?
  WHERE id=(SELECT id FROM onboard_applyments ORDER BY id DESC LIMIT 1)`)
                         .run(String(j.status || latest.status), String(j.sign_url || ""), String(j.sub_mchid || ""), String(j.state_msg || ""), now);
-                    return res.json({ ok: true, ...j });
+                    return res.json({ ok: true, ...j, form_snapshot: snapshot });
                 }
                 // SP 返回业务错误: 透传 + 台账缓存兜底
                 return res.json({
                     ok: true, status: latest.status, business_code: latest.business_code, cached: true,
                     sign_url: latest.sign_url || undefined, sub_mchid: latest.sub_mchid || undefined,
+                    form_snapshot: snapshot,
                     message: j_safeMsg(r),
                 });
             } catch (e) {
                 return res.json({
                     ok: true, status: latest.status, business_code: latest.business_code, cached: true,
                     sign_url: latest.sign_url || undefined, sub_mchid: latest.sub_mchid || undefined,
+                    form_snapshot: snapshot,
                     message: "服务商暂时不可用，请稍后再试 (展示本机缓存状态)",
                 });
             }

package/routes/sp-applyment.js

@@ -130,15 +130,13 @@ function buildApplymentBody(form, enc, opts) {
     ];
     if (scene === "SALES_SCENES_STORE") {
         mediaNeed.push(["store_entrance_media_id", "门店门头照片"], ["store_indoor_media_id", "门店内部照片"]);
-    } else if (scene === "SALES_SCENES_WEB") {
-        mediaNeed.push(["web_home_media_id", "网站首页截图"], ["web_product_media_id", "商品/服务页截图"]);
-    } else {
-        mediaNeed.push(["mp_media_id", "公众号/小程序页面截图"]);
     }
+    // WEB/MP 场景的截图不进微信 body (微信 web_info 只有 domain, 无 pics 字段 — 2026-10-03 F2 fix),
+    // 截图由卖家侧收集进台账备用 (服务商协助审核参考), 故此处不校验
     for (const [k, label] of mediaNeed) {
         if (!f[k]) throw new HttpError(400, "media_missing", label + " 未上传 (请先拍照上传拿到 media_id)", k);
     }
-    // 场景化经营场景结构 (微信官方: WEB→web_info / MP→mp_info(公众号) 或 mini_program_info(小程序))
+    // 场景化经营场景结构 (微信官方: WEB→web_info{domain} / MP→mp_info(公众号) 或 mini_program_info(小程序))
     const salesInfo = { sales_scenes_type: [scene] };
     if (scene === "SALES_SCENES_STORE") {
         salesInfo.biz_store_info = {
@@ -151,10 +149,7 @@ function buildApplymentBody(form, enc, opts) {
     } else if (scene === "SALES_SCENES_WEB") {
         const url = reqStr(f.website_url, "网站网址", 256);
         if (!/^https?:\/\//i.test(url)) throw new HttpError(400, "invalid_param", "网站网址须以 http(s):// 开头 (需已上线且有 ICP 备案)", "website_url");
-        salesInfo.web_info = {
-            website_url: url,
-            web_pics: [String(f.web_home_media_id), String(f.web_product_media_id)],
-        };
+        salesInfo.web_info = { domain: url }; // 微信官方字段是 domain; web_authorisation/web_appid 选填先不传
     } else {
         // 公众号/小程序二选一: 用户只有小程序 appid 时用 mini_program_info
         if (f.appid_type === "mini") {
@@ -198,6 +193,10 @@ function buildApplymentBody(form, enc, opts) {
                     id_card_number: enc(reqStr(f.legal_id_number, "身份证号", sensLen || 32)),
                     card_period_begin: reqStr(f.legal_id_period_begin, "身份证有效期开始", 16),
                     card_period_end: reqStr(f.legal_id_period_end, "身份证有效期结束", 16), // 长期填 "长期"
+                    // 企业主体必填 (微信文档: 主体为企业时需填, 且需加密 — 2026-10-03 F4 fix)
+                    ...(subjectType === "SUBJECT_TYPE_ENTERPRISE"
+                        ? { id_card_address: enc(reqStr(f.legal_id_address, "身份证居住地址", sensLen || 512)) }
+                        : {}),
                 },
             },
         },
@@ -617,21 +616,28 @@ function createSpApplymentRouter(deps) {
     });
 
     /** POST /applyment/submit — 组装进件 JSON (敏感字段 RSA-OAEP 加密) → 微信提交 → 台账落行
-     *  幂等: body.business_code 已存在 → 直接返回已有 applyment_id */
+     *  幂等/重提 (2026-10-03 F1/F3 fix):
+     *   - business_code 由调用方 (卖家本机) 首次提交时生成并随单带上; 未带则 SP 兜底生成
+     *   - 台账已有该号且状态 SUBMITTED/AUDITING/FINISHED 等 → 幂等返回, 不重复调微信
+     *   - 状态 REJECTED/EDITTING/CANCELED → 微信官方支持同 business_code 覆盖修改重提, 重新组装调微信
+     *   - 台账无该号 → 新申请单, 直接用调用方给的 business_code */
     router.post("/applyment/submit", async (req, res) => {
         if (!checkAdmin(req, res)) return;
         try {
             const f = req.body || {};
-            // 幂等: 同 business_code 重复提交 → 返回已有记录, 不重复调微信
+            const RETRYABLE = ["APPLYMENT_STATE_REJECTED", "APPLYMENT_STATE_EDITTING", "APPLYMENT_STATE_CANCELED"];
+            let businessCode;
             if (f.business_code) {
                 const bc = chainWrites.assertSafe(f.business_code, "business_code");
                 const row = db.prepare("SELECT business_code, applyment_id, status FROM sp_applyments WHERE business_code = ?").get(bc);
-                if (row) {
+                if (row && !RETRYABLE.includes(row.status)) {
                     return res.json({ applyment_id: row.applyment_id, business_code: row.business_code, status: row.status, idempotent: true });
                 }
-                throw new HttpError(400, "unknown_business_code", "business_code 不存在 (首次提交请不要传 business_code, 由后端生成)");
+                businessCode = bc; // 驳回覆盖重提 (同号) 或 卖家侧生成的新号
+                if (row) console.log(`[sp-applyment] 驳回重提 bc=${bc} 旧状态=${row.status} → 同号覆盖提交微信`);
+            } else {
+                businessCode = genBusinessCode(); // 兜底 (SP 直录页场景)
             }
-            const businessCode = genBusinessCode();
             // 2026-10-03 架构纠偏: 卖家本机已用 SP 公钥加密的资料 (already_encrypted: true)
             // 直通不再二次加密; SP 公钥只在收明文表单时才需要
             const alreadyEnc = !!f.already_encrypted;
@@ -656,9 +662,13 @@ function createSpApplymentRouter(deps) {
                 already_encrypted: undefined,
             };
             const now = nowSec();
+            // upsert: 驳回重提时更新已有行 (同 business_code 覆盖), 否则插新行
             db.prepare(`INSERT INTO sp_applyments
  (business_code, applyment_id, status, subject_json, created_at, updated_at)
- VALUES (?,?,?,?,?,?)`)
+ VALUES (?,?,?,?,?,?)
+ ON CONFLICT(business_code) DO UPDATE SET
+   applyment_id=excluded.applyment_id, status=excluded.status,
+   subject_json=excluded.subject_json, updated_at=excluded.updated_at`)
                 .run(businessCode, applymentId, "SUBMITTED", JSON.stringify(snapshot).slice(0, 8000), now, now);
             console.log(`[sp-applyment] 进件已提交 bc=${businessCode} applyment_id=${applymentId}`);
             res.json({ applyment_id: applymentId, business_code: businessCode });

package/run-unified.js

@@ -614,6 +614,17 @@ async function startUnifiedServer() {
     // 2026-09-26: 微信支付服务商 (SP) 模式三件套 — 特约商户回调 (/api/sp/notify/wechat) + 抽佣登记 (/api/sp/commission-rate*)
     // 分账骨架在 payments/wechat/profitsharing.js (纯函数, 由 sp-notify 按抽佣比例触发, 默认 mock)
     app.use('/api/sp', (0, sp_notify_1.createSpNotifyRouter)({ db: sqliteIndexer.getRawDb() }));
+    // P1 fix: retryPending 此前只导出无调度方 — 支付事实上链失败的补链清扫, 每 5min 一轮
+    // (unref 不拖住进程退出; 连续 3 轮有失败额外告警, 单轮失败明细由 retryPending 内部 warn)
+    let spRetryFailStreak = 0;
+    const spRetryTimer = setInterval(() => {
+        sp_notify_1.retryPending(sqliteIndexer.getRawDb()).then((r) => {
+            spRetryFailStreak = r.failed > 0 ? spRetryFailStreak + 1 : 0;
+            if (spRetryFailStreak >= 3)
+                console.warn(`[sp-notify] retryPending 连续 ${spRetryFailStreak} 轮补链失败, 请检查链通道`);
+        }).catch((e) => console.warn('[sp-notify] retryPending 异常:', e && e.message));
+    }, 5 * 60 * 1000);
+    spRetryTimer.unref();
     app.use('/api/sp', (0, sp_commission_1.createSpCommissionRouter)({ db: sqliteIndexer.getRawDb() }));
     // 2026-10-03: SP 特约商户进件 — 手机表单页 GET /sp/apply + 进件 API /api/sp/applyment/{upload,submit,status}
     // 同一 router 挂两处: /sp 下只暴露页面 (/sp/apply), /api/sp 下是 API; /sp/applyment/* 多一份无害 (也要 admin key)