@pisell/pisellos 2.1.130 → 2.1.131

package/lib/modules/Order/utils.js

@@ -30,10 +30,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   buildSubmitPayload: () => buildSubmitPayload,
+  composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
   createEmptySummary: () => import_utils2.createEmptySummary,
   createUuidV4: () => createUuidV4,
+  filterProductsForScanOrderMore: () => filterProductsForScanOrderMore,
   formatDateTime: () => formatDateTime,
   formatV1Product: () => formatV1Product,
   generateDuration: () => generateDuration,
@@ -42,13 +44,39 @@ __export(utils_exports, {
   mergeRelationForms: () => mergeRelationForms,
   normalizeSubmitBooking: () => normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
-  resolveSubmitCollectPax: () => resolveSubmitCollectPax
+  resolveSubmitCollectPax: () => resolveSubmitCollectPax,
+  sumOptionUnitPrice: () => sumOptionUnitPrice
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../solution/ScanOrder/utils");
 var import_utils2 = require("../../solution/ScanOrder/utils");
+function composeLinePrice(params) {
+  const { mainPrice, bundle, useOriginalBundle } = params;
+  let total = new import_decimal.default(Number(mainPrice) || 0);
+  if (Array.isArray(bundle)) {
+    for (const item of bundle) {
+      const rawPrice = useOriginalBundle ? (item == null ? void 0 : item.original_price) ?? (item == null ? void 0 : item.product_price) ?? (item == null ? void 0 : item.price) : (item == null ? void 0 : item.bundle_selling_price) ?? (item == null ? void 0 : item.price);
+      const price = new import_decimal.default(Number(rawPrice) || 0);
+      const rawNum = (item == null ? void 0 : item.num) ?? (item == null ? void 0 : item.quantity) ?? 1;
+      const num = new import_decimal.default(Number(rawNum) || 0);
+      total = total.plus(price.times(num));
+    }
+  }
+  return total.toDecimalPlaces(2).toFixed(2);
+}
+function sumOptionUnitPrice(options) {
+  let total = new import_decimal.default(0);
+  if (!Array.isArray(options))
+    return total;
+  for (const opt of options) {
+    const price = new import_decimal.default(Number(opt == null ? void 0 : opt.price) || 0);
+    const num = new import_decimal.default(Number(opt == null ? void 0 : opt.num) || 0);
+    total = total.plus(price.times(num));
+  }
+  return total;
+}
 function createDefaultOrderRulesHooks() {
   const toUnitPriceString = (totalLike, num) => {
     const effectiveNum = Number(num) > 0 ? Number(num) : 1;
@@ -57,13 +85,47 @@ function createDefaultOrderRulesHooks() {
   return {
     getProduct: (product) => {
       var _a, _b, _c, _d;
+      const metadataAny = product.metadata || {};
+      const optionSum = sumOptionUnitPrice(product.product_option_item);
+      let sourcePrice;
+      if (metadataAny.source_product_price !== void 0) {
+        sourcePrice = String(metadataAny.source_product_price);
+      } else if (metadataAny.main_product_selling_price !== void 0) {
+        sourcePrice = new import_decimal.default(
+          Number(metadataAny.main_product_selling_price) || 0
+        ).minus(optionSum).toDecimalPlaces(2).toString();
+      } else {
+        sourcePrice = String(product.selling_price ?? 0);
+      }
+      let sourceOriginalPrice;
+      if (metadataAny.source_product_price !== void 0) {
+        sourceOriginalPrice = String(metadataAny.source_product_price);
+      } else if (metadataAny.main_product_original_price !== void 0) {
+        sourceOriginalPrice = new import_decimal.default(
+          Number(metadataAny.main_product_original_price) || 0
+        ).minus(optionSum).toDecimalPlaces(2).toString();
+      } else {
+        sourceOriginalPrice = sourcePrice;
+      }
       return {
         id: product.product_id,
-        _id: product.identity_key ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${product.product_variant_id}`,
-        price: product.selling_price,
+        // Rules 引擎用 _id 作为 processedProductsMap 键；必须与购物车行级 identity 一致，
+        // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
+        // 不透明 identity 契约下，normalizeOrderProduct / restoreTempOrderFromStorage 已保证 identity_key 必存在；
+        // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
+        _id: product.identity_key ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
+          product.product_option_item,
+          product.product_bundle
+        )}`,
+        // Rules 内部 getProductTotalPrice / getProductOriginTotalPrice 会各自再叠加 bundle + option，
+        // 所以这里必须喂 source-level（不含 option、不含 bundle、不含折扣）单价，避免双加 option。
+        price: sourcePrice,
+        // total / origin_total 使用 composite × num，跟 Rules 内部产出的 total 对齐（含 option + bundle）。
         total: new import_decimal.default(product.selling_price || 0).times(product.num || 1).toNumber(),
-        origin_total: new import_decimal.default(product.original_price || product.selling_price || 0).times(product.num || 1).toNumber(),
-        original_price: product.original_price,
+        origin_total: new import_decimal.default(
+          product.original_price || product.selling_price || 0
+        ).times(product.num || 1).toNumber(),
+        original_price: sourceOriginalPrice,
         quantity: product.num || 1,
         num: product.num || 1,
         discount_list: product.discount_list || [],
@@ -77,17 +139,37 @@ function createDefaultOrderRulesHooks() {
     },
     setProduct: (product, values) => {
       const nextNum = Number(values.quantity ?? product.num ?? 1) || 1;
-      const nextSellingPrice = values.main_product_selling_price !== void 0 ? String(values.main_product_selling_price) : values.price !== void 0 ? String(values.price) : values.total !== void 0 ? toUnitPriceString(values.total, nextNum) : product.selling_price;
+      const metadataAny = product.metadata || {};
+      const existedSource = metadataAny.source_product_price ?? product.selling_price ?? "0";
+      const nextOptions = product.product_option_item;
+      const optionSum = sumOptionUnitPrice(nextOptions);
+      const nextSourceSellingPrice = values.main_product_selling_price !== void 0 ? String(values.main_product_selling_price) : values.price !== void 0 ? String(values.price) : values.total !== void 0 ? toUnitPriceString(values.total, nextNum) : String(existedSource);
+      const nextSourceOriginalPrice = values.original_price !== void 0 ? String(values.original_price) : String(existedSource);
+      const nextMainSellingPrice = new import_decimal.default(Number(nextSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
+      const nextMainOriginalPrice = new import_decimal.default(Number(nextSourceOriginalPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
+      const nextBundle = values.bundle ?? product.product_bundle;
+      const composedSellingPrice = composeLinePrice({
+        mainPrice: nextMainSellingPrice,
+        bundle: nextBundle
+      });
+      const composedOriginalPrice = composeLinePrice({
+        mainPrice: nextMainOriginalPrice,
+        bundle: nextBundle,
+        useOriginalBundle: true
+      });
       return {
         ...product,
-        selling_price: nextSellingPrice,
-        original_price: values.original_price !== void 0 ? String(values.original_price) : product.original_price,
+        selling_price: composedSellingPrice,
+        original_price: composedOriginalPrice,
         discount_list: values.discount_list ?? product.discount_list,
         num: values.quantity ?? product.num,
-        product_bundle: values.bundle ?? product.product_bundle,
+        product_bundle: nextBundle,
         metadata: {
-          ...product.metadata || {},
-          ...values.main_product_selling_price !== void 0 ? { main_product_selling_price: String(values.main_product_selling_price) } : {}
+          ...metadataAny,
+          source_product_price: nextSourceSellingPrice,
+          main_product_selling_price: nextMainSellingPrice,
+          main_product_original_price: nextMainOriginalPrice,
+          price_schema_version: 2
         }
       };
     }
@@ -151,6 +233,77 @@ function formatDateTime(date) {
 function normalizeSubmitPlatform(platform) {
   return (platform == null ? void 0 : platform.toLowerCase()) === "pc" ? "PC" : "H5";
 }
+function formatSubmitOptionItems(options) {
+  if (!Array.isArray(options))
+    return [];
+  return options.map((d) => ({
+    num: d == null ? void 0 : d.num,
+    option_group_item_id: (d == null ? void 0 : d.option_group_item_id) ?? (d == null ? void 0 : d.product_option_item_id),
+    option_group_id: d == null ? void 0 : d.option_group_id
+  }));
+}
+function toBundleNumber(value, fallback = 0) {
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : fallback;
+}
+function toBundleCustomPriceString(value) {
+  const parsed = Number(value);
+  if (Number.isFinite(parsed))
+    return parsed.toFixed(2);
+  if (value === null || value === void 0 || value === "")
+    return "0.00";
+  return String(value);
+}
+function formatSubmitBundleItems(bundle) {
+  if (!Array.isArray(bundle))
+    return [];
+  return bundle.map((b) => {
+    const rawBundle = b && typeof b === "object" ? b : {};
+    const existedMetadata = rawBundle.metadata && typeof rawBundle.metadata === "object" ? rawBundle.metadata : {};
+    const sellingPriceNum = toBundleNumber(
+      rawBundle.bundle_selling_price ?? rawBundle.price,
+      0
+    );
+    const priceNum = toBundleNumber(rawBundle.price, sellingPriceNum);
+    const priceType = rawBundle.price_type ?? "";
+    const customPriceStr = toBundleCustomPriceString(
+      rawBundle.custom_price ?? rawBundle.bundle_selling_price ?? rawBundle.price
+    );
+    const relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
+    const surchargeFee = toBundleNumber(
+      rawBundle.surcharge_fee ?? existedMetadata.surcharge_fee,
+      0
+    );
+    const productDiscountDifference = toBundleNumber(
+      existedMetadata.product_discount_difference,
+      0
+    );
+    return {
+      ...rawBundle,
+      is_charge_tax: rawBundle.is_charge_tax ?? 0,
+      tax_fee: toBundleNumber(rawBundle.tax_fee, 0),
+      bundle_variant_id: rawBundle.bundle_variant_id ?? 0,
+      num: toBundleNumber(rawBundle.num, 1),
+      extension_id: rawBundle.extension_id ?? 0,
+      extension_type: rawBundle.extension_type ?? "normal",
+      price: priceNum,
+      price_type: priceType,
+      price_type_ext: rawBundle.price_type_ext ?? "",
+      custom_price: customPriceStr,
+      custom_price_type: rawBundle.custom_price_type ?? priceType ?? "",
+      bundle_selling_price: sellingPriceNum,
+      option: formatSubmitOptionItems(rawBundle.option),
+      bundle_group_id: rawBundle == null ? void 0 : rawBundle.group_id,
+      bundle_id: rawBundle == null ? void 0 : rawBundle.id,
+      metadata: {
+        ...existedMetadata,
+        surcharge_fee: surchargeFee,
+        relation_surcharge_ids: relationSurchargeIds,
+        product_discount_difference: productDiscountDifference
+      }
+    };
+  });
+}
 function normalizeSubmitProduct(product) {
   const { _origin, identity_key, ...submitProduct } = product;
   const rawMetadata = submitProduct.metadata || {};
@@ -162,7 +315,8 @@ function normalizeSubmitProduct(product) {
   const priceMetaKeys = [
     "main_product_original_price",
     "main_product_selling_price",
-    "source_product_price"
+    "source_product_price",
+    "price_schema_version"
   ];
   for (const key of priceMetaKeys) {
     if (rawMetadata[key] !== void 0) {
@@ -178,11 +332,12 @@ function normalizeSubmitProduct(product) {
   return {
     ...submitProduct,
     ...bookingUid ? { booking_uid: bookingUid } : {},
-    product_option_item: submitProduct.product_option_item || [],
+    product_option_item: formatSubmitOptionItems(submitProduct.product_option_item),
     discount_list: submitProduct.discount_list || [],
-    product_bundle: submitProduct.product_bundle || [],
+    product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
-    // 出站兼容：后端仍消费 payment_price 字段，从 selling_price（券后单价）派生。
+    // 出站兼容：后端消费 payment_price 字段，这里从 selling_price 直接派生。
+    // 新语义下 selling_price 是 composite（含 option/bundle），payment_price 同语义。
     payment_price: submitProduct.selling_price
   };
 }
@@ -366,6 +521,12 @@ function buildSubmitPayload(params) {
   };
   return enhance ? enhance(payload, { tempOrder, bookingUuid, now }) : payload;
 }
+function filterProductsForScanOrderMore(products) {
+  return (products || []).filter((p) => {
+    var _a;
+    return ((_a = p.metadata) == null ? void 0 : _a.is_rule) !== true;
+  });
+}
 function formatV1Product(products) {
   return products.map((product) => {
     return {
@@ -375,6 +536,7 @@ function formatV1Product(products) {
       product_id: product.product_id,
       product_variant_id: product.product_variant_id,
       num: product.num,
+      note: String(product.note ?? ""),
       rowKey: product.product_id,
       session: null,
       unique: createUuidV4()
@@ -384,10 +546,12 @@ function formatV1Product(products) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildSubmitPayload,
+  composeLinePrice,
   createDefaultOrderRulesHooks,
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
+  filterProductsForScanOrderMore,
   formatDateTime,
   formatV1Product,
   generateDuration,
@@ -396,5 +560,6 @@ function formatV1Product(products) {
   mergeRelationForms,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
-  resolveSubmitCollectPax
+  resolveSubmitCollectPax,
+  sumOptionUnitPrice
 });

package/lib/modules/SalesSummary/utils.js

@@ -48,30 +48,6 @@ function getSafeNum(num) {
     return 1;
   return Math.floor(num);
 }
-function getVariantPrice(product) {
-  var _a, _b;
-  const variantId = Number(product.product_variant_id || 0);
-  if (!variantId)
-    return null;
-  const metadataVariantList = (_b = (_a = product.metadata) == null ? void 0 : _a.origin) == null ? void 0 : _b.variant;
-  if (Array.isArray(metadataVariantList)) {
-    const variant = metadataVariantList.find(
-      (item) => Number(item.id) === variantId
-    );
-    if ((variant == null ? void 0 : variant.price) !== void 0 && (variant == null ? void 0 : variant.price) !== null) {
-      return toDecimal(variant.price);
-    }
-  }
-  return null;
-}
-function getOptionUnitPrice(product) {
-  const optionItems = product.product_option_item || [];
-  return optionItems.reduce((sum, item) => {
-    const quantity = getSafeNum(item == null ? void 0 : item.num);
-    const itemPrice = toDecimal(item == null ? void 0 : item.price);
-    return sum.plus(itemPrice.times(quantity));
-  }, new import_decimal.default(0));
-}
 function getBundleUnitPrice(product, useOriginal = false) {
   const bundleItems = product.product_bundle || [];
   return bundleItems.reduce((sum, item) => {
@@ -81,13 +57,18 @@ function getBundleUnitPrice(product, useOriginal = false) {
   }, new import_decimal.default(0));
 }
 function getUnitPaymentTotal(product) {
-  const variantPrice = getVariantPrice(product);
-  const basePrice = variantPrice || toDecimal(product.selling_price);
-  return basePrice.plus(getOptionUnitPrice(product)).plus(getBundleUnitPrice(product));
+  var _a, _b;
+  const mainSelling = (_a = product.metadata) == null ? void 0 : _a.main_product_selling_price;
+  const mainOriginal = (_b = product.metadata) == null ? void 0 : _b.main_product_original_price;
+  const basePrice = mainSelling !== void 0 ? toDecimal(mainSelling) : mainOriginal !== void 0 ? toDecimal(mainOriginal) : toDecimal(product.selling_price);
+  return basePrice.plus(getBundleUnitPrice(product));
 }
 function getUnitOriginalTotal(product) {
-  const basePrice = toDecimal(product.original_price || product.selling_price);
-  return basePrice.plus(getOptionUnitPrice(product)).plus(getBundleUnitPrice(product, true));
+  var _a, _b;
+  const mainOriginal = (_a = product.metadata) == null ? void 0 : _a.main_product_original_price;
+  const mainSelling = (_b = product.metadata) == null ? void 0 : _b.main_product_selling_price;
+  const basePrice = mainOriginal !== void 0 ? toDecimal(mainOriginal) : mainSelling !== void 0 ? toDecimal(mainSelling) : toDecimal(product.original_price || product.selling_price);
+  return basePrice.plus(getBundleUnitPrice(product, true));
 }
 function buildSurchargeServiceItems(products) {
   return products.map((product) => {
@@ -207,12 +188,6 @@ function isBundleMarkupOrDiscount(item) {
   const isDiscount = (item == null ? void 0 : item.price_type) === "markdown" && ((item == null ? void 0 : item.price_type_ext) === "" || !(item == null ? void 0 : item.price_type_ext));
   return isMarkup || isDiscount;
 }
-function getDiscountListAmount(discountList) {
-  return (discountList || []).reduce(
-    (total, d) => total.plus(toDecimal(d.amount)),
-    new import_decimal.default(0)
-  );
-}
 function calculateSingleItemTax(params) {
   const { price, taxRate, isPriceIncludeTax, isChargeTax } = params;
   if (price.lte(0))
@@ -229,18 +204,9 @@ function calculateSingleItemTax(params) {
   return price.dividedBy(divisor).times(rate);
 }
 function getMainProductPaymentTotal(product) {
-  var _a, _b, _c, _d;
-  const variantPrice = getVariantPrice(product);
-  let total = variantPrice || toDecimal(((_a = product.metadata) == null ? void 0 : _a.main_product_selling_price) ?? product.selling_price);
-  const mainDiscountList = ((_c = (_b = product._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_d = product._origin) == null ? void 0 : _d.discount_list) || [];
-  const mainDiscountAmount = getDiscountListAmount(
-    mainDiscountList.filter((d) => {
-      var _a2;
-      return !((_a2 = d == null ? void 0 : d.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
-    })
-  );
-  total = total.minus(mainDiscountAmount);
-  total = total.plus(getOptionUnitPrice(product));
+  var _a, _b;
+  const mainSelling = ((_a = product.metadata) == null ? void 0 : _a.main_product_selling_price) ?? ((_b = product.metadata) == null ? void 0 : _b.main_product_original_price) ?? 0;
+  let total = toDecimal(mainSelling);
   const bundleItems = product.product_bundle || [];
   for (const bundleItem of bundleItems) {
     if (isBundleMarkupOrDiscount(bundleItem)) {

package/lib/modules/ScanOrderLogger/providers/feishu.js

@@ -22,58 +22,124 @@ __export(feishu_exports, {
   feishuLoggerProvider: () => feishuLoggerProvider
 });
 module.exports = __toCommonJS(feishu_exports);
-function safeStringify(payload) {
-  if (payload === void 0 || payload === null)
+var DEFAULT_THROTTLE_MS = 3e3;
+var pendingQueue = [];
+var flushTimer = null;
+var cachedProviderConfig;
+function safeStringify(value) {
+  if (value === void 0 || value === null)
     return "";
+  if (typeof value === "string")
+    return value;
+  if (typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") {
+    return String(value);
+  }
   try {
-    return JSON.stringify(payload);
+    return JSON.stringify(value);
   } catch (error) {
     return `[unserializable: ${String(error)}]`;
   }
 }
-function createFeishuMessageContent(contentArr) {
-  return JSON.stringify(
-    contentArr.map((item) => [
-      { tag: "text", text: `${item.key}: ` },
-      { tag: "text", text: item.value }
-    ])
-  );
+function isWebhookUsable(webhook) {
+  if (!webhook)
+    return false;
+  if (webhook.includes("REPLACE_ME"))
+    return false;
+  return true;
+}
+function buildRecordSegments(record) {
+  const context = record.context || {};
+  return [
+    [{ tag: "text", text: `[${record.level}] ${record.timestamp} ${record.title}
+` }],
+    [{ tag: "text", text: `缓存标识: ${safeStringify(context.cacheId)}
+` }],
+    [{ tag: "text", text: `日志来源: ${safeStringify(context)}
+` }],
+    [{ tag: "text", text: `日志内容: ${safeStringify(record.payload)}
+` }],
+    [{ tag: "text", text: `扩展信息: ${safeStringify(record.extra)}
+` }],
+    [{ tag: "text", text: "------\n" }]
+  ];
+}
+function buildFeishuBody(records) {
+  const title = records.length === 1 ? records[0].title : `ScanOrder 日志批量 (${records.length} 条)`;
+  const content = [];
+  records.forEach((record) => {
+    buildRecordSegments(record).forEach((segment) => content.push(segment));
+  });
+  return JSON.stringify({
+    msg_type: "post",
+    content: JSON.stringify({
+      post: {
+        zh_cn: {
+          title,
+          content
+        }
+      }
+    })
+  });
+}
+async function postToFeishu(webhook, body) {
+  await fetch(webhook, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json"
+    },
+    body
+  });
+}
+async function flushQueue() {
+  var _a;
+  flushTimer = null;
+  if (!pendingQueue.length)
+    return;
+  const records = pendingQueue.splice(0, pendingQueue.length);
+  const webhook = (_a = cachedProviderConfig == null ? void 0 : cachedProviderConfig.feishu) == null ? void 0 : _a.webhook;
+  if (!isWebhookUsable(webhook)) {
+    return;
+  }
+  if (typeof fetch !== "function") {
+    console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志批量上报");
+    return;
+  }
+  try {
+    await postToFeishu(webhook, buildFeishuBody(records));
+  } catch (error) {
+    console.warn("[ScanOrderLogger] Feishu 批量上报失败", error);
+  }
 }
 var feishuLoggerProvider = {
   async send(payload) {
-    var _a, _b;
+    var _a, _b, _c, _d;
+    cachedProviderConfig = payload.providerConfig;
     const webhook = (_b = (_a = payload.providerConfig) == null ? void 0 : _a.feishu) == null ? void 0 : _b.webhook;
-    if (webhook && webhook.includes("REPLACE_ME"))
-      return;
     if (!webhook) {
       console.warn("[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报");
       return;
     }
+    if (!isWebhookUsable(webhook))
+      return;
     if (typeof fetch !== "function") {
       console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报");
       return;
     }
-    const { record } = payload;
-    const contentArr = [
-      { key: "日志级别", value: record.level },
-      { key: "日志时间", value: record.timestamp },
-      { key: "日志标题", value: record.title },
-      { key: "缓存标识", value: record.context.cacheId || "" },
-      { key: "日志来源", value: safeStringify(record.context) },
-      { key: "日志内容", value: safeStringify(record.payload) },
-      { key: "扩展信息", value: safeStringify(record.extra) }
-    ];
-    const contentStr = createFeishuMessageContent(contentArr);
-    await fetch(webhook, {
-      headers: {
-        "Content-Type": "application/json"
-      },
-      method: "POST",
-      body: JSON.stringify({
-        msg_type: "post",
-        content: `{"post":{"zh_cn":{"title":"${record.title}","content":${contentStr}}}}`
-      })
-    });
+    const throttleMs = ((_d = (_c = payload.providerConfig) == null ? void 0 : _c.feishu) == null ? void 0 : _d.throttleMs) ?? DEFAULT_THROTTLE_MS;
+    if (throttleMs <= 0) {
+      try {
+        await postToFeishu(webhook, buildFeishuBody([payload.record]));
+      } catch (error) {
+        console.warn("[ScanOrderLogger] Feishu 日志上报失败", error);
+      }
+      return;
+    }
+    pendingQueue.push(payload.record);
+    if (!flushTimer) {
+      flushTimer = setTimeout(() => {
+        void flushQueue();
+      }, throttleMs);
+    }
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/modules/ScanOrderLogger/types.d.ts

@@ -2,6 +2,12 @@ export type ScanOrderLogLevel = 'info' | 'warning' | 'error' | 'debug';
 export type ScanOrderLoggerProviderType = 'feishu' | 'grafana';
 export interface ScanOrderLoggerProviderFeishuConfig {
     webhook?: string;
+    /**
+     * 节流窗口毫秒数，默认 3000ms
+     * - >0：首条日志进入队列并启动定时器，窗口结束后合并成一条 Feishu post 统一发送
+     * - <=0：关闭节流，保持每条日志立即单独发送
+     */
+    throttleMs?: number;
 }
 export interface ScanOrderLoggerProviderGrafanaConfig {
     endpoint?: string;

package/lib/modules/Summary/utils.js

@@ -423,25 +423,11 @@ var getBundleItemIsDiscountPrice = (item) => {
 var getBundleItemIsMarkupOrDiscountPrice = (item) => {
   return getBundleItemIsMarkupPrice(item) || getBundleItemIsDiscountPrice(item);
 };
-var getDiscountAmount = (discounts) => {
-  return (discounts || []).reduce((total, discount) => {
-    return total.add(new import_decimal.default(discount.amount || 0));
-  }, new import_decimal.default(0)).toNumber();
-};
 var getMainProductTotal = (item) => {
-  var _a, _b, _c, _d, _e, _f;
-  let total = new import_decimal.default((item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? item.price ?? 0);
-  const discount = ((_c = (_b = item == null ? void 0 : item._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_f = (_e = (_d = item == null ? void 0 : item._originData) == null ? void 0 : _d.product) == null ? void 0 : _e.discount_list) == null ? void 0 : _f.filter((item2) => {
-    var _a2;
-    return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
-  })) || [];
-  const mainProductDiscountAmount = getDiscountAmount(discount);
-  total = total.minus(mainProductDiscountAmount);
-  if ((item == null ? void 0 : item.option) && Array.isArray(item == null ? void 0 : item.option)) {
-    total = total.add(item == null ? void 0 : item.option.reduce((t, option) => {
-      return t.add(new import_decimal.default(option.price || 0).mul(option.num || 1));
-    }, new import_decimal.default(0)));
-  }
+  var _a, _b;
+  let total = new import_decimal.default(
+    (item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.main_product_original_price) ?? 0
+  );
   for (let bundleItem of (item == null ? void 0 : item.bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
       const bundleItemTotal = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);

package/lib/solution/ScanOrder/index.d.ts

@@ -1,6 +1,8 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity } from './types';
+import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult } from './types';
+import type { UpdateProductInOrderParams } from '../../modules/Order/types';
+import type { Discount } from '../../modules/Discount/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
 export * from './types';
@@ -29,6 +31,10 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private itemRuleRuntimeConfig;
     /** 最近一次 checkResourceAvailable 从预约规则 link 拉取的商品快照 */
     private enabledReservationRuleProducts;
+    private loginEffectDisposers;
+    private customerLoginRefreshInFlight;
+    private customerLoginRefreshIdInFlight;
+    private static readonly PISELL1_LOGIN_SUCCESS;
     private getScanOrderLoggerContext;
     private serializeError;
     private addScanOrderLog;
@@ -36,7 +42,16 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private logMethodSuccess;
     private logMethodError;
     addLog(params: ScanOrderAddLogParams): Promise<void>;
+    private normalizeCustomerId;
+    private resolveCustomerIdFromLoginPayload;
+    private clearLoginEffectListeners;
+    private registerLoginEffect;
+    private registerCustomerLoginListeners;
+    private refreshOrderMarketingAfterLogin;
     constructor(name?: string, version?: string);
+    /** 与 `otherParams.cacheId` 一致，供宿主在 URL 变化时判断是否需要重新注册模块 */
+    getCacheId(): string | undefined;
+    private destroyRegisteredChildModules;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
     retryInit(): Promise<void>;
@@ -62,14 +77,24 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     restoreOrder(): Promise<import("./types").ScanOrderTempOrder>;
     getOrderProducts(): ScanOrderOrderProduct[];
     getSummary(): Promise<import("./types").ScanOrderSummary>;
+    getDiscountList(): Discount[];
+    scanCode(code: string, customerId?: number): Promise<ScanOrderScanCodeResult>;
+    setDiscountSelected(params: {
+        discountId: number;
+        isSelected: boolean;
+    }): Promise<void>;
+    onCustomerLogin(params: {
+        customerId: number;
+    }): Promise<void>;
     private buildSubmitPayloadEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
-    updateProductInOrder(params: {
-        product_id: number | null;
-        product_variant_id: number;
-        updates: Partial<ScanOrderOrderProduct>;
-    }): Promise<ScanOrderOrderProduct[]>;
+    updateProductInOrder(params: UpdateProductInOrderParams): Promise<ScanOrderOrderProduct[]>;
+    /**
+     * 设置单行商品备注（与整单 `updateTempOrderNote` 区分）。
+     * 多行同 SKU 时必须传入与删除/更新一致的 identity（如 `identity_key`）。
+     */
+    setOrderProductLineNote(identity: ScanOrderOrderProductIdentity, note: string): Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
     private loadRuntimeConfigs;
     private syncItemRuleConfigsFromDineInConfig;