@pisell/pisellos 2.3.1 → 2.3.3

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

@@ -1,6 +1,7 @@
 import { OrderModule, ProductList, QuotationModule, SalesSummaryModule, ScanOrderLoggerModule as BaseSalesLoggerModule, ScheduleModule } from '../../modules';
 import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderConfig as BaseSalesLoggerProviderConfig, ScanOrderLoggerProviderType as BaseSalesLoggerProviderType } from '../../modules/ScanOrderLogger/types';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
+import type { QuotationCustomerScopeInfo } from '../../modules/Quotation/types';
 /**
  * BaseSales 流程 hook 后缀。
  * 完整事件名应由当前模块名动态拼接，避免多个实例共享固定事件 key。
@@ -278,6 +279,12 @@ export interface BaseSalesProductBookingPriceResult {
     segments: BaseSalesProductBookingPriceSegment[];
     product_bundle?: BaseSalesBundleProductBookingPriceResult[];
 }
+export type BaseSalesQuotationCustomerScopeInfo = QuotationCustomerScopeInfo;
+export interface BaseSalesPriceRecalculationContextChange {
+    previousCustomerId?: number | string | null;
+    nextCustomerId?: number | string | null;
+    [key: string]: any;
+}
 export type BaseSalesAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
 export interface BaseSalesTableFormRecord {
     policy?: string | null;

package/dist/solution/BaseSales/utils/quotationPrice.d.ts

@@ -1,7 +1,18 @@
 import type { QuotationModule } from '../../../modules/Quotation';
 import type { BaseSalesCalculateProductBookingPriceParams, BaseSalesProductBookingPriceResult } from '../types';
 interface BuildBaseSalesQuotationPriceParams extends BaseSalesCalculateProductBookingPriceParams {
-    quotation?: Pick<QuotationModule, 'getPriceForProduct' | 'getQuotationShelfId'> | null;
+    quotation?: (Pick<QuotationModule, 'getPriceForProduct' | 'getQuotationShelfId'> & {
+        getQuotationMatchForProduct?: (params: {
+            productId: number;
+            variantId?: number;
+            datetime: string;
+            channel?: string;
+            customer_id?: number | string;
+        }) => {
+            price: string | null;
+            quotationShelfId: number;
+        } | null;
+    }) | null;
 }
 export declare function calculateBaseSalesProductBookingPrice(params: BuildBaseSalesQuotationPriceParams): BaseSalesProductBookingPriceResult;
 export {};

package/dist/solution/BaseSales/utils/quotationPrice.js

@@ -118,20 +118,30 @@ function formatTimePoint(datetime) {
   return datetime.format('YYYY-MM-DD HH:mm:ss');
 }
 function buildPriceSegment(params) {
+  var _match$quotationShelf;
   var timePoint = formatTimePoint(params.segment.start);
-  var quotedPrice = params.quotation && params.productId !== null ? params.quotation.getPriceForProduct({
+  var match = params.quotation && params.productId !== null && params.quotation.getQuotationMatchForProduct ? params.quotation.getQuotationMatchForProduct({
     productId: params.productId,
     variantId: params.variantId,
     datetime: timePoint,
+    channel: params.channel,
+    customer_id: params.customerId
+  }) : null;
+  var quotedPrice = match ? match.price : params.quotation && params.productId !== null ? params.quotation.getPriceForProduct({
+    productId: params.productId,
+    variantId: params.variantId,
+    datetime: timePoint,
+    channel: params.channel,
     customer_id: params.customerId
   }) : null;
   var unitPrice = toPriceString(quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : params.fallbackPrice);
-  var quotationShelfId = quotedPrice !== null && params.quotation && params.productId !== null ? params.quotation.getQuotationShelfId({
+  var quotationShelfId = quotedPrice !== null ? (_match$quotationShelf = match === null || match === void 0 ? void 0 : match.quotationShelfId) !== null && _match$quotationShelf !== void 0 ? _match$quotationShelf : params.quotation && params.productId !== null ? params.quotation.getQuotationShelfId({
     productId: params.productId,
     variantId: params.variantId,
     datetime: timePoint,
+    channel: params.channel,
     customer_id: params.customerId
-  }) : 0;
+  }) : 0 : 0;
   return {
     start_datetime: timePoint,
     end_datetime: params.segment.end ? formatTimePoint(params.segment.end) : undefined,
@@ -151,6 +161,7 @@ function calculatePriceForProduct(params) {
       productId: params.productId,
       variantId: params.variantId,
       customerId: params.customerId,
+      channel: params.channel,
       fallbackPrice: params.fallbackPrice,
       segment: segment
     });
@@ -183,6 +194,7 @@ function calculateBundlePrices(params, segments) {
       productId: productId,
       variantId: variantId,
       customerId: params.customer_id,
+      channel: params.channel,
       quantity: quantity,
       fallbackPrice: getBundleFallbackPrice(bundle),
       segments: segments
@@ -216,6 +228,7 @@ export function calculateBaseSalesProductBookingPrice(params) {
     productId: productId,
     variantId: variantId,
     customerId: params.customer_id,
+    channel: params.channel,
     quantity: productQuantity,
     fallbackPrice: fallbackPrice,
     segments: timeSegments

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 | 1 | 2 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -358,7 +358,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private hasGoodPassDiscount;
     private getBundleRuntimeIdentity;
     private preservePersistedBundlePriceFields;
+    private applyOrderProductUpdateToTempOrder;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<OrderProduct[]>;
+    updateOrderProducts(paramsList: UpdateOrderProductParams[]): Promise<OrderProduct[]>;
     updateOrderProductQuantity(params: UpdateOrderProductQuantityParams): Promise<OrderProduct[]>;
     updateOrderBooking(params: UpdateOrderBookingParams): any[];
     /**
@@ -479,6 +481,13 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     hydrateTempOrderFromRecord(record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
     }): Promise<OrderTempOrder>;
+    /**
+     * 兼容后端详情将 holder 放在 metadata.holder 的历史形态，统一补到运行时展示路径。
+     *
+     * @example
+     * this.normalizeHydratedBookingHolder({ metadata: { holder: { form_record: [1] } } });
+     */
+    private normalizeHydratedBookingHolder;
     private normalizeTempOrderForRuntime;
     private hydrateLinkedBookingIdentity;
     private pickHydratedDisplayText;

