@pisell/pisellos 0.0.506 → 0.0.508

package/dist/solution/ScanOrder/types.d.ts

@@ -235,3 +235,9 @@ export interface ScanOrderLoggerRuntimeConfig {
 }
 export interface ScanOrderAddLogParams extends ScanOrderLogInput {
 }
+/** ScanOrder.scanCode 对外的轻量结果（不含 discountList，UI 在 resolve 后调 getDiscountList） */
+export interface ScanOrderScanCodeResult {
+    isAvailable: boolean;
+    type?: 'server' | string;
+    unavailableReason?: 'time_limit' | string;
+}

package/dist/solution/ScanOrder/types.js

@@ -17,4 +17,6 @@ export var ScanOrderHooks = /*#__PURE__*/function (ScanOrderHooks) {
 
 /** `resource_capacity[i].capacity_list[j]` */
 
-/** `/order/resource/occupy-detail` 单条 `occupy_details[i]` */
+/** `/order/resource/occupy-detail` 单条 `occupy_details[i]` */
+
+/** ScanOrder.scanCode 对外的轻量结果（不含 discountList，UI 在 resolve 后调 getDiscountList） */

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/solution/ScanOrder/index.d.ts

@@ -1,6 +1,7 @@
 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 { 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 +30,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,6 +41,12 @@ 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);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
@@ -62,6 +73,15 @@ 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[]>;

package/lib/solution/ScanOrder/index.js

@@ -35,8 +35,12 @@ __export(ScanOrder_exports, {
 module.exports = __toCommonJS(ScanOrder_exports);
 var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
+var import_Order = require("../../modules/Order");
+var import_types2 = require("../../modules/Account/types");
+var import_types3 = require("../RegisterAndLogin/types");
+var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("./utils");
-var import_types2 = require("../BookingByStep/types");
+var import_types4 = require("../BookingByStep/types");
 var import_ProductList = require("../../modules/ProductList");
 var import_Schedule = require("../../modules/Schedule");
 var import_getDateIsInSchedule = require("../../modules/Schedule/getDateIsInSchedule");
@@ -74,6 +78,9 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     this.itemRuleRuntimeConfig = {};
     /** 最近一次 checkResourceAvailable 从预约规则 link 拉取的商品快照 */
     this.enabledReservationRuleProducts = [];
+    this.loginEffectDisposers = [];
+    this.customerLoginRefreshInFlight = null;
+    this.customerLoginRefreshIdInFlight = null;
   }
   getScanOrderLoggerContext() {
     return {
@@ -157,6 +164,102 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       }
     });
   }
