@pisell/pisellos 2.1.135 → 2.1.137

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

@@ -86,6 +86,8 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     onCustomerLogin(params: {
         customerId: number;
     }): Promise<void>;
+    private findReservationRuleResource;
+    private buildScanOrderResourceMetadata;
     private buildSubmitPayloadEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;

package/dist/solution/ScanOrder/index.js

@@ -1247,7 +1247,50 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         return _onCustomerLogin.apply(this, arguments);
       }
       return onCustomerLogin;
-    }() // ScanOrder 提交 payload enhancer：
+    }()
+  }, {
+    key: "findReservationRuleResource",
+    value: function findReservationRuleResource(formId) {
+      if (formId == null) return undefined;
+      var numericFormId = Number(formId);
+      if (!Number.isFinite(numericFormId) || numericFormId <= 0) return undefined;
+      var _iterator4 = _createForOfIteratorHelper(this.enabledReservationRuleProducts),
+        _step4;
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var _product$product_reso;
+          var product = _step4.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 matched = resources.find(function (resource) {
+            return Number(resource === null || resource === void 0 ? void 0 : resource.id) === numericFormId;
+          });
+          if (matched) return matched;
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
+      return undefined;
+    }
+  }, {
+    key: "buildScanOrderResourceMetadata",
+    value: function buildScanOrderResourceMetadata(params) {
+      var _ruleResource$title;
+      var resourceState = params.resourceState,
+        resourceName = params.resourceName;
+      var ruleResource = this.findReservationRuleResource(resourceState.tableFormId);
+      var combined = ruleResource === null || ruleResource === void 0 ? void 0 : ruleResource.combined_resource;
+      var isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
+      return {
+        form_name: (_ruleResource$title = ruleResource === null || ruleResource === void 0 ? void 0 : ruleResource.title) !== null && _ruleResource$title !== void 0 ? _ruleResource$title : '',
+        resource_name: resourceName,
+        combined_resource: isCombined ? combined : null
+      };
+    }
+
+    // ScanOrder 提交 payload enhancer：
     // - 给所有 booking 注入 appointment_status: 'started'（扫码点餐语义）
     // - 给所有 booking 的 metadata 注入 resource_select_type（来自预约规则商品的 resource.type）
     // - 给第一条 booking 补 resources 与 product_uid（仅当存在 resource / rule product）
@@ -1292,7 +1335,10 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           form_id: resourceState.tableFormId,
           relation_id: (_resourceState$relati = resourceState.relationId) !== null && _resourceState$relati !== void 0 ? _resourceState$relati : resourceId,
           capacity: resolveResourceCapacity(),
-          metadata: {}
+          metadata: _this5.buildScanOrderResourceMetadata({
+            resourceState: resourceState,
+            resourceName: mainField
+          })
         } : undefined;
         var ruleProductUid = ruleProduct ? createUuidV4() : undefined;
         // 默认 resolveResourceCapacity（single 为桌台容量，其余多为 1）；有 collect_pax 时 value 优先用人数
@@ -1776,17 +1822,17 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 if (visited.has(value)) return;
                 visited.add(value);
                 if (Array.isArray(value)) {
-                  var _iterator4 = _createForOfIteratorHelper(value),
-                    _step4;
+                  var _iterator5 = _createForOfIteratorHelper(value),
+                    _step5;
                   try {
-                    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                      var item = _step4.value;
+                    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                      var item = _step5.value;
                       collectFromValue(item);
                     }
                   } catch (err) {
-                    _iterator4.e(err);
+                    _iterator5.e(err);
                   } finally {
-                    _iterator4.f();
+                    _iterator5.f();
                   }
                   return;
                 }