package/lib/modules/Order/index.js

@@ -2683,7 +2683,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       };
     });
   }
-  async updateOrderProduct(params) {
+  applyOrderProductUpdateToTempOrder(tempOrder, params) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     const {
       product_id,
@@ -2695,7 +2695,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       product_bundle,
       booking
     } = params;
-    const tempOrder = this.ensureTempOrder();
     const identityLookup = {
       product_id,
       product_variant_id
@@ -2839,6 +2838,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder.products[productIndex],
       (_q = tempOrder.products[productIndex].metadata) == null ? void 0 : _q.unique_identification_number
     );
+  }
+  async updateOrderProduct(params) {
+    const tempOrder = this.ensureTempOrder();
+    this.applyOrderProductUpdateToTempOrder(tempOrder, params);
     await this.applyPromotion();
     this.applyDiscount();
     this.sanitizeTempOrderProducts(tempOrder);
@@ -2846,6 +2849,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.persistTempOrder();
     return tempOrder.products;
   }
+  async updateOrderProducts(paramsList) {
+    const tempOrder = this.ensureTempOrder();
+    if (!paramsList.length) {
+      return tempOrder.products;
+    }
+    paramsList.forEach((params) => {
+      this.applyOrderProductUpdateToTempOrder(tempOrder, params);
+    });
+    await this.finalizeAfterProductsMutation(tempOrder);
+    return tempOrder.products;
+  }
   async updateOrderProductQuantity(params) {
     var _a;
     const {
@@ -3634,6 +3648,30 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.persistTempOrder();
     return nextTempOrder;
   }
+  /**
+   * 兼容后端详情将 holder 放在 metadata.holder 的历史形态，统一补到运行时展示路径。
+   *
+   * @example
+   * this.normalizeHydratedBookingHolder({ metadata: { holder: { form_record: [1] } } });
+   */
+  normalizeHydratedBookingHolder(booking) {
+    const next = { ...booking || {} };
+    const metadata = next.metadata && typeof next.metadata === "object" && !Array.isArray(next.metadata) ? { ...next.metadata } : {};
+    const metadataHolder = metadata.holder && typeof metadata.holder === "object" && !Array.isArray(metadata.holder) ? metadata.holder : null;
+    if (!next.holder && metadataHolder) {
+      next.holder = { ...metadataHolder };
+    }
+    const holder = next.holder && typeof next.holder === "object" && !Array.isArray(next.holder) ? next.holder : null;
+    const holderRecords = Array.isArray(holder == null ? void 0 : holder.form_record) ? holder.form_record.filter((id) => id !== void 0 && id !== null && id !== "") : [];
+    const hasMetadataHolderId = metadata.holder_id !== void 0 && metadata.holder_id !== null && metadata.holder_id !== "" && (!Array.isArray(metadata.holder_id) || metadata.holder_id.length > 0);
+    if (!hasMetadataHolderId && holderRecords.length > 0) {
+      metadata.holder_id = holderRecords;
+    }
+    if (Object.keys(metadata).length > 0) {
+      next.metadata = metadata;
+    }
+    return next;
+  }
   normalizeTempOrderForRuntime(raw, options) {
     var _a, _b;
     const nextTempOrder = {
@@ -3660,11 +3698,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     nextTempOrder.holder = raw.holder && typeof raw.holder === "object" ? { ...raw.holder } : null;
     const rawProducts = Array.isArray(raw.products) ? raw.products : [];
     nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map((p) => this.normalizeHydratedOrderProduct(p)) : [];
-    nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map((b) => ({
-      ...b || {},
-      is_all: (0, import_utils.normalizeBookingIsAll)(b || {}),
-      sub_type: (0, import_utils.normalizeBookingSubType)(b || {})
-    })) : [];
+    nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map((b) => {
+      const booking = this.normalizeHydratedBookingHolder(b || {});
+      return {
+        ...booking,
+        is_all: (0, import_utils.normalizeBookingIsAll)(booking),
+        sub_type: (0, import_utils.normalizeBookingSubType)(booking)
+      };
+    }) : [];
     nextTempOrder.payments = Array.isArray(raw.payments) ? raw.payments.map((p) => ({ ...p || {} })) : [];
     nextTempOrder.surcharges = Array.isArray(raw.surcharges) ? raw.surcharges.map((s) => ({ ...s || {} })) : [];
     nextTempOrder.relation_forms = Array.isArray(raw.relation_forms) ? raw.relation_forms.map((f) => ({ ...f || {} })) : [];
@@ -3851,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/Order/types.d.ts

@@ -666,6 +666,8 @@ export interface OrderModuleAPI {
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
     addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput) => Promise<OrderProduct[]>;
     updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
+    /** 批量更新购物车行，末尾仅触发一次促销重算与 summary 刷新 */
+    updateOrderProducts: (paramsList: UpdateOrderProductParams[]) => Promise<OrderProduct[]>;
     updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
     removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;

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

@@ -1,8 +1,8 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import type { ScheduleItem } from '../Schedule/types';
-import type { QuotationItem } from './types';
-export type { QuotationItem, QuotationProductData, QuotationSchedule, QuotationState, QuotationCustomer } from './types';
+import type { QuotationItem, QuotationCustomerScopeInfo } from './types';
+export type { QuotationItem, QuotationProductData, QuotationSchedule, QuotationState, QuotationCustomer, QuotationCustomerScope, QuotationCustomerScopeInfo, } from './types';
 export declare class QuotationModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -16,6 +16,7 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Promise<void>;
     getQuotationList(): QuotationItem[];
+    getQuotationCustomerScopeInfo(): QuotationCustomerScopeInfo;
     /**
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
@@ -28,12 +29,24 @@ export declare class QuotationModule extends BaseModule implements Module {
         productId: number;
         variantId?: number;
         datetime: string;
+        channel?: string;
         customer_id?: number | string;
     }): string | null;
+    getQuotationMatchForProduct(params: {
+        productId: number;
+        variantId?: number;
+        datetime: string;
+        channel?: string;
+        customer_id?: number | string;
+    }): {
+        price: string | null;
+        quotationShelfId: number;
+    } | null;
     getQuotationShelfId(params: {
         productId: number;
         variantId?: number;
         datetime: string;
+        channel?: string;
         customer_id?: number | string;
     }): number;
     /**
@@ -49,6 +62,7 @@ export declare class QuotationModule extends BaseModule implements Module {
     setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
     private isQuotationVisibleForCustomer;
     private hasValidCustomerId;
+    private normalizeCustomerId;
     private isQuotationActiveAt;
     private findProductData;
 }

package/lib/modules/Quotation/index.js

@@ -58,6 +58,40 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
   getQuotationList() {
     return this.store.list;
   }
+  getQuotationCustomerScopeInfo() {
+    const customerById = /* @__PURE__ */ new Map();
+    const quotationScopes = this.store.list.filter((quotation) => Array.isArray(quotation.customer) && quotation.customer.length > 0).map((quotation) => {
+      const customerIds = [];
+      const customers = [];
+      const localSeen = /* @__PURE__ */ new Set();
+      const quotationCustomers = quotation.customer || [];
+      quotationCustomers.forEach((customer) => {
+        const customerId = this.normalizeCustomerId(customer == null ? void 0 : customer.id);
+        if (!customerId || localSeen.has(customerId))
+          return;
+        localSeen.add(customerId);
+        customerIds.push(customerId);
+        customers.push(customer);
+        if (!customerById.has(customerId))
+          customerById.set(customerId, customer);
+      });
+      return {
+        quotationId: quotation.id,
+        quotationName: quotation.name,
+        customerIds,
+        customers
+      };
+    });
+    const result = {
+      quotationCount: this.store.list.length,
+      hasCustomerScopedQuotations: quotationScopes.length > 0,
+      allQuotationsCustomerScoped: this.store.list.length > 0 && quotationScopes.length === this.store.list.length,
+      customerIds: Array.from(customerById.keys()),
+      customers: Array.from(customerById.values()),
+      quotationScopes
+    };
+    return result;
+  }
   /**
    * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
    * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
@@ -67,6 +101,10 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
    * the requested productId wins.
    */
   getPriceForProduct(params) {
+    var _a;
+    return ((_a = this.getQuotationMatchForProduct(params)) == null ? void 0 : _a.price) ?? null;
+  }
+  getQuotationMatchForProduct(params) {
     const { productId, variantId, datetime, customer_id } = params;
     for (const quotation of this.store.list) {
       const visible = this.isQuotationVisibleForCustomer(quotation, customer_id);
@@ -80,23 +118,16 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
         continue;
       if (match.value === 0)
         continue;
-      return String(match.value);
+      return {
+        price: String(match.value),
+        quotationShelfId: quotation.id
+      };
     }
     return null;
   }
   getQuotationShelfId(params) {
-    const { productId, variantId, datetime, customer_id } = params;
-    for (const quotation of this.store.list) {
-      if (!this.isQuotationVisibleForCustomer(quotation, customer_id))
-        continue;
-      if (!this.isQuotationActiveAt(quotation, datetime))
-        continue;
-      const match = this.findProductData(quotation.product_data, productId, variantId);
-      if (!match || match.value === 0)
-        continue;
-      return quotation.id;
-    }
-    return 0;
+    var _a;
+    return ((_a = this.getQuotationMatchForProduct(params)) == null ? void 0 : _a.quotationShelfId) ?? 0;
   }
   /**
    * Batch pre-compute quotation prices for a set of products across multiple time points.
@@ -138,6 +169,11 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
       return false;
     return Number(customerId) > 0;
   }
+  normalizeCustomerId(customerId) {
+    if (customerId === void 0 || customerId === null || customerId === "")
+      return null;
+    return String(customerId);
+  }
   isQuotationActiveAt(quotation, datetime) {
     var _a;
     if (!((_a = quotation.schedule) == null ? void 0 : _a.length))

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

@@ -45,3 +45,17 @@ export interface QuotationItem {
 export interface QuotationState {
     list: QuotationItem[];
 }
+export interface QuotationCustomerScope {
+    quotationId: number;
+    quotationName: string;
+    customerIds: string[];
+    customers: QuotationCustomer[];
+}
+export interface QuotationCustomerScopeInfo {
+    quotationCount: number;
+    hasCustomerScopedQuotations: boolean;
+    allQuotationsCustomerScoped: boolean;
+    customerIds: string[];
+    customers: QuotationCustomer[];
+    quotationScopes: QuotationCustomerScope[];
+}

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

@@ -29,6 +29,7 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
     }): Promise<{
         tax_title: string;
         tax_rate: number | undefined;
+        tax_country_code: string;
         product_quantity: number;
         product_original_amount: string;
         product_amount: string;

package/lib/modules/SalesSummary/index.js

@@ -119,8 +119,8 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     const summarySchedule = this.core.getModule(
       `${this.name.split("_")[0]}_schedule`
     );
-    const needScheduleIds = (_b = (_a = this.store.surchargeList) == null ? void 0 : _a.map((item) => item.available_schedule_ids)) == null ? void 0 : _b.flat();
-    const scheduleList = summarySchedule == null ? void 0 : summarySchedule.getScheduleListByIds(needScheduleIds);
+    const needScheduleIds = (((_b = (_a = this.store.surchargeList) == null ? void 0 : _a.map((item) => item.available_schedule_ids)) == null ? void 0 : _b.flat()) || []).filter((id) => id !== void 0 && id !== null && id !== "");
+    const scheduleList = needScheduleIds.length > 0 ? summarySchedule == null ? void 0 : summarySchedule.getScheduleListByIds(needScheduleIds) : [];
     const scheduleById = {};
     if (Array.isArray(scheduleList)) {
       for (const item of scheduleList) {
@@ -139,7 +139,8 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     const summaryWithTaxMeta = {
       ...summary,
       tax_title: taxConfig.taxTitle || "",
-      tax_rate: taxRate ?? taxConfig.taxRate
+      tax_rate: taxRate ?? taxConfig.taxRate,
+      tax_country_code: taxConfig.taxCountryCode || ""
     };
     this.store.summary = summaryWithTaxMeta;
     return summaryWithTaxMeta;

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

@@ -9,6 +9,7 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     private cacheId;
     private openCache;
     private fatherModule;
+    private hasLoadedScheduleList;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**
@@ -25,6 +26,9 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
      */
     loadAllSchedule(): Promise<void>;
     setScheduleList(list: ScheduleItem[]): void;
+    private syncScheduleMap;
+    getScheduleList(): ScheduleItem[];
+    isScheduleListLoaded(): boolean;
     loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel, }: LoadScheduleAvailableDateParams): Promise<import("../Date/types").ITime[]>;
     getScheduleListByIds(ids: number[]): ScheduleItem[];
     setAvailabilityScheduleDateList(list: ScheduleAvailabilityDateItem[]): void;

