trustbase-seller-backend 0.3.0 → 0.3.1

package/package.json

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

package/routes/onboard.html

@@ -60,6 +60,9 @@ h1{font-size:22px;margin-bottom:4px}
 #apply-form .afield input,#apply-form .afield select{width:100%;padding:10px 12px;border:1px solid #D4CDBF;border-radius:8px;font-size:15px;background:#fff;transition:border-color .15s,box-shadow .15s}
 #apply-form .afield input::placeholder{color:#BDB5A6}
 #apply-form .afield input.amanual{margin-top:6px;border-style:dashed}
+/* 结算规则只读展示框 (按主体推导, 商户不用选; settlement_id=结算规则 ID 716/719/727,
+   qualification_type=行业类目 MCC — 两次微信实测错误交叉锁定后的正确口径) */
+#apply-form .arule{padding:10px 12px;border:1px dashed #D4CDBF;border-radius:8px;background:#F7F3EB;color:#6B655B;font-size:14px}
 #apply-form .afield input:focus,#apply-form .afield select:focus{outline:none;border-color:#C4633C;box-shadow:0 0 0 3px rgba(196,99,60,.15)}
 /* 上传卡片 (结构由 mountApplyUpload 生成: 标题label + label.sbtn>input + span#st_*) */
 #apply-form .auploads{display:grid;grid-template-columns:1fr 1fr;gap:12px 14px}
