@pisell/pisellos 2.1.157 → 2.1.159

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -16,6 +16,7 @@ export interface BookingByStepState {
     schedule: ScheduleModule;
     salesSummary?: SalesSummaryModule;
     scanOrderLogger?: ScanOrderLoggerModule;
+    holder: HolderModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];
 export declare enum BookingByStepHooks {

package/dist/solution/BookingByStep/types.js

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from "../../modules";
+import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from "../../modules";
 export function createModule(moduleName, solutionName, name, version) {
   switch (moduleName) {
     case 'cart':
@@ -23,6 +23,8 @@ export function createModule(moduleName, solutionName, name, version) {
       return new ScheduleModule("".concat(solutionName, "_").concat(name || moduleName), version);
     case 'scanOrderLogger':
       return new ScanOrderLoggerModule("".concat(solutionName, "_").concat(name || moduleName), version);
+    case 'holder':
+      return new HolderModule("".concat(solutionName, "_").concat(name || moduleName), version);
     default:
       throw new Error("Unknown module type: ".concat(moduleName));
   }

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

@@ -72,7 +72,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     getTempOrder(): ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): string;
     setPickupReferenceMode(mode: 'counter_pickup' | 'table_service'): {
-        service_type: 'dine_in';
+        service_type: 'dine_in' | '';
         pickup_reference_mode: 'counter_pickup' | 'table_service';
     };
     setPickupRef(buzzer: string): string;

package/dist/solution/ScanOrder/index.js

@@ -852,11 +852,12 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         mode: mode
       });
       try {
+        var _this$otherParams4;
         if (!this.store.order) throw new Error('order 模块未初始化');
         var tempOrder = this.store.order.ensureTempOrder();
         tempOrder.metadata = _objectSpread(_objectSpread({}, tempOrder.metadata || {}), {}, {
           shop_service_data: _objectSpread(_objectSpread({}, (tempOrder.metadata || {}).shop_service_data || {}), {}, {
-            service_type: 'dine_in',
+            service_type: ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) === 'dine_in' ? 'dine_in' : 'take_away',
             pickup_reference_mode: mode
           })
         });