package/lib/modules/Schedule/index.js

@@ -49,6 +49,7 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     this.defaultVersion = "1.0.0";
     this.store = {};
     this.openCache = false;
+    this.hasLoadedScheduleList = false;
   }
   async initialize(core, options) {
     var _a, _b;
@@ -60,10 +61,14 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     this.store = options == null ? void 0 : options.store;
     if (options.initialState) {
       this.store.scheduleList = options.initialState.scheduleList;
+      this.syncScheduleMap();
       this.store.availabilityDateList = options.initialState.availabilityDateList;
+      this.hasLoadedScheduleList = Array.isArray(options.initialState.scheduleList);
     } else {
       this.store.scheduleList = [];
+      this.store.map = /* @__PURE__ */ new Map();
       this.store.availabilityDateList = [];
+      this.hasLoadedScheduleList = false;
     }
     if ((_a = options.otherParams) == null ? void 0 : _a.cacheId) {
       this.openCache = options.otherParams.openCache;
@@ -101,6 +106,19 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
   }
   setScheduleList(list) {
     this.store.scheduleList = list;
+    this.syncScheduleMap();
+    this.hasLoadedScheduleList = true;
+  }
+  syncScheduleMap() {
+    this.store.map = new Map(
+      (this.store.scheduleList || []).map((schedule) => [Number(schedule.id), schedule])
+    );
+  }
+  getScheduleList() {
+    return this.store.scheduleList || [];
+  }
+  isScheduleListLoaded() {
+    return this.hasLoadedScheduleList;
   }
   async loadScheduleAvailableDate({
     startDate,
@@ -150,6 +168,9 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     var _a;
     const idSet = new Set(ids.map((id) => String(id)));
     console.log("getScheduleListByIds", this.store.scheduleList);
+    if (this.store.map instanceof Map && this.store.map.size > 0) {
+      return ids.map((id) => this.store.map.get(Number(id))).filter(Boolean);
+    }
     const list = (_a = this.store.scheduleList) == null ? void 0 : _a.filter((n) => idSet.has(String(n.id)));
     return list;
   }

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

@@ -25,6 +25,8 @@ export interface LoadScheduleAvailableDateParams {
     channel?: string;
 }
 export interface ScheduleModuleAPI {
+    getScheduleList: () => ScheduleItem[];
+    isScheduleListLoaded: () => boolean;
 }
 export type ScheduleItem = {
     /** 颜色 */

package/lib/server/index.js

@@ -2486,6 +2486,7 @@ var Server = class {
     const shouldClearLocalOrderId = this.isLocalCheckoutOrderId(next.order_id);
     if (shouldClearLocalOrderId)
       next.order_id = null;
+    delete next.vouchers;
     const hasCheckoutOrderNumbers = !this.isBlankCheckoutValue(next.shop_order_number) && !this.isBlankCheckoutValue(next.shop_full_order_number);
     if (hasCheckoutOrderNumbers) {
       this.logInfo(`${title}: checkout 已携带订单号，跳过查重`, {
@@ -2541,7 +2542,6 @@ var Server = class {
         shop_order_number: next.shop_order_number,
         shop_full_order_number: next.shop_full_order_number
       });
-      delete next.vouchers;
       return next;
     } catch (error) {
       this.logWarning(`${title}: checkout 查找本地订单失败`, {

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;