@pisell/pisellos 2.3.94 → 2.3.95

package/lib/modules/Order/utils.js

@@ -101,6 +101,7 @@ Object.defineProperty(exports, "resolveSafeProductNum", {
   }
 });
 exports.resolveSubmitCollectPax = resolveSubmitCollectPax;
+exports.resolveSubmitOrderType = resolveSubmitOrderType;
 Object.defineProperty(exports, "shouldBuildManualProductDiscount", {
   enumerable: true,
   get: function () {
@@ -125,6 +126,7 @@ var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("../Holder/utils");
 var _utils2 = require("../../solution/ScanOrder/utils");
 var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
+var _salesNotes = require("./salesNotes");
 var _manualProductDiscount = require("./utils/manualProductDiscount");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
@@ -1127,6 +1129,7 @@ function createDefaultTempOrder(params) {
     request_unique_idempotency_token: '',
     vouchers: [],
     products: [],
+    notes: [],
     bookings: [],
     payments: [],
     surcharges: [],
@@ -1136,10 +1139,58 @@ function createDefaultTempOrder(params) {
     holder: null,
     metadata: {},
     _extend: {
-      productsByUid: {}
+      productsByUid: {},
+      salesNotesState: {
+        loaded: true,
+        dirty: false
+      }
     }
   };
 }
+function hasBoundBookingResource(bookings) {
+  if (!Array.isArray(bookings)) return false;
+  return bookings.some(booking => {
+    if (!booking || typeof booking !== 'object') return false;
+    if (Number(booking.parent_id) === 0) return false;
+    const resources = booking.resources;
+    if (!Array.isArray(resources)) return false;
+    return resources.some(resource => {
+      if (!resource || typeof resource !== 'object') return false;
+      const relationId = String(resource.relation_id ?? '').trim();
+      return relationId !== '' && relationId !== '0';
+    });
+  });
+}
+function isPersistedSubmitOrderId(orderId) {
+  if (orderId === undefined || orderId === null || orderId === '') return false;
+  const normalizedOrderId = Number(orderId);
+  return Number.isFinite(normalizedOrderId) && normalizedOrderId > 0;
+}
+
+/**
+ * 解析 checkout 的订单类型。
+ * dine_in 普通落库单在新增桌台资源后，即使原类型仍是 virtual，也必须按 table-order 提交。
+ */
+function resolveSubmitOrderType(params) {
+  const {
+    requestedType,
+    tempOrderType,
+    orderId,
+    businessCode,
+    tempOrderBusinessCode,
+    bookings
+  } = params;
+  const currentType = requestedType ?? tempOrderType;
+  const resolvedBusinessCode = businessCode ?? tempOrderBusinessCode;
+  if (isPersistedSubmitOrderId(orderId) && resolvedBusinessCode === 'dine_in' && currentType === 'virtual' && hasBoundBookingResource(bookings)) {
+    return 'table-order';
+  }
+  if (currentType) return currentType;
+  if (Array.isArray(bookings) && bookings.length > 0) {
+    return businessCode === 'dine_in' ? 'table-order' : 'appointment_booking';
+  }
+  return 'virtual';
+}
 function buildSubmitPayload(params) {
   const {
     tempOrder,
@@ -1173,22 +1224,18 @@ function buildSubmitPayload(params) {
     total_refund_amount: _totalRefundAmount,
     create_date: _createDate,
     holder_id: _holderId,
+    notes: _notes,
     ...tempOrderRest
   } = tempOrder;
-  let submitType = type ?? tempOrder.type;
-  if (!submitType) {
-    // 如果外部没有传递 types，根据订单里当前是否有 bookings 来决定是 appointment_booking 还是 virtual
-    if (tempOrder?.bookings?.length) {
-      // 260807 如果 biz 是堂食，type 使用table-order
-      if (businessCode === 'dine_in') {
-        submitType = 'table-order';
-      } else {
-        submitType = 'appointment_booking';
-      }
-    } else {
-      submitType = 'virtual';
-    }
-  }
+  const resolvedBusinessCode = businessCode ?? tempOrder.business_code;
+  const submitType = resolveSubmitOrderType({
+    requestedType: type,
+    tempOrderType: tempOrder.type,
+    orderId: tempOrder.order_id,
+    businessCode,
+    tempOrderBusinessCode: tempOrder.business_code,
+    bookings: tempOrder.bookings
+  });
   const payload = {
     ...tempOrderRest,
     customer_id: tempOrder.customer_id ?? 1,
@@ -1202,7 +1249,7 @@ function buildSubmitPayload(params) {
     platform: normalizeSubmitPlatform(platform),
     request_unique_idempotency_token: params?.request_unique_idempotency_token || tempOrder.request_unique_idempotency_token || `${tempOrder.external_sale_number}_${now.getTime()}`,
     type: submitType,
-    business_code: businessCode ?? tempOrder.business_code,
+    business_code: resolvedBusinessCode,
     sales_channel: tempOrder.sales_channel || 'my_pisel',
     order_sales_channel: channel ?? tempOrder.order_sales_channel ?? 'online_store',
     status: tempOrder.status || 'normal',
@@ -1235,6 +1282,11 @@ function buildSubmitPayload(params) {
         ...rest
       };
     })(),
+    ...(tempOrder._extend?.salesNotesState?.dirty ? {
+      notes: (0, _salesNotes.encodeSalesNotes)(tempOrder.notes || [], {
+        allowUnresolvedOrderTarget: true
+      })
+    } : {}),
     products: (tempOrder.products || []).map(product => normalizeSubmitProduct(product))
   };
   if (!enhance) return payload;

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { ProductListLoadProductsParams } from './types';
+import { ProductListLoadProductsParams, ProductListStoreQueryParams } from './types';
 import { ProductData } from '../Product/types';
 export * from './types';
 export declare class ProductList extends BaseModule implements Module {
@@ -52,6 +52,7 @@ export declare class ProductList extends BaseModule implements Module {
     getRawProductPriceSources(ids: number[]): Map<number, ProductData>;
     getProducts(): Promise<ProductData[]>;
     getProduct(id: number): Promise<ProductData | undefined>;
+    queryProducts(params?: ProductListStoreQueryParams): Promise<ProductData[]>;
     getProductByIds(ids: number[]): Promise<ProductData[] | undefined>;
     addProduct(products: ProductData[]): Promise<void>;
     selectProducts(products: ProductData[]): Promise<void>;

package/lib/modules/ProductList/index.js

@@ -25,6 +25,15 @@ Object.keys(_types).forEach(function (key) {
   });
 });
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function normalizeQuerySet(values) {
+  if (!Array.isArray(values) || values.length === 0) return null;
+  const normalized = values.map(value => String(value ?? '').trim()).filter(Boolean);
+  return normalized.length ? new Set(normalized) : null;
+}
+function matchesAny(values, querySet) {
+  if (!querySet) return true;
+  return values.some(value => querySet.has(String(value ?? '').trim()));
+}
 class ProductList extends _BaseModule.BaseModule {
   defaultName = 'productList';
   defaultVersion = '1.0.0';
@@ -281,10 +290,46 @@ class ProductList extends _BaseModule.BaseModule {
     const product = this.store.list.find(product => product.id === id);
     return product ? (0, _lodashEs.cloneDeep)(product) : undefined;
   }
+  async queryProducts(params = {}) {
+    const includeIds = normalizeQuerySet(params.includeIds);
+    const excludeIds = normalizeQuerySet(params.excludeIds);
+    const categoryIds = normalizeQuerySet(params.categoryIds);
+    const collectionIds = normalizeQuerySet(params.collectionIds);
+    const extensionTypes = normalizeQuerySet(params.extensionTypes);
+    const statuses = normalizeQuerySet(params.statuses);
+    const channelApplications = normalizeQuerySet(params.channelApplications);
+    const codeOrBarcode = typeof params.codeOrBarcode === 'string' ? params.codeOrBarcode.trim() : '';
+    const products = (this.store.list || []).filter(product => {
+      const productId = String(product.id ?? '').trim();
+      if (includeIds && !includeIds.has(productId)) return false;
+      if (excludeIds && excludeIds.has(productId)) return false;
+      if (categoryIds) {
+        const productCategoryIds = (product.categories || []).flatMap(category => [category?.id, category?.pivot?.product_category_id]);
+        if (!matchesAny(productCategoryIds, categoryIds)) return false;
+      }
+      if (collectionIds) {
+        const productCollectionIds = (product.collection || []).map(collection => collection?.id);
+        if (!matchesAny(productCollectionIds, collectionIds)) return false;
+      }
+      if (extensionTypes && !extensionTypes.has(String(product.extension_type ?? '').trim())) return false;
+      if (statuses && !statuses.has(String(product.status ?? '').trim())) return false;
+      if (channelApplications) {
+        if (!matchesAny(product.channel_application || [], channelApplications)) return false;
+      }
+      if (codeOrBarcode) {
+        const code = typeof product.code === 'string' ? product.code.trim() : '';
+        const barcode = typeof product.barcode === 'string' ? product.barcode.trim() : '';
+        if (code !== codeOrBarcode && barcode !== codeOrBarcode) return false;
+      }
+      return true;
+    });
+    return (0, _lodashEs.cloneDeep)(products);
+  }
   async getProductByIds(ids) {
     await this.core.effects.emit(`${this.name}:onGetProductByIds`, this.store.list);
-    const products = this.store.list.filter(product => ids.includes(product.id));
-    return products;
+    return this.queryProducts({
+      includeIds: ids
+    });
   }
   async addProduct(products) {
     // list 需要根据 id 去重

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

@@ -15,6 +15,16 @@ export interface ProductListLoadProductsParams {
     /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
     strategy_context?: Record<string, any>;
 }
+export interface ProductListStoreQueryParams {
+    includeIds?: Array<number | string>;
+    excludeIds?: Array<number | string>;
+    categoryIds?: Array<number | string>;
+    collectionIds?: Array<number | string>;
+    extensionTypes?: string[];
+    statuses?: ProductData['status'][];
+    channelApplications?: string[];
+    codeOrBarcode?: string;
+}
 export interface ProductListData {
     list: ProductData[];
     selectProducts: ProductData[];

package/lib/server/index.d.ts

@@ -520,6 +520,12 @@ declare class Server {
     private stringifyCheckoutResourceIdentifier;
     private normalizeCheckoutSubmitData;
     private ensureCheckoutOrderNumbers;
+    /**
+     * Notes 允许在本地草稿阶段暂存空订单目标；checkout 的统一出口负责用最终
+     * shop_order_number 完成绑定并校验，保证后端请求、pending、设备任务和打印
+     * 都使用同一份完整快照。
+     */
+    private finalizeCheckoutSalesNotes;
     private dispatchCheckoutSyncTask;
     private dispatchPrintOtherReceiptTask;
     private buildPrintOtherReceiptIdempotencyKey;

package/lib/server/index.js

@@ -27,6 +27,7 @@ var _filterBookings = require("./modules/order/utils/filterBookings");
 var _smallTicket = require("./utils/small-ticket");
 var _BaseSales = require("../solution/BaseSales");
 var _paymentUtils = require("../modules/Order/payment-utils");
+var _salesNotes = require("../modules/Order/salesNotes");
 var _modules = require("./modules");
 Object.keys(_modules).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -3585,14 +3586,16 @@ class Server {
     };
     const needsShopOrderNumber = next.shop_order_number === undefined || next.shop_order_number === null || next.shop_order_number === '';
     const needsShopFullOrderNumber = next.shop_full_order_number === undefined || next.shop_full_order_number === null || next.shop_full_order_number === '';
-    if (!needsShopOrderNumber && !needsShopFullOrderNumber) return next;
+    if (!needsShopOrderNumber && !needsShopFullOrderNumber) {
+      return this.finalizeCheckoutSalesNotes(next, title);
+    }
     const idGenerator = this.getIdGeneratorPlugin();
     if (!idGenerator) {
       this.logWarning(`${title}: idGenerator 插件不可用，无法生成订单号`, {
         needsShopOrderNumber,
         needsShopFullOrderNumber
       });
-      return next;
+      return this.finalizeCheckoutSalesNotes(next, title);
     }
     try {
       if (needsShopOrderNumber && idGenerator.generateShopOrderNumber) {
@@ -3614,7 +3617,38 @@ class Server {
         error: error instanceof Error ? error.message : String(error)
       });
     }
-    return next;
+    return this.finalizeCheckoutSalesNotes(next, title);
+  }
+
+  /**
+   * Notes 允许在本地草稿阶段暂存空订单目标；checkout 的统一出口负责用最终
+   * shop_order_number 完成绑定并校验，保证后端请求、pending、设备任务和打印
+   * 都使用同一份完整快照。
+   */
+  finalizeCheckoutSalesNotes(data, title) {
+    if (!data || typeof data !== 'object') return data;
+    if (!Object.prototype.hasOwnProperty.call(data, 'notes')) return data;
+    if (data.notes === undefined || data.notes === null) return data;
+    if (!Array.isArray(data.notes)) {
+      throw new Error('[Order Notes] checkout notes 必须为数组');
+    }
+    if (data.notes.length === 0) return data;
+    const productTargetUuids = (Array.isArray(data.products) ? data.products : []).map(product => product?.metadata?.unique_identification_number ?? product?.unique_identification_number).filter(targetUuid => targetUuid !== undefined && targetUuid !== null && String(targetUuid).trim().length > 0).map(targetUuid => String(targetUuid));
+    const shopOrderNumber = String(data.shop_order_number ?? '').trim();
+    const notes = (0, _salesNotes.finalizeSalesNotesForCheckout)({
+      notes: data.notes,
+      shopOrderNumber,
+      productTargetUuids
+    });
+    this.logInfo(`${title}: checkout Notes 已绑定订单号`, {
+      shop_order_number: shopOrderNumber,
+      note_count: notes.length
+    });
+    return {
+      ...data,
+      shop_order_number: shopOrderNumber,
+      notes
+    };
   }
   async dispatchCheckoutSyncTask(params) {
     this.registerDeviceTaskActions();

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

@@ -2,7 +2,7 @@ import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult, BaseSalesCashPaymentConfig, BaseSalesPayCashParams, BaseSalesPayCashResult, BaseSalesCommitPaymentMethodParams, BaseSalesCommitPaymentMethodResult, BaseSalesConfirmWalletPaymentResult } from './types';
 import { OrderModule } from '../../modules/Order';
-import type { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions } from '../../modules/Order/types';
+import type { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, ShopServiceData, ShopServiceType } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount } from '../../modules/Discount/types';
 import { RequestPlugin, WindowPlugin } from '../../plugins';
@@ -225,12 +225,20 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getOrderSyncState(): import("../../modules/Order/types").OrderSyncState;
     getOrderAmountSnapshot(): import("../../modules/Order/types").OrderAmountSnapshot | null;
     getTempOrderNote(): string;
+    getSalesNotes(): SalesNote[];
+    createSalesNotesMutationSnapshot(): SalesNotesMutationSnapshot;
+    restoreSalesNotesMutationSnapshot(snapshot: SalesNotesMutationSnapshot): void;
+    setSalesNote(input: SetSalesNoteInput): Promise<SalesNote>;
+    removeSalesNote(uuid: string): Promise<void>;
+    clearSalesNotes(): Promise<void>;
     updateTempOrderNote(note: string): string;
     updateTempOrderNote(note: string, sync: true): Promise<string>;
     updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
     updateRemoteOrderNote(orderId: number | string, note: string): void;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderDepositAmount(amount: string | number): OrderSummary;
+    setPickupReferenceMode(mode: PickupReferenceMode): ShopServiceData;
+    setServiceType(serviceType: ShopServiceType): ShopServiceData;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
     setEnableTempOrderPersist(enabled: boolean): void;

package/lib/solution/BaseSales/index.js

@@ -283,7 +283,56 @@ function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
   loadedValue.forEach(appendOrReplaceByUid);
   return result;
 }
+
+// checkout / realtime snapshots may reorder protocol arrays or append persistence fields.
+// Compare only the Sales Note protocol fields so a matching remote echo can acknowledge dirty state.
+function normalizeBaseSalesNotesForComparison(value, options) {
+  if (!Array.isArray(value)) return null;
+  const unresolvedOrderTargetUuid = String(options?.unresolvedOrderTargetUuid ?? '').trim();
+  return value.map(note => {
+    if (!note || typeof note !== 'object' || Array.isArray(note)) {
+      return (0, _lodashEs.cloneDeep)(note);
+    }
+    const noteRecord = note;
+    const relations = Array.isArray(noteRecord.note_relations) ? noteRecord.note_relations.map(relation => {
+      if (!relation || typeof relation !== 'object' || Array.isArray(relation)) {
+        return (0, _lodashEs.cloneDeep)(relation);
+      }
+      const shouldResolveOrderTarget = relation.is_primary === 0 && relation.relation_type === 'related_to' && relation.target_type === 'order' && String(relation.target_uuid ?? '').trim() === '' && unresolvedOrderTargetUuid.length > 0;
+      return {
+        uuid: relation.uuid,
+        relation_type: relation.relation_type,
+        target_type: relation.target_type,
+        target_uuid: shouldResolveOrderTarget ? unresolvedOrderTargetUuid : relation.target_uuid,
+        is_primary: relation.is_primary
+      };
+    }).sort((left, right) => String(left?.uuid ?? '').localeCompare(String(right?.uuid ?? ''))) : (0, _lodashEs.cloneDeep)(noteRecord.note_relations);
+    return {
+      uuid: noteRecord.uuid,
+      note_type: noteRecord.note_type,
+      content: {
+        text: (0, _lodashEs.cloneDeep)(noteRecord.content?.text)
+      },
+      importance: noteRecord.importance,
+      note_relations: relations
+    };
+  }).sort((left, right) => String(left?.uuid ?? '').localeCompare(String(right?.uuid ?? '')));
+}
+function areBaseSalesNotesEquivalent(currentValue, loadedValue, options) {
+  const currentNotes = normalizeBaseSalesNotesForComparison(currentValue, {
+    unresolvedOrderTargetUuid: options?.currentOrderTargetUuid
+  });
+  const loadedNotes = normalizeBaseSalesNotesForComparison(loadedValue);
+  return currentNotes !== null && loadedNotes !== null && (0, _lodashEs.isEqual)(currentNotes, loadedNotes);
+}
 function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, strategy) {
+  const loadedHasSalesNotes = Object.prototype.hasOwnProperty.call(loadedRecord || {}, 'notes');
+  const hasDirtyLocalSalesNotes = currentTempOrder?._extend?.salesNotesState?.dirty === true;
+  const incomingSalesNotesMatchLocal = loadedHasSalesNotes && areBaseSalesNotesEquivalent(currentTempOrder?.notes, loadedRecord.notes, {
+    currentOrderTargetUuid: loadedRecord?.shop_order_number || currentTempOrder?.shop_order_number
+  });
+  const shouldAwaitAuthoritativeSalesNotes = strategy === 'authoritative-incoming' && hasDirtyLocalSalesNotes && (Number(loadedRecord?.need_sync) === 1 || !incomingSalesNotesMatchLocal);
+  const preserveDirtyLocalSalesNotes = hasDirtyLocalSalesNotes && (strategy === 'preserve-local' || shouldAwaitAuthoritativeSalesNotes);
   const normalizedLoadedRecord = normalizeBaseSalesRecordCollections(loadedRecord || {}, {
     ensureUid: false
   });
@@ -295,6 +344,12 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
   });
   const uidRemaps = [];
   const mergedRecord = (0, _lodashEs.mergeWith)(normalizedCurrentTempOrder, normalizedLoadedRecord, (currentValue, loadedValue, key) => {
+    if (key === 'notes') {
+      if (preserveDirtyLocalSalesNotes && Array.isArray(currentValue)) {
+        return (0, _lodashEs.cloneDeep)(currentValue);
+      }
+      if (Array.isArray(loadedValue)) return (0, _lodashEs.cloneDeep)(loadedValue);
+    }
     const collectionKind = getBaseSalesOrderCollectionKind(key);
     if (collectionKind && Array.isArray(loadedValue)) {
       return mergeBaseSalesOrderCollection(collectionKind, Array.isArray(currentValue) ? currentValue : [], loadedValue, strategy, uidRemaps);
@@ -318,7 +373,24 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
     return undefined;
   });
   delete mergedRecord.request_unique_idempotency_token;
-  return normalizeBaseSalesRecordCollections((0, _orderCollectionIdentity.applyOrderCollectionUidRemaps)(mergedRecord, uidRemaps));
+  const normalizedMergedRecord = normalizeBaseSalesRecordCollections((0, _orderCollectionIdentity.applyOrderCollectionUidRemaps)(mergedRecord, uidRemaps));
+  normalizedMergedRecord._extend = {
+    ...(normalizedMergedRecord._extend || {}),
+    salesNotesState: preserveDirtyLocalSalesNotes ? {
+      loaded: true,
+      dirty: true
+    } : loadedHasSalesNotes ? {
+      loaded: true,
+      dirty: normalizedLoadedRecord._extend?.salesNotesState?.dirty === true
+    } : {
+      loaded: false,
+      dirty: false
+    }
+  };
+  if (!loadedHasSalesNotes && !preserveDirtyLocalSalesNotes) {
+    delete normalizedMergedRecord.notes;
+  }
+  return normalizedMergedRecord;
 }
 function filterPendingPaymentsFromLoadedSalesDetail(sourceRecord) {
   if (!sourceRecord || typeof sourceRecord !== 'object') return sourceRecord;
@@ -1426,6 +1498,30 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) return '';
     return this.store.order.getTempOrderNote();
   }
+  getSalesNotes() {
+    if (!this.store.order) return [];
+    return this.store.order.getSalesNotes();
+  }
+  createSalesNotesMutationSnapshot() {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.createSalesNotesMutationSnapshot();
+  }
+  restoreSalesNotesMutationSnapshot(snapshot) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    this.store.order.restoreSalesNotesMutationSnapshot(snapshot);
+  }
+  async setSalesNote(input) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.setSalesNote(input);
+  }
+  async removeSalesNote(uuid) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    await this.store.order.removeSalesNote(uuid);
+  }
+  async clearSalesNotes() {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    await this.store.order.clearSalesNotes();
+  }
   updateTempOrderNote(note, sync = false) {
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');
@@ -1447,6 +1543,14 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) throw new Error('order 模块未初始化');
     return this.store.order.updateTempOrderDepositAmount(amount);
   }
