@pisell/pisellos 2.1.129 → 2.1.131

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, ScanOrderTableConfigApiData } 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,14 +42,23 @@ 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>;
     refresh(): Promise<void>;
     getStatus(): import("./types").ScanOrderStatus;
     getEntryContext(): import("./types").ScanOrderEntryContext | null;
-    getConfig(): ScanOrderTableConfigApiData;
+    getConfig(): Record<string, any>;
     getItemRuleQuantityLimits(): QuantityLimitResult[];
     getCartValidationPassed(): boolean | null;
     getCartValidation(): {
@@ -52,17 +67,34 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     };
     getTempOrder(): import("./types").ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): string;
+    setPickupReferenceMode(mode: 'counter_pickup' | 'table_service'): {
+        service_type: 'dine_in';
+        pickup_reference_mode: 'counter_pickup' | 'table_service';
+    };
+    setPickupRef(buzzer: string): string;
     private ensureTempOrder;
     addNewOrder(): Promise<import("./types").ScanOrderTempOrder>;
+    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;
@@ -78,7 +110,8 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private refreshCartValidationPassed;
     setItemRuleRuntimeConfig(config?: ScanOrderItemRuleRuntimeConfig): Promise<void>;
     private normalizeResourceState;
-    private fetchTableConfigByResourceId;
+    private resolveResourceSelectType;
+    private fetchResourceOccupyDetailByResourceId;
     checkResourceAvailable(resourceId: string, hasOrderId: boolean): Promise<ScanOrderAvailabilityInfo>;
     getAdditionalOrderInfo(): Promise<{
         orderId: string;
@@ -92,6 +125,22 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;
     }): Promise<void>;
+    private static readonly UI_STATE_KEY_PREFIX;
+    private getUIStateBucketKey;
+    private readUIStateBucket;
+    private writeUIStateBucket;
+    setUIState(key: string, value: any): void;
+    getUIState<T = any>(key: string): T | undefined;
+    deleteUIState(key: string): void;
+    clearUIState(): void;
     setEntryPaxNumber(number: number): Promise<void>;
     getEntryPaxNumber(): number | null;
+    getFulfillmentModes(): {
+        enablePickup: boolean;
+        enableTableService: boolean;
+    };
+    checkManualPickupRef(): {
+        enabled: boolean;
+        manualInputType?: string;
+    };
 }