@pisell/pisellos 2.3.94 → 2.3.96

package/dist/modules/Order/types.js

@@ -64,6 +64,11 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * 清空时整个 payload 为 null。
  */
 
+/**
+ * Sales Notes 乐观写入前的可恢复快照。
+ * 该对象应视为 opaque token，只用于原样传回 restoreSalesNotesMutationSnapshot。
+ */
+
 /**
  * 添加商品行时的顺序控制。
  * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，

package/dist/modules/Order/utils.d.ts

@@ -210,6 +210,18 @@ export interface SubmitPayloadEnhancerContext {
     now: Date;
 }
 export type SubmitPayloadEnhancer = (payload: OrderSubmitPayload, ctx: SubmitPayloadEnhancerContext) => OrderSubmitPayload;
+/**
+ * 解析 checkout 的订单类型。
+ * dine_in 普通落库单在新增桌台资源后，即使原类型仍是 virtual，也必须按 table-order 提交。
+ */
+export declare function resolveSubmitOrderType(params: {
+    requestedType?: string;
+    tempOrderType?: string;
+    orderId?: unknown;
+    businessCode?: string;
+    tempOrderBusinessCode?: string;
+    bookings?: unknown;
+}): string;
 export declare function buildSubmitPayload(params: {
     tempOrder: OrderTempOrder;
     cacheId?: string;

package/dist/modules/Order/utils.js

@@ -1,7 +1,7 @@
 var _excluded = ["custom_product_bundle_map_id"],
   _excluded2 = ["unique_identification_number"],
   _excluded3 = ["num", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per", "production_code"],
-  _excluded4 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "discount_list", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id"],
+  _excluded4 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "discount_list", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id", "notes"],
   _excluded5 = ["collect_pax", "table_occupancy_duration"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -23,6 +23,7 @@ import Decimal from 'decimal.js';
 import { getProductHolderConfig } from "../Holder/utils";
 import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
 import { createUuidV4 } from "./utils/orderCollectionIdentity";
+import { encodeSalesNotes } from "./salesNotes";
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -1088,6 +1089,7 @@ export function createDefaultTempOrder(params) {
     request_unique_idempotency_token: '',
     vouchers: [],
     products: [],
+    notes: [],
     bookings: [],
     payments: [],
     surcharges: [],
@@ -1097,12 +1099,59 @@ export 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(function (booking) {
+    if (!booking || _typeof(booking) !== 'object') return false;
+    if (Number(booking.parent_id) === 0) return false;
+    var resources = booking.resources;
+    if (!Array.isArray(resources)) return false;
+    return resources.some(function (resource) {
+      var _relation_id;
+      if (!resource || _typeof(resource) !== 'object') return false;
+      var relationId = String((_relation_id = resource.relation_id) !== null && _relation_id !== void 0 ? _relation_id : '').trim();
+      return relationId !== '' && relationId !== '0';
+    });
+  });
+}
+function isPersistedSubmitOrderId(orderId) {
+  if (orderId === undefined || orderId === null || orderId === '') return false;
+  var normalizedOrderId = Number(orderId);
+  return Number.isFinite(normalizedOrderId) && normalizedOrderId > 0;
+}
+
+/**
+ * 解析 checkout 的订单类型。
+ * dine_in 普通落库单在新增桌台资源后，即使原类型仍是 virtual，也必须按 table-order 提交。
+ */
+export function resolveSubmitOrderType(params) {
+  var requestedType = params.requestedType,
+    tempOrderType = params.tempOrderType,
+    orderId = params.orderId,
+    businessCode = params.businessCode,
+    tempOrderBusinessCode = params.tempOrderBusinessCode,
+    bookings = params.bookings;
+  var currentType = requestedType !== null && requestedType !== void 0 ? requestedType : tempOrderType;
+  var resolvedBusinessCode = businessCode !== null && businessCode !== void 0 ? 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';
+}
 export function buildSubmitPayload(params) {
-  var _tempOrder$customer_i, _tempOrder$country_ca, _tempOrder$phone, _tempOrder$email, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref31, _tempOrder$is_price_i, _tempOrder$is_deposit, _enhancedPayload$summ;
+  var _tempOrder$customer_i, _tempOrder$country_ca, _tempOrder$phone, _tempOrder$email, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref31, _tempOrder$is_price_i, _tempOrder$is_deposit, _tempOrder$_extend, _enhancedPayload$summ;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -1134,23 +1183,18 @@ export function buildSubmitPayload(params) {
     _totalRefundAmount = _ref30.total_refund_amount,
     _createDate = _ref30.create_date,
     _holderId = _ref30.holder_id,
+    _notes = _ref30.notes,
     tempOrderRest = _objectWithoutProperties(_ref30, _excluded4);
-  var submitType = type !== null && type !== void 0 ? type : tempOrder.type;
-  if (!submitType) {
-    var _tempOrder$bookings;
-    // 如果外部没有传递 types，根据订单里当前是否有 bookings 来决定是 appointment_booking 还是 virtual
-    if (tempOrder !== null && tempOrder !== void 0 && (_tempOrder$bookings = tempOrder.bookings) !== null && _tempOrder$bookings !== void 0 && _tempOrder$bookings.length) {
-      // 260807 如果 biz 是堂食，type 使用table-order
-      if (businessCode === 'dine_in') {
-        submitType = 'table-order';
-      } else {
-        submitType = 'appointment_booking';
-      }
-    } else {
-      submitType = 'virtual';
-    }
-  }
-  var payload = _objectSpread(_objectSpread({}, tempOrderRest), {}, {
+  var resolvedBusinessCode = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code;
+  var submitType = resolveSubmitOrderType({
+    requestedType: type,
+    tempOrderType: tempOrder.type,
+    orderId: tempOrder.order_id,
+    businessCode: businessCode,
+    tempOrderBusinessCode: tempOrder.business_code,
+    bookings: tempOrder.bookings
+  });
+  var payload = _objectSpread(_objectSpread(_objectSpread({}, tempOrderRest), {}, {
     customer_id: (_tempOrder$customer_i = tempOrder.customer_id) !== null && _tempOrder$customer_i !== void 0 ? _tempOrder$customer_i : 1,
     customer_name: tempOrder.customer_name || 'Walk-In',
     country_calling_code: String((_tempOrder$country_ca = tempOrder.country_calling_code) !== null && _tempOrder$country_ca !== void 0 ? _tempOrder$country_ca : ''),
@@ -1162,7 +1206,7 @@ export function buildSubmitPayload(params) {
     platform: normalizeSubmitPlatform(platform),
     request_unique_idempotency_token: (params === null || params === void 0 ? void 0 : params.request_unique_idempotency_token) || tempOrder.request_unique_idempotency_token || "".concat(tempOrder.external_sale_number, "_").concat(now.getTime()),
     type: submitType,
-    business_code: businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code,
+    business_code: resolvedBusinessCode,
     sales_channel: tempOrder.sales_channel || 'my_pisel',
     order_sales_channel: (_ref31 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref31 !== void 0 ? _ref31 : 'online_store',
     status: tempOrder.status || 'normal',
@@ -1195,7 +1239,12 @@ export function buildSubmitPayload(params) {
         _tableOccupancyDuration = _ref32.table_occupancy_duration,
         rest = _objectWithoutProperties(_ref32, _excluded5);
       return _objectSpread({}, rest);
-    }(),
+    }()
+  }, (_tempOrder$_extend = tempOrder._extend) !== null && _tempOrder$_extend !== void 0 && (_tempOrder$_extend = _tempOrder$_extend.salesNotesState) !== null && _tempOrder$_extend !== void 0 && _tempOrder$_extend.dirty ? {
+    notes: encodeSalesNotes(tempOrder.notes || [], {
+      allowUnresolvedOrderTarget: true
+    })
+  } : {}), {}, {
     products: (tempOrder.products || []).map(function (product) {
       return normalizeSubmitProduct(product);
     })
@@ -1323,7 +1372,7 @@ export function hasAssignedHolderId(value) {
  * clearTempOrderHolderAssignments(tempOrder);
  */
 export function clearTempOrderHolderAssignments(tempOrder) {
-  var _tempOrder$_extend;
+  var _tempOrder$_extend2;
   var changed = false;
   var resetHolderField = function resetHolderField(target) {
     var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'holder_id';
@@ -1364,7 +1413,7 @@ export function clearTempOrderHolderAssignments(tempOrder) {
   } finally {
     _iterator9.f();
   }
-  var productsByUid = (_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.productsByUid;
+  var productsByUid = (_tempOrder$_extend2 = tempOrder._extend) === null || _tempOrder$_extend2 === void 0 ? void 0 : _tempOrder$_extend2.productsByUid;
   if (productsByUid && _typeof(productsByUid) === 'object') {
     for (var _i4 = 0, _Object$values = Object.values(productsByUid); _i4 < _Object$values.length; _i4++) {
       var entry = _Object$values[_i4];
@@ -1395,9 +1444,9 @@ export function getOrderProductLineUid(product) {
   return String(uid);
 }
 export function getRuntimeProductOrigin(tempOrder, product) {
-  var _tempOrder$_extend2, _tempOrder$_extend3;
+  var _tempOrder$_extend3, _tempOrder$_extend4;
   var uid = getOrderProductLineUid(product);
-  if (uid && tempOrder !== null && tempOrder !== void 0 && (_tempOrder$_extend2 = tempOrder._extend) !== null && _tempOrder$_extend2 !== void 0 && (_tempOrder$_extend2 = _tempOrder$_extend2.productsByUid) !== null && _tempOrder$_extend2 !== void 0 && (_tempOrder$_extend2 = _tempOrder$_extend2[uid]) !== null && _tempOrder$_extend2 !== void 0 && _tempOrder$_extend2.origin) {
+  if (uid && tempOrder !== null && tempOrder !== void 0 && (_tempOrder$_extend3 = tempOrder._extend) !== null && _tempOrder$_extend3 !== void 0 && (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) !== null && _tempOrder$_extend3 !== void 0 && (_tempOrder$_extend3 = _tempOrder$_extend3[uid]) !== null && _tempOrder$_extend3 !== void 0 && _tempOrder$_extend3.origin) {
     return tempOrder._extend.productsByUid[uid].origin;
   }
   var matchedProduct = ((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || []).find(function (item) {
@@ -1405,7 +1454,7 @@ export function getRuntimeProductOrigin(tempOrder, product) {
     return item === product || getOrderProductLineUid(item) === uid || String((_ref33 = (_item$product_id = item === null || item === void 0 ? void 0 : item.product_id) !== null && _item$product_id !== void 0 ? _item$product_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref33 !== void 0 ? _ref33 : '') === String((_ref34 = (_product$product_id = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product === null || product === void 0 ? void 0 : product.id) !== null && _ref34 !== void 0 ? _ref34 : '');
   });
   var matchedUid = matchedProduct ? getOrderProductLineUid(matchedProduct) : '';
-  return matchedUid ? (tempOrder === null || tempOrder === void 0 || (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[matchedUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin) || null : null;
+  return matchedUid ? (tempOrder === null || tempOrder === void 0 || (_tempOrder$_extend4 = tempOrder._extend) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4.productsByUid) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4[matchedUid]) === null || _tempOrder$_extend4 === void 0 ? void 0 : _tempOrder$_extend4.origin) || null : null;
 }
 export function isHolderConfigRequired(holderConfig) {
   if (!holderConfig || _typeof(holderConfig) !== 'object') return false;

package/dist/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/dist/modules/ProductList/index.js

@@ -29,6 +29,19 @@ import dayjs from 'dayjs';
 import { isProductQueryHandledByOsServer, PRODUCT_QUERY_DATA_VARIANT_RELATIONS, resolveClientDataVariants } from "./clientDataVariants";
 import { isCustomerUserPlatform } from "../../utils/platform";
 export * from "./types";
+function normalizeQuerySet(values) {
+  if (!Array.isArray(values) || values.length === 0) return null;
+  var normalized = values.map(function (value) {
+    return String(value !== null && value !== void 0 ? value : '').trim();
+  }).filter(Boolean);
+  return normalized.length ? new Set(normalized) : null;
+}
+function matchesAny(values, querySet) {
+  if (!querySet) return true;
+  return values.some(function (value) {
+    return querySet.has(String(value !== null && value !== void 0 ? value : '').trim());
+  });
+}
 export var ProductList = /*#__PURE__*/function (_BaseModule) {
   _inherits(ProductList, _BaseModule);
   var _super = _createSuper(ProductList);
@@ -468,26 +481,93 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
       return getProduct;
     }()
   }, {
-    key: "getProductByIds",
+    key: "queryProducts",
     value: function () {
-      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(ids) {
-        var products;
+      var _queryProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+        var params,
+          includeIds,
+          excludeIds,
+          categoryIds,
+          collectionIds,
+          extensionTypes,
+          statuses,
+          channelApplications,
+          codeOrBarcode,
+          products,
+          _args9 = arguments;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context9.next = 2;
-              return this.core.effects.emit("".concat(this.name, ":onGetProductByIds"), this.store.list);
-            case 2:
-              products = this.store.list.filter(function (product) {
-                return ids.includes(product.id);
+              params = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
+              includeIds = normalizeQuerySet(params.includeIds);
+              excludeIds = normalizeQuerySet(params.excludeIds);
+              categoryIds = normalizeQuerySet(params.categoryIds);
+              collectionIds = normalizeQuerySet(params.collectionIds);
+              extensionTypes = normalizeQuerySet(params.extensionTypes);
+              statuses = normalizeQuerySet(params.statuses);
+              channelApplications = normalizeQuerySet(params.channelApplications);
+              codeOrBarcode = typeof params.codeOrBarcode === 'string' ? params.codeOrBarcode.trim() : '';
+              products = (this.store.list || []).filter(function (product) {
+                var _product$id, _product$extension_ty, _product$status;
+                var productId = String((_product$id = product.id) !== null && _product$id !== void 0 ? _product$id : '').trim();
+                if (includeIds && !includeIds.has(productId)) return false;
+                if (excludeIds && excludeIds.has(productId)) return false;
+                if (categoryIds) {
+                  var productCategoryIds = (product.categories || []).flatMap(function (category) {
+                    var _category$pivot;
+                    return [category === null || category === void 0 ? void 0 : category.id, category === null || category === void 0 || (_category$pivot = category.pivot) === null || _category$pivot === void 0 ? void 0 : _category$pivot.product_category_id];
+                  });
+                  if (!matchesAny(productCategoryIds, categoryIds)) return false;
+                }
+                if (collectionIds) {
+                  var productCollectionIds = (product.collection || []).map(function (collection) {
+                    return collection === null || collection === void 0 ? void 0 : collection.id;
+                  });
+                  if (!matchesAny(productCollectionIds, collectionIds)) return false;
+                }
+                if (extensionTypes && !extensionTypes.has(String((_product$extension_ty = product.extension_type) !== null && _product$extension_ty !== void 0 ? _product$extension_ty : '').trim())) return false;
+                if (statuses && !statuses.has(String((_product$status = product.status) !== null && _product$status !== void 0 ? _product$status : '').trim())) return false;
+                if (channelApplications) {
+                  if (!matchesAny(product.channel_application || [], channelApplications)) return false;
+                }
+                if (codeOrBarcode) {
+                  var code = typeof product.code === 'string' ? product.code.trim() : '';
+                  var barcode = typeof product.barcode === 'string' ? product.barcode.trim() : '';
+                  if (code !== codeOrBarcode && barcode !== codeOrBarcode) return false;
+                }
+                return true;
               });
-              return _context9.abrupt("return", products);
-            case 4:
+              return _context9.abrupt("return", cloneDeep(products));
+            case 11:
             case "end":
               return _context9.stop();
           }
         }, _callee9, this);
       }));
+      function queryProducts() {
+        return _queryProducts.apply(this, arguments);
+      }
+      return queryProducts;
+    }()
+  }, {
+    key: "getProductByIds",
+    value: function () {
+      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(ids) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
+            case 0:
+              _context10.next = 2;
+              return this.core.effects.emit("".concat(this.name, ":onGetProductByIds"), this.store.list);
+            case 2:
+              return _context10.abrupt("return", this.queryProducts({
+                includeIds: ids
+              }));
+            case 3:
+            case "end":
+              return _context10.stop();
+          }
+        }, _callee10, this);
+      }));
       function getProductByIds(_x8) {
         return _getProductByIds.apply(this, arguments);
       }
@@ -496,10 +576,10 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProduct",
     value: function () {
-      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(products) {
+      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(products) {
         var _this6 = this;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               // list 需要根据 id 去重
               if (!this.store.list) {
@@ -522,9 +602,9 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               this.core.effects.emit("".concat(this.name, ":changed"), this.store.list);
             case 4:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
       function addProduct(_x9) {
         return _addProduct.apply(this, arguments);
@@ -534,16 +614,16 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "selectProducts",
     value: function () {
-      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(products) {
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(products) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               this.store.selectProducts = products;
             case 1:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
       function selectProducts(_x10) {
         return _selectProducts.apply(this, arguments);

package/dist/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/dist/modules/SalesSummary/index.js

@@ -212,8 +212,8 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
     key: "getSummary",
     value: function () {
       var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var _this$store$surcharge, _ref;
-        var _params$products, products, isPriceIncludeTax, taxRate, shopDiscount, channel, summaryChannel, taxConfig, summarySchedule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary, summaryWithTaxMeta;
+        var _this$otherParams2, _this$store$surcharge, _ref;
+        var _params$products, products, isPriceIncludeTax, taxRate, shopDiscount, channel, summaryChannel, taxConfig, fatherModuleName, scheduleModuleName, summarySchedule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary, summaryWithTaxMeta;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -227,7 +227,9 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
               return this.getSurchargeList(summaryChannel);
             case 5:
               taxConfig = this.getTaxConfig();
-              summarySchedule = this.core.getModule("".concat(this.name.split('_')[0], "_schedule"));
+              fatherModuleName = ((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.fatherModule) || this.name.replace(/_salesSummary$/, '');
+              scheduleModuleName = "".concat(fatherModuleName, "_schedule");
+              summarySchedule = this.core.getModule(scheduleModuleName);
               needScheduleIds = (((_this$store$surcharge = this.store.surchargeList) === null || _this$store$surcharge === void 0 || (_this$store$surcharge = _this$store$surcharge.map(function (item) {
                 return item.available_schedule_ids;
               })) === null || _this$store$surcharge === void 0 ? void 0 : _this$store$surcharge.flat()) || []).filter(function (id) {
@@ -264,7 +266,7 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.summary = summaryWithTaxMeta;
               return _context4.abrupt("return", summaryWithTaxMeta);
-            case 15:
+            case 17:
             case "end":
               return _context4.stop();
           }

package/dist/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/dist/server/index.js

@@ -43,6 +43,7 @@ import { filterBookingsFromOrders, sortBookings } from "./modules/order/utils/fi
 import { buildSmallTicketData, hasSmallTicketData } from "./utils/small-ticket";
 import { BaseSalesImpl } from "../solution/BaseSales";
 import { getOrderPaymentIdentityKeys, isIdentifiedPendingOrderPayment, isPendingOrderPayment, mergeOrderPaymentListsByIdentity } from "../modules/Order/payment-utils";
+import { finalizeSalesNotesForCheckout } from "../modules/Order/salesNotes";
 var OS_FULFILLMENT_REF_MODE_FIELD = '_os_fulfillment_ref_mode';
 
 // 重新导出类型供外部使用
@@ -5503,29 +5504,33 @@ var Server = /*#__PURE__*/function () {
       if (!Array.isArray(bookings)) return '';
       var values = [];
       var seen = new Set();
-      var visitResource = function visitResource(resource) {
-        var identifier = _this15.getCheckoutResourceIdentifier(resource);
+      var visitResource = function visitResource(resource, fallbackName) {
+        var identifier = _this15.getCheckoutResourceIdentifier(resource, fallbackName);
         if (identifier && !seen.has(identifier)) {
           seen.add(identifier);
           values.push(identifier);
         }
         if (Array.isArray(resource === null || resource === void 0 ? void 0 : resource.children)) {
-          resource.children.forEach(visitResource);
+          resource.children.forEach(function (child) {
+            return visitResource(child);
+          });
         }
       };
       bookings.forEach(function (booking) {
         if (Array.isArray(booking === null || booking === void 0 ? void 0 : booking.resources)) {
-          booking.resources.forEach(visitResource);
+          booking.resources.forEach(function (resource, index) {
+            visitResource(resource, index === 0 ? booking === null || booking === void 0 ? void 0 : booking.relation_form_name : undefined);
+          });
         }
       });
       return values.join(',');
     }
   }, {
     key: "getCheckoutResourceIdentifier",
-    value: function getCheckoutResourceIdentifier(resource) {
+    value: function getCheckoutResourceIdentifier(resource, fallbackName) {
       var _resource$metadata, _resource$metadata2;
       if (!resource || _typeof(resource) !== 'object') return '';
-      var candidates = [resource.main_field, resource.name, resource.title, (_resource$metadata = resource.metadata) === null || _resource$metadata === void 0 ? void 0 : _resource$metadata.resource_name, (_resource$metadata2 = resource.metadata) === null || _resource$metadata2 === void 0 ? void 0 : _resource$metadata2.name, resource.relation_id, resource.id];
+      var candidates = [resource.main_field, resource.name, resource.title, (_resource$metadata = resource.metadata) === null || _resource$metadata === void 0 ? void 0 : _resource$metadata.resource_name, (_resource$metadata2 = resource.metadata) === null || _resource$metadata2 === void 0 ? void 0 : _resource$metadata2.name, fallbackName, resource.relation_id, resource.id];
       for (var _i2 = 0, _candidates = candidates; _i2 < _candidates.length; _i2++) {
         var candidate = _candidates[_i2];
         var value = this.stringifyCheckoutResourceIdentifier(candidate);
@@ -5679,7 +5684,7 @@ var Server = /*#__PURE__*/function () {
                 _context56.next = 7;
                 break;
               }
-              return _context56.abrupt("return", next);
+              return _context56.abrupt("return", this.finalizeCheckoutSalesNotes(next, title));
             case 7:
               idGenerator = this.getIdGeneratorPlugin();
               if (idGenerator) {
@@ -5690,7 +5695,7 @@ var Server = /*#__PURE__*/function () {
                 needsShopOrderNumber: needsShopOrderNumber,
                 needsShopFullOrderNumber: needsShopFullOrderNumber
               });
-              return _context56.abrupt("return", next);
+              return _context56.abrupt("return", this.finalizeCheckoutSalesNotes(next, title));
             case 11:
               _context56.prev = 11;
               if (!(needsShopOrderNumber && idGenerator.generateShopOrderNumber)) {
@@ -5728,7 +5733,7 @@ var Server = /*#__PURE__*/function () {
                 error: _context56.t0 instanceof Error ? _context56.t0.message : String(_context56.t0)
               });
             case 26:
-              return _context56.abrupt("return", next);
+              return _context56.abrupt("return", this.finalizeCheckoutSalesNotes(next, title));
             case 27:
             case "end":
               return _context56.stop();
@@ -5740,6 +5745,45 @@ var Server = /*#__PURE__*/function () {
       }
       return ensureCheckoutOrderNumbers;
     }()
+    /**
+     * Notes 允许在本地草稿阶段暂存空订单目标；checkout 的统一出口负责用最终
+     * shop_order_number 完成绑定并校验，保证后端请求、pending、设备任务和打印
+     * 都使用同一份完整快照。
+     */
+  }, {
+    key: "finalizeCheckoutSalesNotes",
+    value: function finalizeCheckoutSalesNotes(data, title) {
+      var _data$shop_order_numb;
+      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;
+      var productTargetUuids = (Array.isArray(data.products) ? data.products : []).map(function (product) {
+        var _product$metadata$uni, _product$metadata;
+        return (_product$metadata$uni = product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product === null || product === void 0 ? void 0 : product.unique_identification_number;
+      }).filter(function (targetUuid) {
+        return targetUuid !== undefined && targetUuid !== null && String(targetUuid).trim().length > 0;
+      }).map(function (targetUuid) {
+        return String(targetUuid);
+      });
+      var shopOrderNumber = String((_data$shop_order_numb = data.shop_order_number) !== null && _data$shop_order_numb !== void 0 ? _data$shop_order_numb : '').trim();
+      var notes = finalizeSalesNotesForCheckout({
+        notes: data.notes,
+        shopOrderNumber: shopOrderNumber,
+        productTargetUuids: productTargetUuids
+      });
+      this.logInfo("".concat(title, ": checkout Notes \u5DF2\u7ED1\u5B9A\u8BA2\u5355\u53F7"), {
+        shop_order_number: shopOrderNumber,
+        note_count: notes.length
+      });
+      return _objectSpread(_objectSpread({}, data), {}, {
+        shop_order_number: shopOrderNumber,
+        notes: notes
+      });
+    }
   }, {
     key: "dispatchCheckoutSyncTask",
     value: function () {
@@ -8287,16 +8331,18 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "buildProductFormatterContext",
     value: function buildProductFormatterContext(context) {
-      var _this$menu2, _this$menu2$getMenuLi, _scheduleModule$getSc, _this$core$context5;
+      var _this$core$context5, _this$menu2, _this$menu2$getMenuLi, _scheduleModule$getSc, _this$core$context6;
       var scheduleModule = this.getSchedule();
       return {
         scheduleModule: scheduleModule,
         schedule_datetime: context.schedule_datetime,
         customer_id: context.customer_id,
         strategy_context: context.strategy_context,
+        // 固定本次商品查询使用的语言，确保格式化与缓存使用同一份 locale 快照。
+        locale: (_this$core$context5 = this.core.context) === null || _this$core$context5 === void 0 ? void 0 : _this$core$context5.locale,
         menuList: ((_this$menu2 = this.menu) === null || _this$menu2 === void 0 || (_this$menu2$getMenuLi = _this$menu2.getMenuList) === null || _this$menu2$getMenuLi === void 0 ? void 0 : _this$menu2$getMenuLi.call(_this$menu2)) || [],
         scheduleList: (scheduleModule === null || scheduleModule === void 0 || (_scheduleModule$getSc = scheduleModule.getScheduleList) === null || _scheduleModule$getSc === void 0 ? void 0 : _scheduleModule$getSc.call(scheduleModule)) || [],
-        dataVariantEvaluator: (_this$core$context5 = this.core.context) === null || _this$core$context5 === void 0 ? void 0 : _this$core$context5.dataVariantEvaluator
+        dataVariantEvaluator: (_this$core$context6 = this.core.context) === null || _this$core$context6 === void 0 ? void 0 : _this$core$context6.dataVariantEvaluator
       };
     }
 

package/dist/server/modules/products/index.d.ts

@@ -89,8 +89,8 @@ export declare class ProductsModule extends BaseModule implements Module {
     private buildBundleGroupPriceData;
     /**
      * 获取应用了价格的商品列表（带缓存）
-     * 使用日期作为缓存 key，同一天的商品价格会被缓存
-     * 缓存的是已经应用了价格的完整商品列表，避免重复转换
+     * 使用时间、客户、策略、商品范围和语言作为缓存 key
+     * 缓存的是已经应用了价格与多语言的完整商品列表，避免重复转换
      * @param schedule_date 日期
      * @param extraContext 额外的上下文数据（可选，由 Server 层传入）
      * @param options 可选参数