+  setPickupReferenceMode(mode) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.updateTempOrderPickupReferenceMode(mode);
+  }
+  setServiceType(serviceType) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.updateTempOrderServiceType(serviceType);
+  }
   updateTempOrderContactsInfo(contactsInfo) {
     if (!this.store.order) throw new Error('order 模块未初始化');
     return this.store.order.updateTempOrderContactsInfo(contactsInfo);

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/lib/solution/BookingTicket/utils/orderCustomer.js

@@ -23,7 +23,8 @@ function resolveCustomerDisplayName(customer) {
 
 /** 将 ICustomer 格式化为写入 tempOrder 的协议字段。 */
 function formatOrderCustomerPatch(customer) {
-  const rawId = customer.id;
+  const c = customer;
+  const rawId = c.customer_id ?? c.customerId ?? customer.id;
   const numericId = typeof rawId === 'number' ? rawId : rawId !== undefined && rawId !== null && rawId !== '' ? Number(rawId) : null;
   return {
     customer_id: Number.isFinite(numericId) ? numericId : null,

package/lib/solution/RegisterAndLogin/config.d.ts

@@ -10,7 +10,11 @@ export interface ApiConfig {
     method: 'GET' | 'POST' | 'PUT' | 'DELETE';
     transformParams?: (params: any) => any;
     transformResponse?: (response: any) => any;
-    options?: Record<string, any>;
+    options?: Record<string, any> | ((params: any) => Record<string, any>);
+}
+export interface ApiCallerOptions {
+    baseUrl?: string;
+    shopDomain?: string;
 }
 /**
  * 渠道配置接口
@@ -65,12 +69,14 @@ export declare function getChannelConfig(channel: string): ChannelConfig;
 export declare class ApiCaller {
     private request;
     private config;
+    private options;
     constructor(request: {
         get: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
         post: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
         put: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
         delete: <T = any>(url: string, options?: any) => Promise<T>;
-    }, config: ChannelConfig);
+    }, config: ChannelConfig, options?: ApiCallerOptions);
+    private resolveUrl;
     /**
      * 执行 API 调用
      */
@@ -84,4 +90,4 @@ export declare function createApiCaller(request: {
     post: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
     put: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
     delete: <T = any>(url: string, options?: any) => Promise<T>;
-}, channel: string): ApiCaller;
+}, channel: string, options?: ApiCallerOptions): ApiCaller;