@@ -1947,7 +1993,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "applyPrefillByItemRule",
     value: function () {
       var _applyPrefillByItemRule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
-        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator5, _step5, _prefillItem$product_, _targetProduct$_origi, _targetProduct$_origi2, _targetProduct$_origi3, prefillItem, productId, productVariantId, targetQuantity, sourceItem, productIndex, _sourceItem$price, sellingPrice, targetProduct, existedQuantity, delta, nextProduct, hasQuantityChanged, hasOriginChanged;
+        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator6, _step6, _prefillItem$product_, _targetProduct$_origi, _targetProduct$_origi2, _targetProduct$_origi3, prefillItem, productId, productVariantId, targetQuantity, sourceItem, productIndex, _sourceItem$price, sellingPrice, targetProduct, existedQuantity, delta, nextProduct, hasQuantityChanged, hasOriginChanged;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
@@ -1992,15 +2038,15 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               productSourceMap = _context29.sent;
               tempOrder = this.ensureTempOrder();
               hasChanges = false;
-              _iterator5 = _createForOfIteratorHelper(prefillItems);
+              _iterator6 = _createForOfIteratorHelper(prefillItems);
               _context29.prev = 20;
-              _iterator5.s();
+              _iterator6.s();
             case 22:
-              if ((_step5 = _iterator5.n()).done) {
+              if ((_step6 = _iterator6.n()).done) {
                 _context29.next = 47;
                 break;
               }
-              prefillItem = _step5.value;
+              prefillItem = _step6.value;
               productId = Number(prefillItem.product_id);
               productVariantId = Number((_prefillItem$product_ = prefillItem.product_variant_id) !== null && _prefillItem$product_ !== void 0 ? _prefillItem$product_ : 0);
               targetQuantity = toNonNegativeInt(prefillItem.quantity);
@@ -2071,10 +2117,10 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
             case 49:
               _context29.prev = 49;
               _context29.t0 = _context29["catch"](20);
-              _iterator5.e(_context29.t0);
+              _iterator6.e(_context29.t0);
             case 52:
               _context29.prev = 52;
-              _iterator5.f();
+              _iterator6.f();
               return _context29.finish(52);
             case 55:
               if (!hasChanges) {

package/dist/solution/VenueBooking/index.js

@@ -44,7 +44,7 @@ import { ItemRuleEvaluator } from "../../model/strategy/adapter/itemRule";
 import { extractResourceIds, buildResourceProductMap } from "./utils/resource";
 import { buildTimeSlotGrid, isBusinessHoursCrossDay, generateTimeLabels } from "./utils/timeSlot";
 import { buildDateRangeSummary } from "./utils/dateSummary";
-import { mergeConsecutiveSlots, expandMergedSlotToIndividual, buildVenueIdentityKey, buildVenueBookingEntry, buildPriceBreakdown } from "./utils/slotMerge";
+import { mergeConsecutiveSlots, expandMergedSlotToIndividual, buildVenueIdentityKey, buildVenueBookingEntry, buildVenueResourceMetadata, buildPriceBreakdown } from "./utils/slotMerge";
 import { composeLinePrice, createUuidV4, sumOptionUnitPrice } from "../../modules/Order/utils";
 import { OrderModule } from "../../modules/Order";
 import { RegisterAndLoginHooks } from "../RegisterAndLogin/types";
@@ -1627,7 +1627,10 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                   form_id: (_rawResource$form_id = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_id) !== null && _rawResource$form_id !== void 0 ? _rawResource$form_id : mapping.formId,
                   relation_id: resourceId,
                   capacity: 1,
-                  metadata: {}
+                  metadata: buildVenueResourceMetadata({
+                    mapping: mapping,
+                    rawResource: rawResource
+                  })
                 };
                 if (childRawResources && childRawResources.length) {
                   resourceEntry.children = childRawResources.map(function (child) {

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

@@ -96,6 +96,7 @@ export interface VenueResourceRawData {
 export interface ResourceProductMapping {
     productId: number;
     productTitle: string;
+    formName?: string;
     resourceName: string;
     formId: number | string;
     price: string;

package/dist/solution/VenueBooking/utils/resource.js

@@ -93,6 +93,7 @@ export function buildResourceProductMap(products) {
               var mapping = {
                 productId: product.id,
                 productTitle: product.title,
+                formName: resource.title,
                 resourceName: resource.title,
                 formId: resource.id,
                 price: product.price || '0.00',

package/dist/solution/VenueBooking/utils/slotMerge.d.ts

@@ -25,6 +25,10 @@ export interface BuildVenueBookingParams {
      */
     childResources?: VenueResourceRawData[];
 }
+export declare function buildVenueResourceMetadata(params: {
+    mapping: ResourceProductMapping;
+    rawResource: VenueResourceRawData | undefined;
+}): Record<string, any>;
 export declare function buildVenueBookingEntry(params: BuildVenueBookingParams): Record<string, any>;
 /**
  * 从一条已合并的订单商品还原出独立的时段列表。

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -89,6 +89,18 @@ export function buildPriceBreakdown(params) {
   }
   return entries;
 }
+export function buildVenueResourceMetadata(params) {
+  var _mapping$formName, _rawResource$main_fie;
+  var mapping = params.mapping,
+    rawResource = params.rawResource;
+  var combined = rawResource === null || rawResource === void 0 ? void 0 : rawResource.combined_resource;
+  var isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
+  return {
+    form_name: (_mapping$formName = mapping.formName) !== null && _mapping$formName !== void 0 ? _mapping$formName : mapping.resourceName,
+    resource_name: (_rawResource$main_fie = rawResource === null || rawResource === void 0 ? void 0 : rawResource.main_field) !== null && _rawResource$main_fie !== void 0 ? _rawResource$main_fie : mapping.resourceName,
+    combined_resource: isCombined ? combined : null
+  };
+}
 export function buildVenueBookingEntry(params) {
   var _rawResource$form_id;
   var group = params.group,
@@ -109,7 +121,10 @@ export function buildVenueBookingEntry(params) {
     form_id: (_rawResource$form_id = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_id) !== null && _rawResource$form_id !== void 0 ? _rawResource$form_id : mapping.formId,
     relation_id: resourceId,
     capacity: 1,
-    metadata: {}
+    metadata: buildVenueResourceMetadata({
+      mapping: mapping,
+      rawResource: rawResource
+    })
   };
   if (childResources && childResources.length) {
     resourceEntry.children = childResources.map(function (child) {

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

@@ -86,6 +86,8 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     onCustomerLogin(params: {
         customerId: number;
     }): Promise<void>;
+    private findReservationRuleResource;
+    private buildScanOrderResourceMetadata;
     private buildSubmitPayloadEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;

package/lib/solution/ScanOrder/index.js

@@ -746,6 +746,34 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  findReservationRuleResource(formId) {
+    var _a;
+    if (formId == null)
+      return void 0;
+    const numericFormId = Number(formId);
+    if (!Number.isFinite(numericFormId) || numericFormId <= 0)
+      return void 0;
+    for (const product of this.enabledReservationRuleProducts) {
+      const resources = (_a = product == null ? void 0 : product.product_resource) == null ? void 0 : _a.resources;
+      if (!Array.isArray(resources))
+        continue;
+      const matched = resources.find((resource) => Number(resource == null ? void 0 : resource.id) === numericFormId);
+      if (matched)
+        return matched;
+    }
+    return void 0;
+  }
+  buildScanOrderResourceMetadata(params) {
+    const { resourceState, resourceName } = params;
+    const ruleResource = this.findReservationRuleResource(resourceState.tableFormId);
+    const combined = ruleResource == null ? void 0 : ruleResource.combined_resource;
+    const isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
+    return {
+      form_name: (ruleResource == null ? void 0 : ruleResource.title) ?? "",
+      resource_name: resourceName,
+      combined_resource: isCombined ? combined : null
+    };
+  }
   // ScanOrder 提交 payload enhancer：
   // - 给所有 booking 注入 appointment_status: 'started'（扫码点餐语义）
   // - 给所有 booking 的 metadata 注入 resource_select_type（来自预约规则商品的 resource.type）
@@ -785,7 +813,10 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         form_id: resourceState.tableFormId,
         relation_id: resourceState.relationId ?? resourceId,
         capacity: resolveResourceCapacity(),
-        metadata: {}
+        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;

package/lib/solution/VenueBooking/index.js

@@ -988,7 +988,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         form_id: (rawResource == null ? void 0 : rawResource.form_id) ?? mapping.formId,
         relation_id: resourceId,
         capacity: 1,
-        metadata: {}
+        metadata: (0, import_slotMerge.buildVenueResourceMetadata)({ mapping, rawResource })
       };
       if (childRawResources && childRawResources.length) {
         resourceEntry.children = childRawResources.map((child) => ({

package/lib/solution/VenueBooking/types.d.ts

@@ -96,6 +96,7 @@ export interface VenueResourceRawData {
 export interface ResourceProductMapping {
     productId: number;
     productTitle: string;
+    formName?: string;
     resourceName: string;
     formId: number | string;
     price: string;

package/lib/solution/VenueBooking/utils/resource.js

@@ -69,6 +69,7 @@ function buildResourceProductMap(products) {
         const mapping = {
           productId: product.id,
           productTitle: product.title,
+          formName: resource.title,
           resourceName: resource.title,
           formId: resource.id,
           price: product.price || "0.00",

package/lib/solution/VenueBooking/utils/slotMerge.d.ts

@@ -25,6 +25,10 @@ export interface BuildVenueBookingParams {
      */
     childResources?: VenueResourceRawData[];
 }
+export declare function buildVenueResourceMetadata(params: {
+    mapping: ResourceProductMapping;
+    rawResource: VenueResourceRawData | undefined;
+}): Record<string, any>;
 export declare function buildVenueBookingEntry(params: BuildVenueBookingParams): Record<string, any>;
 /**
  * 从一条已合并的订单商品还原出独立的时段列表。

package/lib/solution/VenueBooking/utils/slotMerge.js

@@ -32,6 +32,7 @@ __export(slotMerge_exports, {
   buildPriceBreakdown: () => buildPriceBreakdown,
   buildVenueBookingEntry: () => buildVenueBookingEntry,
   buildVenueIdentityKey: () => buildVenueIdentityKey,
+  buildVenueResourceMetadata: () => buildVenueResourceMetadata,
   expandMergedSlotToIndividual: () => expandMergedSlotToIndividual,
   mergeConsecutiveSlots: () => mergeConsecutiveSlots
 });
@@ -106,6 +107,16 @@ function buildPriceBreakdown(params) {
   }
   return entries;
 }
+function buildVenueResourceMetadata(params) {
+  const { mapping, rawResource } = params;
+  const combined = rawResource == null ? void 0 : rawResource.combined_resource;
+  const isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
+  return {
+    form_name: mapping.formName ?? mapping.resourceName,
+    resource_name: (rawResource == null ? void 0 : rawResource.main_field) ?? mapping.resourceName,
+    combined_resource: isCombined ? combined : null
+  };
+}
 function buildVenueBookingEntry(params) {
   const { group, resourceId, mapping, rawResource, bookingUuid, productUid, childResources } = params;
   const startMoment = (0, import_dayjs.default)(group.startTime, "YYYY-MM-DD HH:mm");
@@ -119,7 +130,7 @@ function buildVenueBookingEntry(params) {
     form_id: (rawResource == null ? void 0 : rawResource.form_id) ?? mapping.formId,
     relation_id: resourceId,
     capacity: 1,
-    metadata: {}
+    metadata: buildVenueResourceMetadata({ mapping, rawResource })
   };
   if (childResources && childResources.length) {
     resourceEntry.children = childResources.map((child) => ({
@@ -220,6 +231,7 @@ function expandMergedSlotToIndividual(product, slotDurationMinutes) {
   buildPriceBreakdown,
   buildVenueBookingEntry,
   buildVenueIdentityKey,
+  buildVenueResourceMetadata,
   expandMergedSlotToIndividual,
   mergeConsecutiveSlots
 });

package/package.json

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