@pisell/pisellos 2.2.278 → 2.2.280

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

@@ -35,6 +35,7 @@ export interface ScanOrderOrderProductIdentity {
     /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
     product_sku?: ScanOrderProductSku;
     product_bundle?: any[];
+    shop_id?: number | string;
 }
 export interface ScanOrderProductSku {
     option: any[];
@@ -207,7 +208,7 @@ export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platfo
     }>;
     products: ScanOrderSubmitProduct[];
 }
-export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
+export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'multiple_orders' | 'additional_order_with_code' | 'additional_order';
 export interface ScanOrderTableFormRecord {
     policy?: string | null;
     partyroom_booking?: string | null;
@@ -250,6 +251,10 @@ export interface ScanOrderResourceOccupyDetail {
     form_id?: number | string | null;
     order_id?: number | string | null;
     last_order_id?: number | string | null;
+    order_list?: Array<{
+        id?: number | string | null;
+        [key: string]: any;
+    }> | null;
     resource_capacity?: ScanOrderResourceCapacity[] | null;
     form_record?: ScanOrderTableFormRecord | null;
     [key: string]: any;
@@ -263,6 +268,21 @@ export interface ScanOrderResourceOccupyDetailApiResponse {
     } | null;
 }
 export type ScanOrderResourceSelectType = 'single' | 'multiple' | 'capacity';
+export interface ScanOrderReservationResourceSelectInfo {
+    resourceSelectType?: ScanOrderResourceSelectType;
+    isSingleReservation: boolean;
+    isMultipleReservation: boolean;
+    isCapacityReservation: boolean;
+}
+export interface ScanOrderAllowAddItemsInfo {
+    enabled: boolean;
+}
+export type ScanOrderSyncAdditionalOrderReason = 'missing_resource_id' | 'no_order' | 'multiple_orders' | 'add_items_disabled' | 'invalid_order_id';
+export interface ScanOrderSyncAdditionalOrderResult {
+    matched: boolean;
+    order_id?: string;
+    reason?: ScanOrderSyncAdditionalOrderReason;
+}
 export interface ScanOrderResourceState extends ScanOrderAvailabilityInfo {
     relationId?: string;
     tableFormId?: string;

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

@@ -2,6 +2,7 @@ import { ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderResource
 import type { CartItemSummary, ItemRuleBusinessData, PaxInfo, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
 import type { ProductData } from '../../modules/Product/types';
+import type { OrderSubmitProduct } from '../../modules/Order/types';
 /**
  * 构建金额全为 0 的空 summary。
  * 作为尚未计算金额时的兜底默认值，避免下游因 undefined 报错。
@@ -42,6 +43,8 @@ export declare function toNonNegativeNumber(value: unknown): number;
 export declare function toNonNegativeInt(value: unknown): number;
 export declare function toPriceString(value: unknown, fallback?: string): string;
 export declare function buildProductKey(productId: number, productVariantId: number): string;
+/** 加餐接口只提交本次新增商品，过滤掉首单预约占位规则行。 */
+export declare function filterProductsForScanOrderMore<T extends OrderSubmitProduct>(products?: T[]): T[];
 export declare function getTopLevelProductId(product: Record<string, any>): number | null;
 export declare function getTopLevelVariantId(product: Record<string, any>): number | null;
 export declare function buildQuantityLimitIndex(limits: QuantityLimitResult[]): {
@@ -134,6 +137,11 @@ export declare function normalizeOrderProduct(product: Partial<ScanOrderOrderPro
  * 从 reservation.enabled_reservation_rules 中收集 type=link 的商品 id。
  */
 export declare function collectLinkProductIdsFromReservationRules(rules: unknown): number[];
+/**
+ * 找到第一个归属指定桌台的预约规则商品。
+ * 归属判断基于商品资源中的 default_resource / optional_resource。
+ */
+export declare function findReservationRuleProductByResourceId(products: ProductData[], resourceId: string | number | null | undefined): ProductData | undefined;
 /**
  * 返回列表中第一个带有效 duration.value（分钟）的商品时长。
  */

package/dist/solution/ScanOrder/utils.js

@@ -154,6 +154,15 @@ export function toPriceString(value) {
 export function buildProductKey(productId, productVariantId) {
   return "".concat(productId, "_").concat(productVariantId);
 }
+
+/** 加餐接口只提交本次新增商品，过滤掉首单预约占位规则行。 */
+export function filterProductsForScanOrderMore() {
+  var products = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return products.filter(function (product) {
+    var _product$metadata;
+    return ((_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.is_rule) !== true;
+  });
+}
 export function getTopLevelProductId(product) {
   var _product$product_id;
   var rawProductId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product.id;
@@ -379,35 +388,46 @@ export function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
  * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
  */
 export function buildProductLineFingerprint(productOptionItem, productBundle) {
-  var optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
-  var normalizedOpts = optArr.map(function (item) {
-    var _ref, _item$add_price;
-    return {
-      option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
-      option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
-      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-      price: String((_ref = (_item$add_price = item === null || item === void 0 ? void 0 : item.add_price) !== null && _item$add_price !== void 0 ? _item$add_price : item === null || item === void 0 ? void 0 : item.price) !== null && _ref !== void 0 ? _ref : '')
-    };
-  }).sort(function (p, q) {
-    if (p.option_group_item_id !== q.option_group_item_id) {
-      return p.option_group_item_id - q.option_group_item_id;
-    }
-    if (p.option_group_id !== q.option_group_id) return p.option_group_id - q.option_group_id;
-    if (p.num !== q.num) return p.num - q.num;
-    return p.price.localeCompare(q.price);
-  });
+  var normalizeOptions = function normalizeOptions(options) {
+    var optionArr = Array.isArray(options) ? options : [];
+    return optionArr.map(function (item) {
+      var _ref, _item$add_price;
+      return {
+        option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
+        option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
+        num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+        price: String((_ref = (_item$add_price = item === null || item === void 0 ? void 0 : item.add_price) !== null && _item$add_price !== void 0 ? _item$add_price : item === null || item === void 0 ? void 0 : item.price) !== null && _ref !== void 0 ? _ref : '')
+      };
+    }).sort(function (p, q) {
+      if (p.option_group_item_id !== q.option_group_item_id) {
+        return p.option_group_item_id - q.option_group_item_id;
+      }
+      if (p.option_group_id !== q.option_group_id) {
+        return p.option_group_id - q.option_group_id;
+      }
+      if (p.num !== q.num) return p.num - q.num;
+      return p.price.localeCompare(q.price);
+    });
+  };
+  var normalizedOpts = normalizeOptions(productOptionItem);
   var bundleArr = Array.isArray(productBundle) ? productBundle : [];
   var normalizedBundles = bundleArr.map(function (item) {
-    var _ref2, _item$bundle_id;
+    var _ref2, _item$bundle_id, _item$bundle_variant_;
     return {
       bundle_id: Number((_ref2 = (_item$bundle_id = item === null || item === void 0 ? void 0 : item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref2 !== void 0 ? _ref2 : 0) || 0,
       product_id: Number(item === null || item === void 0 ? void 0 : item.product_id) || 0,
-      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+      product_variant_id: Number((_item$bundle_variant_ = item === null || item === void 0 ? void 0 : item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item === null || item === void 0 ? void 0 : item.product_variant_id) || 0,
+      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+      option: normalizeOptions(item === null || item === void 0 ? void 0 : item.option)
     };
   }).sort(function (p, q) {
     if (p.bundle_id !== q.bundle_id) return p.bundle_id - q.bundle_id;
     if (p.product_id !== q.product_id) return p.product_id - q.product_id;
-    return p.num - q.num;
+    if (p.product_variant_id !== q.product_variant_id) {
+      return p.product_variant_id - q.product_variant_id;
+    }
+    if (p.num !== q.num) return p.num - q.num;
+    return JSON.stringify(p.option).localeCompare(JSON.stringify(q.option));
   });
   return JSON.stringify([normalizedOpts, normalizedBundles]);
 }
@@ -482,11 +502,11 @@ export function getProductIdentityIndex(products, identity) {
  * - 因此多次 normalize 不会重复叠加 option/bundle。
  */
 export function normalizeOrderProduct(product) {
-  var _product$metadata, _metadata$origin, _product$product_sku, _metadata$origin2, _variantList$find, _product$is_charge_ta;
+  var _product$metadata2, _metadata$origin, _product$product_sku, _metadata$origin2, _variantList$find, _product$is_charge_ta;
   var metadata = _objectSpread({}, product.metadata || {});
   // 不透明 identity 契约：每条订单行必须带 identity_key。
   // 调用方未传时由 SDK 自动生成 UUID，后续 update/remove 只做严格比对，避免猜测合成 key。
-  var resolvedIdentityKey = (_product$metadata = product.metadata) !== null && _product$metadata !== void 0 && _product$metadata.unique_identification_number ? String(product.metadata.unique_identification_number) : product.unique_identification_number && String(product.unique_identification_number).length > 0 ? String(product.unique_identification_number) : product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : createUuidV4();
+  var resolvedIdentityKey = (_product$metadata2 = product.metadata) !== null && _product$metadata2 !== void 0 && _product$metadata2.unique_identification_number ? String(product.metadata.unique_identification_number) : product.unique_identification_number && String(product.unique_identification_number).length > 0 ? String(product.unique_identification_number) : product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : createUuidV4();
   metadata.unique_identification_number = resolvedIdentityKey;
   var priceOverride = metadata.price_override;
   var originOtherBundle = (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin._extend) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin.other) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.bundle;
@@ -695,23 +715,55 @@ export function collectLinkProductIdsFromReservationRules(rules) {
 }
 
 /**
- * 返回列表中第一个带有效 duration.value（分钟）的商品时长。
+ * 找到第一个归属指定桌台的预约规则商品。
+ * 归属判断基于商品资源中的 default_resource / optional_resource。
  */
-export function pickFirstDurationMinutesFromProducts(products) {
+export function findReservationRuleProductByResourceId(products, resourceId) {
+  var numericResourceId = Number(resourceId);
+  if (!Number.isFinite(numericResourceId) || numericResourceId <= 0) return undefined;
   var _iterator7 = _createForOfIteratorHelper(products),
     _step7;
   try {
     for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-      var _product$duration;
+      var _product$product_reso;
       var product = _step7.value;
+      var resources = product === null || product === void 0 || (_product$product_reso = product.product_resource) === null || _product$product_reso === void 0 ? void 0 : _product$product_reso.resources;
+      if (!Array.isArray(resources)) continue;
+      var hasMatchedResource = resources.some(function (resource) {
+        var defaultResources = Array.isArray(resource === null || resource === void 0 ? void 0 : resource.default_resource) ? resource.default_resource : [];
+        var optionalResources = Array.isArray(resource === null || resource === void 0 ? void 0 : resource.optional_resource) ? resource.optional_resource : [];
+        return [].concat(_toConsumableArray(defaultResources), _toConsumableArray(optionalResources)).some(function (id) {
+          return Number(id) === numericResourceId;
+        });
+      });
+      if (hasMatchedResource) return product;
+    }
+  } catch (err) {
+    _iterator7.e(err);
+  } finally {
+    _iterator7.f();
+  }
+  return undefined;
+}
+
+/**
+ * 返回列表中第一个带有效 duration.value（分钟）的商品时长。
+ */
+export function pickFirstDurationMinutesFromProducts(products) {
+  var _iterator8 = _createForOfIteratorHelper(products),
+    _step8;
+  try {
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      var _product$duration;
+      var product = _step8.value;
       var value = product === null || product === void 0 || (_product$duration = product.duration) === null || _product$duration === void 0 ? void 0 : _product$duration.value;
       var n = Number(value);
       if (Number.isFinite(n) && n > 0) return Math.floor(n);
     }
   } catch (err) {
-    _iterator7.e(err);
+    _iterator8.e(err);
   } finally {
-    _iterator7.f();
+    _iterator8.f();
   }
   return undefined;
 }
@@ -741,11 +793,11 @@ export function computeResourceIsFull(params) {
   if (!Number.isFinite(totalCapacity) || totalCapacity <= 0) return false;
   var now = dayjs();
   var occupied = 0;
-  var _iterator8 = _createForOfIteratorHelper(capacityList || []),
-    _step8;
+  var _iterator9 = _createForOfIteratorHelper(capacityList || []),
+    _step9;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-      var slot = _step8.value;
+    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+      var slot = _step9.value;
       var start = dayjs(slot === null || slot === void 0 ? void 0 : slot.start_at);
       var end = dayjs(slot === null || slot === void 0 ? void 0 : slot.end_at);
       if (!start.isValid() || !end.isValid()) continue;
@@ -755,9 +807,9 @@ export function computeResourceIsFull(params) {
       }
     }
   } catch (err) {
-    _iterator8.e(err);
+    _iterator9.e(err);
   } finally {
-    _iterator8.f();
+    _iterator9.f();
   }
   return occupied >= totalCapacity;
 }
@@ -767,11 +819,11 @@ export function computeResourceIsFull(params) {
  * 仅返回有限数字字段；若均无法解析则返回 `undefined`。
  */
 export function pickFirstCustomCapacityPaxBounds(products) {
-  var _iterator9 = _createForOfIteratorHelper(products),
-    _step9;
+  var _iterator10 = _createForOfIteratorHelper(products),
+    _step10;
   try {
-    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-      var p = _step9.value;
+    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+      var p = _step10.value;
       var cap = p === null || p === void 0 ? void 0 : p.capacity;
       if (!cap || cap.type !== 'custom') continue;
       if (!Array.isArray(cap.custom) || cap.custom.length === 0) continue;
@@ -790,9 +842,9 @@ export function pickFirstCustomCapacityPaxBounds(products) {
       if (out.min !== undefined || out.max !== undefined) return out;
     }
   } catch (err) {
-    _iterator9.e(err);
+    _iterator10.e(err);
   } finally {
-    _iterator9.f();
+    _iterator10.f();
   }
   return undefined;
 }
@@ -802,11 +854,11 @@ export function pickFirstCustomCapacityPaxBounds(products) {
  * 无匹配时返回 `undefined`，调用方应回退为 `0`。
  */
 export function pickFirstCustomCapacityDimensionId(products) {
-  var _iterator10 = _createForOfIteratorHelper(products),
-    _step10;
+  var _iterator11 = _createForOfIteratorHelper(products),
+    _step11;
   try {
-    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-      var p = _step10.value;
+    for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+      var p = _step11.value;
       var cap = p === null || p === void 0 ? void 0 : p.capacity;
       if (!cap || cap.type !== 'custom') continue;
       if (!Array.isArray(cap.custom) || cap.custom.length === 0) continue;
@@ -822,9 +874,9 @@ export function pickFirstCustomCapacityDimensionId(products) {
       }
     }
   } catch (err) {
-    _iterator10.e(err);
+    _iterator11.e(err);
   } finally {
-    _iterator10.f();
+    _iterator11.f();
   }
   return undefined;
 }

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

@@ -40,6 +40,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         discountList: Discount[];
     };
     setProductList(productList: Record<string, any>[]): void;
+    batchSearchByProductIds(productIds: number[]): Promise<Discount[]>;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         productList: Record<string, any>[];