@pisell/pisellos 2.1.145 → 2.1.147

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

@@ -19,7 +19,7 @@ export declare class QuotationModule extends BaseModule implements Module {
      * 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.
      *
-     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/dist/modules/Quotation/index.js

@@ -89,7 +89,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               res = _context2.sent;
               list = (res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [];
               list.sort(function (a, b) {
-                return a.sort - b.sort;
+                return b.sort - a.sort;
               });
               this.store.list = list;
             case 9:
@@ -113,7 +113,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
      * 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.
      *
-     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/dist/solution/ScanOrder/index.js

@@ -1349,7 +1349,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       var resourceState = this.store.resource;
       var resourceSelectType = resourceState === null || resourceState === void 0 ? void 0 : resourceState.resourceSelectType;
 
-      // single 预约独占整张桌台，capacity 取 form_record.capacity；其他情况（multiple / capacity / undefined）占 1 个容量位
+      // 无 collect_pax 时的资源占用兜底：single 独占整张桌台，其余模式占 1 个容量位。
       var resolveResourceCapacity = function resolveResourceCapacity() {
         if (resourceSelectType === 'single') {
           var _resourceState$table_;
@@ -1361,10 +1361,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         return 1;
       };
       return function (payload, _ref3) {
-        var _tempOrder$resource_i, _ref4, _pickOriginal, _resourceState$table_2, _resourceState$relati, _tempOrder$metadata, _pickFirstCustomCapac;
+        var _tempOrder$resource_i, _tempOrder$metadata, _ref4, _pickOriginal, _resourceState$table_2, _resourceState$relati, _pickFirstCustomCapac;
         var bookingUuid = _ref3.bookingUuid,
           tempOrder = _ref3.tempOrder;
         var resourceId = (_tempOrder$resource_i = tempOrder.resource_id) !== null && _tempOrder$resource_i !== void 0 ? _tempOrder$resource_i : resourceState === null || resourceState === void 0 ? void 0 : resourceState.relationId;
+        var rawCollectPax = (_tempOrder$metadata = tempOrder.metadata) === null || _tempOrder$metadata === void 0 ? void 0 : _tempOrder$metadata.collect_pax;
+        var hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== undefined && rawCollectPax !== '';
+        var resourceCapacityValue = hasCollectPaxForCapacity ? normalizeSubmitCollectPaxValue(rawCollectPax) : resolveResourceCapacity();
         var pickOriginal = function pickOriginal(value) {
           if (value && _typeof(value) === 'object' && !Array.isArray(value)) {
             var original = value.original;
@@ -1380,17 +1383,15 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           main_field: mainField,
           form_id: resourceState.tableFormId,
           relation_id: (_resourceState$relati = resourceState.relationId) !== null && _resourceState$relati !== void 0 ? _resourceState$relati : resourceId,
-          capacity: resolveResourceCapacity(),
+          capacity: resourceCapacityValue,
           metadata: _this5.buildScanOrderResourceMetadata({
             resourceState: resourceState,
             resourceName: mainField
           })
         } : undefined;
         var ruleProductUid = ruleProduct ? createUuidV4() : undefined;
-        // 默认 resolveResourceCapacity（single 为桌台容量，其余多为 1）；有 collect_pax 时 value 优先用人数
-        var rawCollectPax = (_tempOrder$metadata = tempOrder.metadata) === null || _tempOrder$metadata === void 0 ? void 0 : _tempOrder$metadata.collect_pax;
-        var hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== undefined && rawCollectPax !== '';
-        var bookingCapacityValue = hasCollectPaxForCapacity ? normalizeSubmitCollectPaxValue(rawCollectPax) : resolveResourceCapacity();
+        // 有 collect_pax 时 booking/resource capacity 都代表本次 pax；否则使用资源占用兜底值。
+        var bookingCapacityValue = resourceCapacityValue;
         var bookingCapacityDimensionId = (_pickFirstCustomCapac = pickFirstCustomCapacityDimensionId(_this5.enabledReservationRuleProducts)) !== null && _pickFirstCustomCapac !== void 0 ? _pickFirstCustomCapac : 0;
         var nextBookings = (payload.bookings || []).map(function (booking, idx) {
           return _objectSpread(_objectSpread(_objectSpread({}, booking), {}, {

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

@@ -19,7 +19,7 @@ export declare class QuotationModule extends BaseModule implements Module {
      * 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.
      *
-     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/lib/modules/Quotation/index.js

@@ -52,7 +52,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
       { useCache: false }
     );
     const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
-    list.sort((a, b) => a.sort - b.sort);
+    list.sort((a, b) => b.sort - a.sort);
     this.store.list = list;
   }
   getQuotationList() {
@@ -62,7 +62,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
    * 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.
    *
-   * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
+   * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
    * First matching quotation whose schedule covers `datetime` and whose product_data contains
    * the requested productId wins.
    */

package/lib/solution/ScanOrder/index.js

@@ -838,6 +838,9 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     return (payload, { bookingUuid, tempOrder }) => {
       var _a, _b;
       const resourceId = tempOrder.resource_id ?? (resourceState == null ? void 0 : resourceState.relationId);
+      const rawCollectPax = (_a = tempOrder.metadata) == null ? void 0 : _a.collect_pax;
+      const hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== void 0 && rawCollectPax !== "";
+      const resourceCapacityValue = hasCollectPaxForCapacity ? (0, import_utils2.normalizeSubmitCollectPaxValue)(rawCollectPax) : resolveResourceCapacity();
       const pickOriginal = (value) => {
         if (value && typeof value === "object" && !Array.isArray(value)) {
           const original = value.original;
@@ -845,7 +848,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         }
         return void 0;
       };
-      const mainField = pickOriginal(tempOrder.table_number) ?? pickOriginal((_a = resourceState == null ? void 0 : resourceState.table_form_record) == null ? void 0 : _a.name) ?? "";
+      const mainField = pickOriginal(tempOrder.table_number) ?? pickOriginal((_b = resourceState == null ? void 0 : resourceState.table_form_record) == null ? void 0 : _b.name) ?? "";
       const resourceEntry = resourceState && resourceId ? {
         relation_type: "form",
         like_status: "common",
@@ -853,16 +856,14 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         main_field: mainField,
         form_id: resourceState.tableFormId,
         relation_id: resourceState.relationId ?? resourceId,
-        capacity: resolveResourceCapacity(),
+        capacity: resourceCapacityValue,
         metadata: this.buildScanOrderResourceMetadata({
           resourceState,
           resourceName: mainField
         })
       } : void 0;
       const ruleProductUid = ruleProduct ? (0, import_utils2.createUuidV4)() : void 0;
-      const rawCollectPax = (_b = tempOrder.metadata) == null ? void 0 : _b.collect_pax;
-      const hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== void 0 && rawCollectPax !== "";
-      const bookingCapacityValue = hasCollectPaxForCapacity ? (0, import_utils2.normalizeSubmitCollectPaxValue)(rawCollectPax) : resolveResourceCapacity();
+      const bookingCapacityValue = resourceCapacityValue;
       const bookingCapacityDimensionId = (0, import_utils.pickFirstCustomCapacityDimensionId)(this.enabledReservationRuleProducts) ?? 0;
       const nextBookings = (payload.bookings || []).map((booking, idx) => ({
         ...booking,

package/package.json

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