@@ -1339,7 +1340,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "prepareRetailAvailability",
     value: function () {
       var _prepareRetailAvailability = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
-        var _this$store$order4, _this$otherParams4;
+        var _this$store$order4, _this$otherParams5;
         var tempOrder, hasOrderId, resourceId, reason, resourceState, availabilityInfo;
         return _regeneratorRuntime().wrap(function _callee17$(_context17) {
           while (1) switch (_context17.prev = _context17.next) {
@@ -1370,7 +1371,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
             case 15:
               _context17.next = 17;
               return this.setItemRuleRuntimeConfig({
-                serviceType: (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode,
+                serviceType: (_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.businessCode,
                 submissionIndex: hasOrderId ? 1 : 0,
                 historicalItems: []
               });
@@ -1520,7 +1521,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "submitScanOrder",
     value: function () {
       var _submitScanOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
-        var _this$store$resource, _this$otherParams5, _this$otherParams6, _this$otherParams7, _this$otherParams8, _tempOrder$products, tempOrderForSubmit, resourceTableName, enhancePayload, result, tempOrder;
+        var _this$store$resource, _this$otherParams6, _this$otherParams7, _this$otherParams8, _this$otherParams9, _tempOrder$products, tempOrderForSubmit, resourceTableName, enhancePayload, result, tempOrder;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
@@ -1548,10 +1549,10 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               _context18.next = 14;
               return this.store.order.submitTempOrder({
                 cacheId: this.cacheId,
-                platform: (_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.platform,
-                businessCode: (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode,
-                channel: (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.channel,
-                type: (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.type,
+                platform: (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.platform,
+                businessCode: (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.businessCode,
+                channel: (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.channel,
+                type: (_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9.type,
                 enhancePayload: enhancePayload
               });
             case 14:
@@ -2481,14 +2482,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeResourceState",
     value: function normalizeResourceState(detail, resourceSelectType, hasOrderId) {
-      var _detail$form_record, _this$otherParams9, _detail$resource_capa, _detail$resource_capa2;
+      var _detail$form_record, _this$otherParams10, _detail$resource_capa, _detail$resource_capa2;
       var currentOrderId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.order_id);
       var lastOrderId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.last_order_id);
       var relationId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.form_record_id);
       var tableFormId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.form_id);
       var formRecord = (_detail$form_record = detail === null || detail === void 0 ? void 0 : detail.form_record) !== null && _detail$form_record !== void 0 ? _detail$form_record : null;
       // 是否允许加餐
-      var allowSnack = ((_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 || (_this$otherParams9 = _this$otherParams9.dineInConfig) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9['sale.allow_add_items']) || false;
+      var allowSnack = ((_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 || (_this$otherParams10 = _this$otherParams10.dineInConfig) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10['sale.allow_add_items']) || false;
       // 开启同桌验证 - 本期没有这个配置，默认关掉
       var deskmateValid = false;
       var isExclusive = resourceSelectType === 'single';
@@ -2571,7 +2572,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "fetchResourceOccupyDetailsByResourceId",
     value: function () {
       var _fetchResourceOccupyDetailsByResourceId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(resourceId) {
-        var _this$otherParams10, _this$otherParams10$g, _response$data$occupy, _response$data;
+        var _this$otherParams11, _this$otherParams11$g, _response$data$occupy, _response$data;
         var formRecordId, shopId, response;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
@@ -2583,7 +2584,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error("[ScanOrder] \u975E\u6CD5\u684C\u53F0 resourceId: ".concat(resourceId));
             case 3:
-              shopId = (_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 || (_this$otherParams10$g = _this$otherParams10.getStateData) === null || _this$otherParams10$g === void 0 ? void 0 : _this$otherParams10$g.call(_this$otherParams10, 'shop_id');
+              shopId = (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 || (_this$otherParams11$g = _this$otherParams11.getStateData) === null || _this$otherParams11$g === void 0 ? void 0 : _this$otherParams11$g.call(_this$otherParams11, 'shop_id');
               if (shopId) {
                 _context36.next = 6;
                 break;
@@ -2677,19 +2678,19 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         var hasOrderId,
           normalizedResourceId,
           _this$otherParams$bus,
-          _this$otherParams11,
-          _this$otherParams$cha,
           _this$otherParams12,
+          _this$otherParams$cha,
           _this$otherParams13,
-          _this$otherParams13$g,
+          _this$otherParams14,
+          _this$otherParams14$g,
           _occupyDetails$,
           _occupyDetail$form_re,
           _occupyDetail$form_re2,
-          _this$otherParams14,
+          _this$otherParams15,
           _this$store$order6,
           _this$store$order7,
           _this$store$order7$ge,
-          _this$otherParams15,
+          _this$otherParams16,
           businessCode,
           channel,
           openDataTarget,
@@ -2742,11 +2743,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 resourceId: normalizedResourceId
               });
               _context37.prev = 3;
-              businessCode = String((_this$otherParams$bus = (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.businessCode) !== null && _this$otherParams$bus !== void 0 ? _this$otherParams$bus : '').trim();
-              channel = String((_this$otherParams$cha = (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.channel) !== null && _this$otherParams$cha !== void 0 ? _this$otherParams$cha : '').trim();
+              businessCode = String((_this$otherParams$bus = (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.businessCode) !== null && _this$otherParams$bus !== void 0 ? _this$otherParams$bus : '').trim();
+              channel = String((_this$otherParams$cha = (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.channel) !== null && _this$otherParams$cha !== void 0 ? _this$otherParams$cha : '').trim();
               openDataTarget = businessCode && channel ? "".concat(businessCode, "+").concat(channel) : 'dine_in+scan_to_order';
               _context37.next = 9;
-              return (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 || (_this$otherParams13$g = _this$otherParams13.getOpenData) === null || _this$otherParams13$g === void 0 ? void 0 : _this$otherParams13$g.call(_this$otherParams13, {
+              return (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 || (_this$otherParams14$g = _this$otherParams14.getOpenData) === null || _this$otherParams14$g === void 0 ? void 0 : _this$otherParams14$g.call(_this$otherParams14, {
                 scope: 'board',
                 target: openDataTarget,
                 section_code: ['basic', 'fulfillment', 'reservation', 'sale', 'menu', 'availability', 'workflow']
@@ -2960,7 +2961,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               } : {}), this.store.resource.requestPaxMax !== undefined ? {
                 requestPaxMax: this.store.resource.requestPaxMax
               } : {});
-              tempOrder.relation_id = normalizedResourceId || ((_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.relation_id);
+              tempOrder.relation_id = normalizedResourceId || ((_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.relation_id);
               tempOrder.table_form_id = resourceState.tableFormId;
               tempOrder.resource_id = normalizedResourceId;
               (_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 || _this$store$order6.persistTempOrder();
@@ -2990,7 +2991,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               }, []) : []; // pax 由 setEntryPaxNumber 负责写入 itemRuleRuntimeConfig.pax
               _context37.next = 82;
               return this.setItemRuleRuntimeConfig({
-                serviceType: (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.businessCode,
+                serviceType: (_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.businessCode,
                 submissionIndex: isAdditionalOrderMode ? 1 : 0,
                 historicalItems: historicalItems
               });
@@ -3109,14 +3110,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getProductList",
     value: function () {
       var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40() {
-        var _this$otherParams16;
+        var _this$otherParams17;
         var menu_list_ids, res, productList, formattedRes;
         return _regeneratorRuntime().wrap(function _callee40$(_context40) {
           while (1) switch (_context40.prev = _context40.next) {
             case 0:
               this.logMethodStart('getProductList');
               // 可以直接通过配置里的 menu 读取
-              menu_list_ids = ((_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 || (_this$otherParams16 = _this$otherParams16.dineInConfig) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16['menu.associated_menus'].map(function (n) {
+              menu_list_ids = ((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 || (_this$otherParams17 = _this$otherParams17.dineInConfig) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17['menu.associated_menus'].map(function (n) {
                 return Number(n.value);
               })) || [];
               _context40.prev = 2;
@@ -3332,7 +3333,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncAdditionalOrderFromResource",
     value: function () {
       var _syncAdditionalOrderFromResource = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(resourceId) {
-        var _ref10, _ref11, _ref12, _this$store$resource2, _this$store$resource3, _occupyDetails$2, _this$store$resource4, _this$otherParams17, _this$store$order9;
+        var _ref10, _ref11, _ref12, _this$store$resource2, _this$store$resource3, _occupyDetails$2, _this$store$resource4, _this$otherParams18, _this$store$order9;
         var tempOrder, normalizedResourceId, _result, occupyDetails, occupyDetail, resourceSelectType, allowAddItems, result;
         return _regeneratorRuntime().wrap(function _callee43$(_context43) {
           while (1) switch (_context43.prev = _context43.next) {
@@ -3359,7 +3360,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               occupyDetails = _context43.sent;
               occupyDetail = (_occupyDetails$2 = occupyDetails[0]) !== null && _occupyDetails$2 !== void 0 ? _occupyDetails$2 : null;
               resourceSelectType = ((_this$store$resource4 = this.store.resource) === null || _this$store$resource4 === void 0 ? void 0 : _this$store$resource4.resourceSelectType) || this.resolveResourceSelectType(toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id));
-              allowAddItems = toBoolean((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 || (_this$otherParams17 = _this$otherParams17.dineInConfig) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17['sale.allow_add_items']);
+              allowAddItems = toBoolean((_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 || (_this$otherParams18 = _this$otherParams18.dineInConfig) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18['sale.allow_add_items']);
               result = this.resolveAdditionalOrderFromOccupyDetail(occupyDetail, resourceSelectType, allowAddItems);
               if (!(!result.matched || !result.order_id)) {
                 _context43.next = 17;
@@ -3417,9 +3418,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkAllowAddItems",
     value: function checkAllowAddItems() {
-      var _this$otherParams18;
+      var _this$otherParams19;
       this.logMethodStart('checkAllowAddItems');
-      var dineInConfig = ((_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.dineInConfig) || {};
       var result = {
         enabled: toBoolean(dineInConfig['sale.allow_add_items'])
       };
@@ -3432,9 +3433,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getFulfillmentModes",
     value: function getFulfillmentModes() {
-      var _this$otherParams19;
+      var _this$otherParams20;
       this.logMethodStart('getFulfillmentModes');
-      var dineInConfig = ((_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.dineInConfig) || {};
       var result = {
         enablePickup: Boolean(dineInConfig['fulfillment.enable_pickup']),
         enableTableService: Boolean(dineInConfig['fulfillment.enable_table_service'])
@@ -3448,9 +3449,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkManualPickupRef",
     value: function checkManualPickupRef() {
-      var _this$otherParams20;
+      var _this$otherParams21;
       this.logMethodStart('checkManualPickupRef');
-      var dineInConfig = ((_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.dineInConfig) || {};
       var refMode = dineInConfig['fulfillment.fulfillment_ref_mode'];
       var manualInputType = dineInConfig['fulfillment.manual_input_type'];
       var enabled = refMode === 'manual_input';

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

@@ -34,6 +34,7 @@ export interface ScanOrderOrderProductIdentity {
     /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
     product_option_item?: any[];
     product_bundle?: any[];
+    shop_id?: number | string;
 }
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;

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

@@ -7,6 +7,7 @@ import type { OpenDataAvailabilityResult } from '../../modules/OpenData';
 import type { ProductData } from '../../modules/Product/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
+import type { IAppendFormRecordParams, IRefreshAllFormRecordsParams } from '../../modules/Holder/types';
 export * from './types';
 interface VenueBookingItemRuleRuntimeConfig {
     strategyConfigs?: StrategyConfig[];
@@ -52,6 +53,12 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     constructor(name?: string, version?: string);
     private normalizeCustomerId;
     private resolveCustomerIdFromLoginPayload;
+    private resolveHolderCustomerId;
+    /**
+     * 按商品 holder_config 预加载表单数据到 holderMap。
+     * appointment_booking 在加购时触发；venueBooking 在商品加载后预加载，避免 getHolderFormMap 为空。
+     */
+    private preloadHolderForms;
     private clearLoginEffectListeners;
     private registerLoginEffect;
     private registerCustomerLoginListeners;
@@ -194,6 +201,18 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     getUIState<T = any>(key: string): T | undefined;
     deleteUIState(key: string): void;
     setBookingHolder(bookingUid: string, holder: any): void;
+    /**
+     * 获取 holder 表单 map
+     */
+    getHolderFormMap(): import("../../modules/Holder").HolderFormMap;
+    /**
+     * UI 层触发：按当前 holderMap 批量刷新所有表单的 records
+     */
+    refreshAllHolderFormRecords(params?: Pick<IRefreshAllFormRecordsParams, 'customer_id' | 'useCache' | 'recordsUrl' | 'num' | 'skip'>): Promise<import("../../modules/Holder").HolderFormMap>;
+    /**
+     * 添加表单记录
+     */
+    appendFormRecord(params: IAppendFormRecordParams): import("../../modules/Holder").IFormRecord;
     checkOpenDataAvailability(): Promise<OpenDataAvailabilityResult>;
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;