@pisell/pisellos 2.3.2 → 2.3.4

package/dist/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -136,6 +136,12 @@ function resolveProductTitle(product, booking, sourceProduct) {
   const metadata = product.metadata || {};
   return (sourceProduct == null ? void 0 : sourceProduct.title) ?? (sourceProduct == null ? void 0 : sourceProduct.name) ?? metadata.product_title ?? metadata.product_name ?? ((_a = booking == null ? void 0 : booking.product) == null ? void 0 : _a.title) ?? ((_b = booking == null ? void 0 : booking.detail) == null ? void 0 : _b.product_title) ?? "";
 }
+function resolveMainProductPrice(product, fallback) {
+  const metadata = product.metadata || {};
+  const value = metadata.main_product_original_price ?? metadata.source_product_price;
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : fallback;
+}
 function synthesizeProductResourceFromBooking(booking) {
   const rows = booking == null ? void 0 : booking.resources;
   if (!Array.isArray(rows) || rows.length === 0)
@@ -172,6 +178,7 @@ function buildCacheItemFromOrderLine(input) {
   const resolvedId = product.product_id ?? (sourceProduct == null ? void 0 : sourceProduct.id);
   const selling = Number(product.selling_price ?? 0);
   const original = Number(product.original_price ?? selling);
+  const mainProductPrice = resolveMainProductPrice(product, selling);
   const startDate = safeFormat(booking.start_date, "YYYY-MM-DD");
   const endDate = safeFormat(booking.end_date, "YYYY-MM-DD");
   const startTime = normalizeTimeString(booking.start_time);
@@ -198,7 +205,7 @@ function buildCacheItemFromOrderLine(input) {
     quantity: product.num ?? 1,
     product_name: productTitle,
     note: product.note ?? ((_b = booking == null ? void 0 : booking.detail) == null ? void 0 : _b.note) ?? "",
-    price: selling,
+    price: mainProductPrice,
     total: selling,
     origin_total: original,
     resource,

package/lib/modules/Order/index.d.ts

@@ -431,7 +431,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -3892,8 +3892,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async getOrderInfo(order_id) {
     const res = await this.request.get(`/order/sales/${order_id}`, {
       with: ["products", "bookings"]
-    }, {
-      osServer: true
     });
     return res;
   }

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

@@ -168,6 +168,12 @@ export interface ProductData {
     product_resource?: {
         resources?: ProductResourceItem[];
     };
+    /** 商品级持有人配置，resource_id 对应 holder 表单 id */
+    holder_config?: {
+        status?: string;
+        required?: number | string | boolean;
+        resource_id?: number | string | null;
+    };
     /** 组合商品id，动态附加 */
     product_variant_id?: number;
     /** 套餐信息 */

package/lib/server/modules/order/index.d.ts

@@ -15,7 +15,6 @@ export declare class OrderModule extends BaseModule implements Module {
     private syncTimer?;
     private isProcessingSyncBatch;
     private isIdlePhase;
-    private resourceIdIndex;
     private logger;
     private storage;
     private orderSQLiteSaveQueue; /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
@@ -32,10 +31,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private emitOrdersChanged;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
-     * 记录信息日志
-     * @param title 日志标题
-     * @param metadata 日志元数据
-     */
+   * 记录信息日志
+   * @param title 日志标题
+   * @param metadata 日志元数据
+   */
     private logInfo;
     /**
      * 记录错误日志
@@ -89,7 +88,6 @@ export declare class OrderModule extends BaseModule implements Module {
      * @returns 刷新后的订单列表
      */
     silentRefresh(): Promise<OrderData[]>;
-    getOrdersByResourceId(resourceId: string | number): OrderData[];
     private normalizeOrderForMemoryList;
     /**
      * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
@@ -126,7 +124,6 @@ export declare class OrderModule extends BaseModule implements Module {
     private isBlankIdentityValue;
     private getOrderIdentityEntries;
     private getOrderIdentityKeys;
-    private extractResourceIds;
     private getOrderDateKey;
     /**
      * 初始化 OrderDataSource 实例
@@ -175,6 +172,27 @@ export declare class OrderModule extends BaseModule implements Module {
      * 将增量订单合并到 store
      */
     private mergeOrdersToStore;
+    /**
+     * 在身份索引中查找与目标订单共享任一身份键的已存在订单下标。
+     * 返回所有命中键里最小的下标，等价于原 findOrderIndexByIdentity 的「取首个匹配」语义。
+     *
+     * @example
+     * const idx = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys)
+     */
+    private lookupOrderIndexByIdentityKeys;
+    /**
+     * 将订单的全部身份键登记到索引并指向其在列表中的下标。
+     * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。
+     *
+     * @example
+     * this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex)
+     */
+    private registerOrderIdentityKeys;
+    /**
+     * 合并热路径去重兜底：默认直接返回原列表（增量索引已保证无重复）。
+     * 仅当 ORDER_MERGE_SELF_CHECK 开启时，额外做一次全表压缩并在发现残留重复时告警。
+     */
+    private runOrderStoreSelfCheck;
     private normalizeOrderSyncMessage;
     private normalizeOrderSyncPayload;
     private uniqueOrderIds;

package/lib/server/modules/order/index.js

@@ -48,6 +48,7 @@ var ORDER_BUSINESS_WRITE_SOURCES = /* @__PURE__ */ new Set([
   "overwriteExistingOrder",
   "markOrderSyncedByExternalSaleNumber"
 ]);
+var ORDER_MERGE_SELF_CHECK = false;
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -56,8 +57,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.pendingSyncMessages = [];
     this.isProcessingSyncBatch = false;
     this.isIdlePhase = true;
-    // Map<resource_id, OrderId[]> 资源到订单的倒排索引
-    this.resourceIdIndex = /* @__PURE__ */ new Map();
     this.orderSQLiteSaveQueue = Promise.resolve();
     /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
     this.recentSqliteWriteByStorageKey = /* @__PURE__ */ new Map();
@@ -110,10 +109,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   /**
-   * 记录信息日志
-   * @param title 日志标题
-   * @param metadata 日志元数据
-   */
+  * 记录信息日志
+  * @param title 日志标题
+  * @param metadata 日志元数据
+  */
   logInfo(title, metadata) {
     try {
       if (this.logger) {
@@ -481,10 +480,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return this.store.list;
     }
   }
-  getOrdersByResourceId(resourceId) {
-    const ids = this.resourceIdIndex.get(String(resourceId)) || [];
-    return ids.map((id) => this.store.map.get(id)).filter((order) => !!order);
-  }
   normalizeOrderForMemoryList(order) {
     const externalSaleNumber = order == null ? void 0 : order.external_sale_number;
     if ((order == null ? void 0 : order.order_id) !== void 0 && (order == null ? void 0 : order.order_id) !== null && (order == null ? void 0 : order.order_id) !== "") {
@@ -617,22 +612,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const patchedOrders = [...pendingMap.values()];
     const mergeActions = {};
     const updatedList = [...this.store.list];
+    const identityKeyToIndex = /* @__PURE__ */ new Map();
+    for (let index = 0; index < updatedList.length; index += 1) {
+      for (const key of this.getOrderIdentityMatchKeys(updatedList[index])) {
+        if (!identityKeyToIndex.has(key))
+          identityKeyToIndex.set(key, index);
+      }
+    }
     for (const [storageKey, pendingOrder] of memoryPendingMap.entries()) {
-      const matchIndex = this.findOrderIndexByIdentity(updatedList, pendingOrder);
-      if (matchIndex < 0)
+      const matchIndex = this.lookupOrderIndexByIdentityKeys(
+        identityKeyToIndex,
+        this.getOrderIdentityMatchKeys(pendingOrder)
+      );
+      if (matchIndex >= 0) {
+        const mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder, {
+          preferIncomingProducts: true
+        });
+        updatedList[matchIndex] = mergedOrder;
+        this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
+        mergeActions[storageKey] = "update";
         continue;
-      updatedList[matchIndex] = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder, {
-        preferIncomingProducts: true
-      });
-      pendingMap.delete(storageKey);
-      memoryPendingMap.delete(storageKey);
-      mergeActions[storageKey] = "update";
-    }
-    for (const [storageKey, order] of memoryPendingMap.entries()) {
+      }
+      const insertIndex = updatedList.length;
+      updatedList.push(pendingOrder);
+      this.registerOrderIdentityKeys(identityKeyToIndex, pendingOrder, insertIndex);
       mergeActions[storageKey] = "insert";
-      updatedList.push(order);
     }
-    this.store.list = this.compactOrderListByIdentity(updatedList, "upsertPendingSyncOrders.store").list;
+    this.store.list = this.runOrderStoreSelfCheck(updatedList, "upsertPendingSyncOrders.store");
     this.syncOrdersMap();
     await this.patchOrdersInSQLite(patchedOrders, "upsertPendingSyncOrders", mergeActions);
     this.logInfo("upsertPendingSyncOrders-结束", {
@@ -674,21 +680,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   syncOrdersMap() {
     this.store.map.clear();
-    this.resourceIdIndex.clear();
     for (const order of this.store.list) {
       const primaryIdentity = this.getOrderMapKey(order);
       if (!primaryIdentity)
         continue;
       this.store.map.set(primaryIdentity, order);
-      const resourceIds = this.extractResourceIds(order);
-      for (const resourceId of resourceIds) {
-        const key = String(resourceId);
-        const existing = this.resourceIdIndex.get(key) || [];
-        if (existing.some((eid) => this.getIdKey(eid) === primaryIdentity))
-          continue;
-        existing.push(primaryIdentity);
-        this.resourceIdIndex.set(key, existing);
-      }
     }
   }
   getOrderMapKey(order) {
@@ -735,24 +731,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return keys;
   }
-  extractResourceIds(order) {
-    const ids = /* @__PURE__ */ new Set();
-    const visitResources = (resources) => {
-      if (!Array.isArray(resources))
-        return;
-      resources.forEach((resource) => {
-        const rid = resource == null ? void 0 : resource.relation_id;
-        if (rid !== void 0 && rid !== null && rid !== "")
-          ids.add(String(rid));
-        if (Array.isArray(resource == null ? void 0 : resource.children))
-          visitResources(resource.children);
-      });
-    };
-    if (Array.isArray(order == null ? void 0 : order.bookings)) {
-      order.bookings.forEach((booking) => visitResources((booking == null ? void 0 : booking.resources) || []));
-    }
-    return [...ids];
-  }
   getOrderDateKey(order) {
     var _a, _b, _c, _d;
     const candidates = [
@@ -971,9 +949,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 将增量订单合并到 store
    */
   async mergeOrdersToStore(freshOrders, source) {
+    const storeOrderCountBefore = this.store.list.length;
     this.logInfo("mergeOrdersToStore-开始", {
       freshOrderCount: freshOrders.length,
-      storeOrderCountBefore: this.store.list.length,
+      storeOrderCountBefore,
       source
     });
     this.logDuplicateOrders(`${source}.beforeMerge`, this.store.list);
@@ -992,19 +971,31 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const patchedOrders = [];
     const mergeActions = {};
     const updatedList = [...this.store.list];
+    const identityKeyToIndex = /* @__PURE__ */ new Map();
+    for (let index = 0; index < updatedList.length; index += 1) {
+      const identityKeys = this.getOrderIdentityMatchKeys(updatedList[index]);
+      for (const key of identityKeys) {
+        if (!identityKeyToIndex.has(key))
+          identityKeyToIndex.set(key, index);
+      }
+    }
     for (const fresh of uniqueFreshOrders) {
-      const matchIndex = this.findOrderIndexByIdentity(updatedList, fresh);
+      const freshIdentityKeys = this.getOrderIdentityMatchKeys(fresh);
+      const matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys);
       const storageKey = this.getOrderStorageKey(fresh);
       const mergeKey = storageKey || (fresh.order_id !== void 0 && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : "");
       if (matchIndex >= 0) {
         const mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], fresh);
         updatedList[matchIndex] = mergedOrder;
+        this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
         patchedOrders.push(mergedOrder);
         if (mergeKey)
           mergeActions[mergeKey] = "update";
         continue;
       }
+      const insertIndex = updatedList.length;
       updatedList.push(fresh);
+      this.registerOrderIdentityKeys(identityKeyToIndex, fresh, insertIndex);
       patchedOrders.push(fresh);
       if (mergeKey)
         mergeActions[mergeKey] = "insert";
@@ -1016,7 +1007,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       updateCount,
       storeOrderCountAfter: this.store.list.length
     });
-    this.store.list = this.compactOrderListByIdentity(updatedList, `${source}.store`).list;
+    this.store.list = this.runOrderStoreSelfCheck(updatedList, `${source}.store`);
     this.syncOrdersMap();
     await this.patchOrdersInSQLite(patchedOrders, source, mergeActions);
     this.logInfo("mergeOrdersToStore-结束", {
@@ -1027,6 +1018,50 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     await this.emitOrdersChanged(patchedOrders, source);
   }
+  /**
+   * 在身份索引中查找与目标订单共享任一身份键的已存在订单下标。
+   * 返回所有命中键里最小的下标，等价于原 findOrderIndexByIdentity 的「取首个匹配」语义。
+   *
+   * @example
+   * const idx = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys)
+   */
+  lookupOrderIndexByIdentityKeys(identityKeyToIndex, identityKeys) {
+    let matchIndex = -1;
+    for (const key of identityKeys) {
+      const index = identityKeyToIndex.get(key);
+      if (index === void 0)
+        continue;
+      if (matchIndex < 0 || index < matchIndex)
+        matchIndex = index;
+    }
+    return matchIndex;
+  }
+  /**
+   * 将订单的全部身份键登记到索引并指向其在列表中的下标。
+   * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。
+   *
+   * @example
+   * this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex)
+   */
+  registerOrderIdentityKeys(identityKeyToIndex, order, index) {
+    const identityKeys = this.getOrderIdentityMatchKeys(order);
+    for (const key of identityKeys) {
+      identityKeyToIndex.set(key, index);
+    }
+  }
+  /**
+   * 合并热路径去重兜底：默认直接返回原列表（增量索引已保证无重复）。
+   * 仅当 ORDER_MERGE_SELF_CHECK 开启时，额外做一次全表压缩并在发现残留重复时告警。
+   */
+  runOrderStoreSelfCheck(orders, source) {
+    if (!ORDER_MERGE_SELF_CHECK)
+      return orders;
+    const { list, removedCount } = this.compactOrderListByIdentity(orders, source);
+    if (removedCount > 0) {
+      this.logWarning("合并自检发现残留重复订单，已压缩", { source, removedCount });
+    }
+    return list;
+  }
   normalizeOrderSyncMessage(res) {
     const data = (res == null ? void 0 : res.data) || res;
     if (!data)
@@ -1640,7 +1675,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async clear() {
     this.store.list = [];
     this.store.map = /* @__PURE__ */ new Map();
-    this.resourceIdIndex.clear();
     if (this.dbManager) {
       await this.runInOrderSQLiteSaveQueue(async () => {
         await this.dbManager.clear(INDEXDB_STORE_NAME);

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

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