+  normalizeCustomerId(value) {
+    const customerId = Number(value);
+    if (!Number.isFinite(customerId) || customerId <= 0)
+      return null;
+    return customerId;
+  }
+  resolveCustomerIdFromLoginPayload(payload) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    const candidates = [
+      payload == null ? void 0 : payload.customerId,
+      payload == null ? void 0 : payload.customer_id,
+      payload == null ? void 0 : payload.id,
+      (_a = payload == null ? void 0 : payload.user) == null ? void 0 : _a.customerId,
+      (_b = payload == null ? void 0 : payload.user) == null ? void 0 : _b.customer_id,
+      (_c = payload == null ? void 0 : payload.user) == null ? void 0 : _c.id,
+      (_e = (_d = payload == null ? void 0 : payload.user) == null ? void 0 : _d._origin) == null ? void 0 : _e.customer_id,
+      (_f = payload == null ? void 0 : payload.account) == null ? void 0 : _f.customerId,
+      (_g = payload == null ? void 0 : payload.account) == null ? void 0 : _g.customer_id,
+      (_h = payload == null ? void 0 : payload.account) == null ? void 0 : _h.id,
+      (_i = payload == null ? void 0 : payload._origin) == null ? void 0 : _i.customer_id
+    ];
+    for (const candidate of candidates) {
+      const customerId = this.normalizeCustomerId(candidate);
+      if (customerId)
+        return customerId;
+    }
+    return null;
+  }
+  clearLoginEffectListeners() {
+    for (const dispose of this.loginEffectDisposers) {
+      dispose();
+    }
+    this.loginEffectDisposers = [];
+  }
+  registerLoginEffect(event, callback) {
+    var _a;
+    const effects = (_a = this.core) == null ? void 0 : _a.effects;
+    if (!(effects == null ? void 0 : effects.on))
+      return;
+    effects.on(event, callback);
+    this.loginEffectDisposers.push(() => {
+      if (typeof effects.off === "function") {
+        effects.off(event, callback);
+      }
+    });
+  }
+  registerCustomerLoginListeners() {
+    this.clearLoginEffectListeners();
+    const createHandleLogin = () => async (payload) => {
+      const customerId = this.resolveCustomerIdFromLoginPayload(payload);
+      if (!customerId)
+        return;
+      await this.refreshOrderMarketingAfterLogin({ customerId });
+    };
+    this.registerLoginEffect(
+      _ScanOrderImpl.PISELL1_LOGIN_SUCCESS,
+      createHandleLogin()
+    );
+    this.registerLoginEffect(import_types2.AccountHooks.OnLogin, createHandleLogin());
+    this.registerLoginEffect(
+      import_types3.RegisterAndLoginHooks.onLoginSuccess,
+      createHandleLogin()
+    );
+  }
+  async refreshOrderMarketingAfterLogin(params) {
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    if (this.customerLoginRefreshInFlight) {
+      if (this.customerLoginRefreshIdInFlight === params.customerId) {
+        await this.customerLoginRefreshInFlight;
+        return;
+      }
+      await this.customerLoginRefreshInFlight;
+    }
+    this.customerLoginRefreshIdInFlight = params.customerId;
+    const refreshTask = (async () => {
+      await this.store.order.loadDiscountConfig({
+        customerId: params.customerId
+      });
+      await this.store.order.recalculateSummary({ createIfMissing: true });
+      this.store.order.persistTempOrder();
+      await this.refreshItemRuleQuantityLimits();
+      await this.refreshCartValidationPassed();
+    })();
+    this.customerLoginRefreshInFlight = refreshTask;
+    try {
+      await refreshTask;
+    } catch (error) {
+      throw error;
+    } finally {
+      if (this.customerLoginRefreshInFlight === refreshTask) {
+        this.customerLoginRefreshInFlight = null;
+        this.customerLoginRefreshIdInFlight = null;
+      }
+    }
+  }
   async initialize(core, options = {}) {
     var _a, _b, _c, _d, _e, _f;
     this.logMethodStart("initialize");
@@ -195,7 +298,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     ];
     moduleArr.forEach((step) => {
       var _a2, _b2, _c2, _d2, _e2, _f2;
-      const targetModule = (0, import_types2.createModule)(step, this.name);
+      const targetModule = (0, import_types4.createModule)(step, this.name);
       if (targetModule) {
         this.store[step] = targetModule;
         const initialState = step === "salesSummary" ? {
@@ -236,6 +339,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         fatherModule: this.name
       }
     });
+    this.registerCustomerLoginListeners();
     console.log("[ScanOrder] 初始化开始");
     try {
       await ((_e = this.store.order) == null ? void 0 : _e.recalculateSummary({ createIfMissing: false }));
@@ -269,6 +373,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   }
   async destroy() {
     this.logMethodStart("destroy");
+    this.clearLoginEffectListeners();
     await this.core.effects.emit(import_types.ScanOrderHooks.onDestroy, {});
     console.log("[ScanOrder] 已销毁");
     this.logMethodSuccess("destroy");
@@ -494,6 +599,127 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  getDiscountList() {
+    if (!this.store.order)
+      return [];
+    return this.store.order.getDiscountList();
+  }
+  async scanCode(code, customerId) {
+    this.logMethodStart("scanCode", { code });
+    try {
+      if (!this.store.order)
+        throw new Error("order 模块未初始化");
+      const raw = await this.store.order.scanCode(code, customerId);
+      if (raw.isAvailable) {
+        await this.store.order.recalculateSummary({ createIfMissing: true });
+        this.store.order.persistTempOrder();
+      }
+      this.logMethodSuccess("scanCode", { isAvailable: raw.isAvailable });
+      return {
+        isAvailable: raw.isAvailable,
+        type: raw.type,
+        unavailableReason: raw.unavailableReason
+      };
+    } catch (error) {
+      this.logMethodError("scanCode", error);
+      throw error;
+    }
+  }
+  async setDiscountSelected(params) {
+    var _a, _b, _c;
+    this.logMethodStart("setDiscountSelected", params);
+    try {
+      if (!this.store.order)
+        throw new Error("order 模块未初始化");
+      const list = this.store.order.getDiscountList();
+      const updated = list.map(
+        (d) => d.id === params.discountId ? {
+          ...d,
+          isSelected: params.isSelected,
+          isManualSelect: !params.isSelected
+        } : d
+      );
+      const tempOrder = this.store.order.ensureTempOrder();
+      const orderStore = this.store.order.store || {};
+      const discountModule = orderStore.discount;
+      const rulesModule = orderStore.rules;
+      const holders = ((_a = tempOrder.holder) == null ? void 0 : _a.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+      let nextDiscountList = updated;
+      await (discountModule == null ? void 0 : discountModule.setDiscountList(updated));
+      if (rulesModule) {
+        const result = rulesModule.calcDiscount(
+          {
+            productList: tempOrder.products,
+            discountList: updated,
+            holders,
+            isFormSubject: !!((_b = tempOrder.holder) == null ? void 0 : _b.type) && tempOrder.holder.type === "form"
+          },
+          {
+            discountId: params.discountId,
+            isSelected: params.isSelected
+          }
+        ) || { productList: tempOrder.products, discountList: updated };
+        if (result == null ? void 0 : result.productList) {
+          tempOrder.products = result.productList;
+        }
+        if (result == null ? void 0 : result.discountList) {
+          nextDiscountList = result.discountList;
+          if (!params.isSelected) {
+            const beforeSelectedIds = new Set(
+              updated.filter((d) => d.isSelected).map((d) => d.id)
+            );
+            for (const d of nextDiscountList) {
+              if (d.isSelected && !beforeSelectedIds.has(d.id)) {
+                d.isSelected = false;
+              }
+            }
+          }
+        }
+      }
+      const selectedResourceIds = new Set(
+        nextDiscountList.filter((d) => d.isSelected).map((d) => d.id)
+      );
+      for (const product of tempOrder.products) {
+        if ((_c = product._origin) == null ? void 0 : _c.isManualDiscount)
+          continue;
+        product.discount_list = (product.discount_list || []).filter((pd) => {
+          var _a2;
+          const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;
+          return rid != null && selectedResourceIds.has(rid);
+        });
+        const totalPerUnitDiscount = (product.discount_list || []).reduce(
+          (sum, pd) => sum + (pd.amount || 0),
+          0
+        );
+        const newSellingPrice = new import_decimal.default(product.original_price || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+        product.selling_price = newSellingPrice;
+        if (product.metadata) {
+          product.metadata.main_product_selling_price = newSellingPrice;
+        }
+      }
+      import_Order.OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
+      await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
+      tempOrder.discount_list = (nextDiscountList || []).filter((d) => d.isSelected);
+      await this.store.order.recalculateSummary({ createIfMissing: true });
+      this.store.order.persistTempOrder();
+      this.logMethodSuccess("setDiscountSelected", params);
+    } catch (error) {
+      this.logMethodError("setDiscountSelected", error);
+      throw error;
+    }
+  }
+  async onCustomerLogin(params) {
+    this.logMethodStart("onCustomerLogin", { customerId: params.customerId });
+    try {
+      await this.refreshOrderMarketingAfterLogin({
+        customerId: params.customerId
+      });
+      this.logMethodSuccess("onCustomerLogin", { customerId: params.customerId });
+    } catch (error) {
+      this.logMethodError("onCustomerLogin", error);
+      throw error;
+    }
+  }
   // ScanOrder 提交 payload enhancer：
   // - 给所有 booking 注入 appointment_status: 'started'（扫码点餐语义）
   // - 给所有 booking 的 metadata 注入 resource_select_type（来自预约规则商品的 resource.type）
@@ -1499,6 +1725,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   }
 };
 var ScanOrderImpl = _ScanOrderImpl;
+ScanOrderImpl.PISELL1_LOGIN_SUCCESS = "pisell1.login.success";
 // ─── UI 状态缓存（按 cacheId 分桶，sessionStorage） ───
 //
 // 用于物料层持久化 UI 层面的轻量状态（如当前步骤、gate 标记、登录回跳意图等）。

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

@@ -235,3 +235,9 @@ export interface ScanOrderLoggerRuntimeConfig {
 }
 export interface ScanOrderAddLogParams extends ScanOrderLogInput {
 }
+/** ScanOrder.scanCode 对外的轻量结果（不含 discountList，UI 在 resolve 后调 getDiscountList） */
+export interface ScanOrderScanCodeResult {
+    isAvailable: boolean;
+    type?: 'server' | string;
+    unavailableReason?: 'time_limit' | string;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.506",
+  "version": "0.0.508",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",