@@ -196,14 +199,15 @@ img.auprev{display:none;width:100%;max-height:140px;object-fit:cover;border-radi
           <div class="afield"><label for="a_merchant_name">营业执照名称</label><input id="a_merchant_name" placeholder="全称, 与执照一致"></div>
           <div class="afield"><label for="a_license_number">统一社会信用代码</label><input id="a_license_number" placeholder="18 位, 9 开头"></div>
           <div class="afield"><label for="a_service_phone">客服电话</label><input id="a_service_phone" placeholder="交易记录向买家展示"></div>
-          <div class="afield"><label for="a_settlement_id">经营类目 (微信行业编码 MCC)</label>
+          <div class="afield"><label>结算规则 (按主体自动确定, 不用选)</label>
+            <div class="arule" id="a_settlement_rule">719 · 个体户通用（0.6% T+1）</div></div>
+          <div class="afield"><label for="a_settlement_id">行业类目 (微信 MCC 编码)</label>
             <input id="a_settlement_filter" placeholder="搜索: 编码或名称 (如 5732 / 电子)" style="margin-bottom:6px">
             <select id="a_settlement_id">
-              <option value="">请选择经营类目</option>
+              <option value="">请选择行业类目</option>
               <option value="__MANUAL__">手动输入编码</option>
             </select>
             <input id="a_settlement_manual" class="amanual" placeholder="4 位 MCC 编码, 如: 5311" style="display:none"></div>
-          <div class="afield afield-full"><label for="a_qualification_type">类目资质描述 <span class="aopt">通用类目留空</span></label><input id="a_qualification_type" placeholder="通用零售/餐饮留空即可；特殊行业(医疗/教育/食品)需对应资质"></div>
         </div>
       </div>
 
@@ -643,7 +647,7 @@ function applyFormBody(){
   var body={
     subject_type:aval('a_subject_type'),merchant_shortname:aval('a_shortname'),merchant_name:aval('a_merchant_name'),
     license_number:aval('a_license_number'),service_phone:aval('a_service_phone'),
-    settlement_id:aval('a_settlement_id'),qualification_type:aval('a_qualification_type'),
+    qualification_type:aval('a_settlement_id'), // 行业类目 MCC (settlement_id=结算规则由后端按主体推导, 前端不发)
     contact_name:aval('a_contact_name'),contact_mobile:aval('a_contact_mobile'),contact_email:aval('a_contact_email'),
     legal_name:aval('a_legal_name'),legal_id_number:aval('a_legal_id_number'),
     legal_id_period_begin:aval('a_period_begin'),legal_id_period_end:aval('a_period_end'),
@@ -782,8 +786,8 @@ async function queryApplyment(){
 }
 // 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',
+  license_number:'a_license_number',service_phone:'a_service_phone',
+  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',
@@ -810,6 +814,16 @@ function prefillApplyForm(snap){
     var e=document.getElementById(PREFILL_MAP[k]);
     if(e&&!e.value) e.value=v;
   }
+  // 行业类目 (MCC) 预填: 新口径 qualification_type=MCC; 旧台账曾把 MCC 误存进 settlement_id
+  // → 兼容回填 (旧值若是 4 位 MCC 而非 716/719/727, 填回"行业类目"框; 结算规则按主体重新推导)
+  var mcc=snap.qualification_type;
+  if((!mcc||mcc==='无'||mcc==='零售') && snap.settlement_id && ['716','719','727'].indexOf(String(snap.settlement_id))<0){
+    mcc=snap.settlement_id;
+  }
+  if(mcc && mcc!=='无' && String(mcc).indexOf('***')!==0){
+    var se=document.getElementById('a_settlement_id');
+    if(se&&!se.value) se.value=mcc; // 不在码表 (手填值) 时 select 置空, 商户重选/手填
+  }
   // 照片复用: media_id 还在微信侧有效 → 槽位走"已上传"双态 (占位图+替换/删除, 无第二个空框)
   var reused=0;
   PREFILL_MEDIA.forEach(function(k){
@@ -971,9 +985,18 @@ async function restoreIdentity(){
     // 手动输入接管 (沿用 id 移交逻辑)
     linkSelectManual('a_settlement_id','a_settlement_manual','__MANUAL__');
   }
+  // 结算规则只读展示 (settlement_id 按主体推导: 企业 716 / 个体户 719 / 其他组织 727; 商户不用选)
+  var SETTLE_RULES={SUBJECT_TYPE_INDIVIDUAL:'719 · 个体户通用（0.6% T+1）',
+    SUBJECT_TYPE_ENTERPRISE:'716 · 企业通用（0.6% T+1）',SUBJECT_TYPE_OTHERS:'727 · 其他组织通用（0.6% T+1）'};
+  function paintSettleRule(){
+    var el=document.getElementById('a_settlement_rule');
+    if(el&&subj) el.textContent=SETTLE_RULES[subj.value]||SETTLE_RULES.SUBJECT_TYPE_INDIVIDUAL;
+  }
+  paintSettleRule();
   if(subj&&stl){
     subj.addEventListener('change',function(){
       stl.value = subj.value==='SUBJECT_TYPE_ENTERPRISE' ? '5311' : '5331';
+      paintSettleRule();
       // F4: 企业主体显示身份证居住地址(必填) + UBO 说明; 个体户隐藏
       var ent = subj.value==='SUBJECT_TYPE_ENTERPRISE';
       var ia=document.getElementById('afield_idaddr'); if(ia) ia.style.display=ent?'':'none';

package/routes/onboard.js

@@ -606,15 +606,17 @@ function createOnboardRouter(deps) {
         account_name: "开户名称", account_number: "银行账号", account_bank: "开户银行",
         store_name: "门店名称", store_address_code: "门店省市编码", store_address: "门店详细地址",
         website_url: "网站网址", appid: "公众号/小程序 AppID",
-        service_phone: "客服电话", settlement_id: "经营类目",
+        service_phone: "客服电话", qualification_type: "行业类目 (MCC 编码)",
         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: "公众号/小程序页面截图",
     };
-    // 通用必填 (qualification_type 不在内: 通用类目留空, 后端默认 "无" — 2026-10-03 实测秒拒 fix)
+    // 通用必填 — 字段语义最终修正 (两次微信实测错误交叉锁定):
+    //   settlement_id = 结算规则 ID (716/719/727, 后端按主体推导, 不依赖前端);
+    //   qualification_type = 行业类目编码 MCC (表单"行业类目"下拉值, 必填 — "无"不是合法行业编码)
     const APPLY_REQUIRED_COMMON = ["contact_name", "contact_mobile", "contact_email", "merchant_shortname", "merchant_name", "license_number",
         "legal_name", "legal_id_number", "legal_id_period_begin", "legal_id_period_end",
-        "account_name", "account_number", "account_bank", "service_phone", "settlement_id"];
+        "account_name", "account_number", "account_bank", "service_phone", "qualification_type"];
     // 场景化必填 (2026-10-03 xiaomu 拍板三场景: 线下门店 / 互联网网站 / 公众号·小程序)
     // F2 fix: WEB 场景微信端只有 web_info.domain 无 pics — 截图降为可选 (收集进台账备用, 不进微信 body)
     const APPLY_SCENE_CFG = {
@@ -765,7 +767,9 @@ 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 = "无";
+                // settlement_id = 结算规则 ID, 按主体推导 (商户不用选; 前端不传也兜底)
+                payload.settlement_id = payload.subject_type === "SUBJECT_TYPE_ENTERPRISE" ? "716"
+                    : (payload.subject_type === "SUBJECT_TYPE_OTHERS" ? "727" : "719");
                 // M2 断点 c: tb_address 贯通 — SP 台账落列, FINISHED 后 oracle 引导金才知道发给谁
                 const identity = await ensureSellerIdentity(basePaths.baseDir());
                 payload.tb_address = identity.address;

package/routes/sp-applyment.js

@@ -241,9 +241,11 @@ function buildApplymentBody(form, enc, opts) {
             sales_info: salesInfo,
         },
         settlement_info: {
-            settlement_id: reqStr(f.settlement_id, "经营类目", 16),
-            // 通用类目 (716/719/727) 资质留空即可 — 留空默认 "无" (2026-10-03 xiaomu 实测秒拒 fix)
-            qualification_type: f.qualification_type ? reqStr(f.qualification_type, "类目资质描述", 128) : "无",
+            // 字段语义最终修正 (两次微信实测错误交叉锁定):
+            //   settlement_id = 结算规则 ID (716 企业 / 719 个体户 / 727 其他组织, 卖家侧按主体推导)
+            //   qualification_type = 行业类目编码 MCC (5311 百货商店等; "无"不是合法行业编码)
+            settlement_id: reqStr(f.settlement_id, "结算规则 ID", 16),
+            qualification_type: reqStr(f.qualification_type, "行业类目编码(MCC)", 128),
         },
         bank_account_info: {
             bank_account_type: f.account_type === "BANK_ACCOUNT_TYPE_PERSONAL" ? "BANK_ACCOUNT_TYPE_PERSONAL" : "BANK_ACCOUNT_TYPE_CORPORATE",

package/test-onboard-applyment.js

@@ -111,7 +111,7 @@ async function fillForm(base) {
         account_type: "BANK_ACCOUNT_TYPE_PERSONAL",
         account_name: "张三", account_number: PLAINTEXT.card, account_bank: "招商银行",
         store_name: "张三餐饮店南山店", store_address_code: "440300", store_address: "南山区xx路1号",
-        service_phone: "0755-12345678", settlement_id: "719", qualification_type: "零售",
+        service_phone: "0755-12345678", qualification_type: "5331", // 行业类目 MCC (settlement_id 结算规则由后端按主体推导)
         ...media,
     };
 }
@@ -291,7 +291,11 @@ test("onboard 页面含进件表单 (btn-apply-submit) 且第③步状态机元
         assert.ok(html.includes("百货商店") && html.includes("就餐场所和餐馆"), "MCC 名称");
         assert.ok(!html.includes('value="719"') && !html.includes('value="716"') && !html.includes('value="727"'), "V2 错误编码已清除");
         assert.ok(html.includes("a_settlement_filter"), "类目搜索过滤");
-        assert.ok(html.includes("a_settlement_manual") && html.includes("__MANUAL__"), "手动输入接管保留");
+        assert.ok(html.includes("a_settlement_manual") && html.includes("__MANUAL__"), "手动输入接管保留");
+        // 2026-10-03 字段语义最终修正: 双字段 (结算规则只读展示 + 行业类目 MCC 下拉)
+        assert.ok(html.includes("a_settlement_rule"), "结算规则只读展示框");
+        assert.ok(html.includes("结算规则") && html.includes("行业类目"), "双字段标签");
+        assert.ok(!html.includes("a_qualification_type"), "旧资质描述字段已移除");
         assert.ok(html.includes("maybeAutoKyc"), "M2: 进件受理后自动 KYC 提交");
         assert.ok(!html.includes("btn-verify"), "手动实名按钮已删 (自动触发)");
     } finally { srv.close(); }
@@ -341,18 +345,52 @@ test("错误提示: 缺 store_address → 中文 message + field 定位 (2026-10
     } finally { srv.close(); }
 });
 
-test("qualification_type 留空可提交 (后端默认 '无', 2026-10-03 实测秒拒 fix)", async () => {
+test("字段语义最终修正: settlement_id=结算规则按主体推导 + qualification_type=MCC 必填", async () => {
     const { srv, base } = await startSeller();
     try {
+        // 行业类目缺失 → 400 (两次微信实测: "无"不是合法行业编码)
         const form = await fillForm(base);
         delete form.qualification_type;
+        let r = await fetch(base + "/api/onboard/applyment", {
+            method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(form),
+        });
+        let j = await r.json();
+        assert.strictEqual(r.status, 400);
+        assert.strictEqual(j.field, "qualification_type");
+        assert.ok(j.message.includes("行业类目"), j.message);
+        // 个体户 → settlement_id=719 (前端没传, 后端推导) + qualification_type=5331 透传
+        const before = spCapture.submits.length;
+        r = await fetch(base + "/api/onboard/applyment", {
+            method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(form2ok(form) ),
+        });
+        function form2ok(f){ const c={...f, qualification_type:"5331"}; return c; }
+        j = await r.json();
+        assert.strictEqual(r.status, 200, JSON.stringify(j));
+        assert.strictEqual(spCapture.submits[before].settlement_id, "719", "个体户 → 结算规则 719 (后端推导)");
+        assert.strictEqual(spCapture.submits[before].qualification_type, "5331", "行业类目 MCC 透传");
+    } finally { srv.close(); }
+});
+
+test("字段语义: 企业主体 → settlement_id=716 + qualification_type=MCC (submit 组装断言)", async () => {
+    const { srv, base } = await startSeller();
+    try {
+        const form = await fillForm(base);
+        form.subject_type = "SUBJECT_TYPE_ENTERPRISE";
+        form.qualification_type = "5311";
+        form.legal_id_address = "广东省深圳市南山区xx路1号101室"; // 企业必填 (F4)
         const before = spCapture.submits.length;
         const r = await fetch(base + "/api/onboard/applyment", {
             method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(form),
         });
         const j = await r.json();
         assert.strictEqual(r.status, 200, JSON.stringify(j));
-        assert.strictEqual(spCapture.submits[before].qualification_type, "无", "留空默认 '无'");
+        const fwd = spCapture.submits[before];
+        assert.strictEqual(fwd.settlement_id, "716", "企业 → 结算规则 716");
+        assert.strictEqual(fwd.qualification_type, "5311", "行业类目 MCC");
+        // SP 侧组装: settlement_info 两字段正确分工
+        const wxBody = spApplymentLib.buildApplymentBody({ ...fwd, business_code: "TBTEST" }, (s) => s, { alreadyEncrypted: true });
+        assert.strictEqual(wxBody.settlement_info.settlement_id, "716");
+        assert.strictEqual(wxBody.settlement_info.qualification_type, "5311");
     } finally { srv.close(); }
 });