@pisell/pisellos 2.1.135 → 2.1.136

package/dist/solution/ScanOrder/index.js

@@ -2462,7 +2462,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "checkResourceAvailable",
     value: function () {
       var _checkResourceAvailable = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(resourceId, hasOrderId) {
-        var _this$otherParams10, _this$otherParams10$g, _occupyDetail$form_re, _occupyDetail$form_re2, _this$otherParams11, _this$store$order5, _this$store$order7, _this$store$order7$ge, _this$otherParams12, openData, dineInConfig, closedBehaviorValue, closedMessage, basicUnavailableMessage, pauseMessage, makeShopClosed, operatingHourIds, outsideOperatingHours, scheduleList, now, tempOrder, reservationLinkIds, pendingRequestEntryPax, pendingRequestPaxMin, pendingRequestPaxMax, reservationProductList, scheduleDate, scheduleDatetime, loaded, occupancyMinutes, paxBounds, occupyDetail, resourceSelectType, resourceState, availabilityInfo, _this$store$order6, _res$data, res, entryPaxNumber, lastOrderInfo, historicalItems;
+        var _this$otherParams$bus, _this$otherParams10, _this$otherParams$cha, _this$otherParams11, _this$otherParams12, _this$otherParams12$g, _occupyDetail$form_re, _occupyDetail$form_re2, _this$otherParams13, _this$store$order5, _this$store$order7, _this$store$order7$ge, _this$otherParams14, businessCode, channel, openDataTarget, openData, dineInConfig, closedBehaviorValue, closedMessage, basicUnavailableMessage, pauseMessage, makeShopClosed, operatingHourIds, outsideOperatingHours, scheduleList, now, tempOrder, reservationLinkIds, pendingRequestEntryPax, pendingRequestPaxMin, pendingRequestPaxMax, reservationProductList, scheduleDate, scheduleDatetime, loaded, occupancyMinutes, paxBounds, occupyDetail, resourceSelectType, resourceState, availabilityInfo, _this$store$order6, _res$data, res, entryPaxNumber, lastOrderInfo, historicalItems;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
             case 0:
@@ -2470,25 +2470,28 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 resourceId: resourceId
               });
               _context36.prev = 1;
-              _context36.next = 4;
-              return (_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 || (_this$otherParams10$g = _this$otherParams10.getOpenData) === null || _this$otherParams10$g === void 0 ? void 0 : _this$otherParams10$g.call(_this$otherParams10, {
+              businessCode = String((_this$otherParams$bus = (_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.businessCode) !== null && _this$otherParams$bus !== void 0 ? _this$otherParams$bus : '').trim();
+              channel = String((_this$otherParams$cha = (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.channel) !== null && _this$otherParams$cha !== void 0 ? _this$otherParams$cha : '').trim();
+              openDataTarget = businessCode && channel ? "".concat(businessCode, "+").concat(channel) : 'dine_in+scan_to_order';
+              _context36.next = 7;
+              return (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 || (_this$otherParams12$g = _this$otherParams12.getOpenData) === null || _this$otherParams12$g === void 0 ? void 0 : _this$otherParams12$g.call(_this$otherParams12, {
                 scope: 'board',
-                target: 'dine_in+scan_to_order',
+                target: openDataTarget,
                 section_code: ['basic', 'fulfillment', 'reservation', 'sale', 'menu', 'availability', 'workflow']
               });
-            case 4:
+            case 7:
               openData = _context36.sent;
               if (!((openData === null || openData === void 0 ? void 0 : openData.status) === false)) {
-                _context36.next = 7;
+                _context36.next = 10;
                 break;
               }
               throw new Error((openData === null || openData === void 0 ? void 0 : openData.message) || '获取店铺配置失败');
-            case 7:
+            case 10:
               dineInConfig = (openData === null || openData === void 0 ? void 0 : openData.data) || {};
               this.otherParams.dineInConfig = dineInConfig;
-              _context36.next = 11;
+              _context36.next = 14;
               return this.syncItemRuleConfigsFromDineInConfig(dineInConfig);
-            case 11:
+            case 14:
               closedBehaviorValue = dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['availability.closed_behavior'];
               closedMessage = (dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['availability.closed_message']) || (dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['availability.message']) || (dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['basic.closed_message']);
               basicUnavailableMessage = (dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['basic.unavailable_message']) || closedMessage;
@@ -2505,21 +2508,21 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 };
               }; // 1. 基础开关 basic.enable 关闭
               if (!((dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['basic.enable']) === false)) {
-                _context36.next = 18;
+                _context36.next = 21;
                 break;
               }
               return _context36.abrupt("return", makeShopClosed(basicUnavailableMessage));
-            case 18:
+            case 21:
               if (!toBoolean(dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['availability.paused'])) {
-                _context36.next = 21;
+                _context36.next = 24;
                 break;
               }
               if (!((dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['availability.pause_behavior']) === 'hide_all')) {
-                _context36.next = 21;
+                _context36.next = 24;
                 break;
               }
               return _context36.abrupt("return", makeShopClosed(pauseMessage));
-            case 21:
+            case 24:
               // 3. 营业时间 operating_hours 闸门
               operatingHourIds = Array.isArray(dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['availability.operating_hours']) ? dineInConfig['availability.operating_hours'].map(function (id) {
                 return Number(id);
@@ -2535,27 +2538,27 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               if (!(outsideOperatingHours && closedBehaviorValue !== 'show_menu_disabled')) {
-                _context36.next = 26;
+                _context36.next = 29;
                 break;
               }
               return _context36.abrupt("return", makeShopClosed(closedMessage, closedBehaviorValue));
-            case 26:
+            case 29:
               // Step1: 先加载预约规则商品，拿到 enabledReservationRuleProducts 与容量附加信息
               // （resourceSelectType 需要基于这些商品 + 占用接口的 form_id 计算，故必须前置）
               tempOrder = this.ensureTempOrder();
               reservationLinkIds = collectLinkProductIdsFromReservationRules(dineInConfig['fulfillment.enabled_resource_rules']);
               if (!(reservationLinkIds.length === 0)) {
-                _context36.next = 32;
+                _context36.next = 35;
                 break;
               }
               this.enabledReservationRuleProducts = [];
-              _context36.next = 43;
+              _context36.next = 46;
               break;
-            case 32:
+            case 35:
               tempOrder.metadata = _objectSpread({}, tempOrder.metadata || {});
               delete tempOrder.metadata.table_occupancy_duration;
               reservationProductList = new ProductList("".concat(this.name, "_reservationEnabledRules"), this.defaultVersion);
-              _context36.next = 37;
+              _context36.next = 40;
               return reservationProductList.initialize(this.core, {
                 store: {
                   list: [],
@@ -2567,17 +2570,17 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                   cacheId: this.cacheId
                 })
               });
-            case 37:
+            case 40:
               scheduleDate = dayjs().format('YYYY-MM-DD');
               scheduleDatetime = dayjs().format('YYYY-MM-DD HH:mm:ss');
-              _context36.next = 41;
+              _context36.next = 44;
               return reservationProductList.loadProducts({
                 product_ids: reservationLinkIds,
                 schedule_date: scheduleDate,
                 schedule_datetime: scheduleDatetime,
                 cacheId: this.cacheId
               });
-            case 41:
+            case 44:
               loaded = _context36.sent;
               if (Array.isArray(loaded)) {
                 this.enabledReservationRuleProducts = loaded;
@@ -2602,10 +2605,10 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                   }
                 });
               }
-            case 43:
-              _context36.next = 45;
+            case 46:
+              _context36.next = 48;
               return this.fetchResourceOccupyDetailByResourceId(resourceId);
-            case 45:
+            case 48:
               occupyDetail = _context36.sent;
               // Step3: 结合预约规则商品的 product_resource.resources 与占用接口返回的 form_id，
               // 计算当前桌台的 resourceSelectType（single/multiple/capacity）
@@ -2639,30 +2642,30 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               } : {}), this.store.resource.requestPaxMax !== undefined ? {
                 requestPaxMax: this.store.resource.requestPaxMax
               } : {});
-              tempOrder.relation_id = resourceId || ((_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.relation_id);
+              tempOrder.relation_id = resourceId || ((_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.relation_id);
               tempOrder.table_form_id = resourceState.tableFormId;
               tempOrder.resource_id = resourceId;
               (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 || _this$store$order5.persistTempOrder();
 
               // 空闲状态下自动准备本地临时订单，供后续“购物车式”商品操作使用
               if (!(availabilityInfo.mode === 'idle')) {
-                _context36.next = 60;
+                _context36.next = 63;
                 break;
               }
-              _context36.next = 60;
+              _context36.next = 63;
               return this.addNewOrder();
-            case 60:
+            case 63:
               // 如果是加单模式，tempOrder 里 需要记录 lastOrderId，提交的时候走加单接口
               if (availabilityInfo.mode === 'additional_order' || availabilityInfo.mode === 'additional_order_with_code') {
                 tempOrder.order_id = resourceState.lastOrderId;
               }
               if (!tempOrder.order_id) {
-                _context36.next = 69;
+                _context36.next = 72;
                 break;
               }
-              _context36.next = 64;
+              _context36.next = 67;
               return (_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getOrderInfoByRemote(tempOrder.order_id);
-            case 64:
+            case 67:
               res = _context36.sent;
               // 找到下单的时候输入的 entryPaxNumber
               entryPaxNumber = res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data.bookings) === null || _res$data === void 0 || (_res$data = _res$data.find(function (p) {
@@ -2670,12 +2673,12 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 return (_p$metadata = p.metadata) === null || _p$metadata === void 0 ? void 0 : _p$metadata.collect_pax;
               })) === null || _res$data === void 0 || (_res$data = _res$data.metadata) === null || _res$data === void 0 ? void 0 : _res$data.collect_pax;
               if (!entryPaxNumber) {
-                _context36.next = 69;
+                _context36.next = 72;
                 break;
               }
-              _context36.next = 69;
+              _context36.next = 72;
               return this.setEntryPaxNumber(entryPaxNumber);
-            case 69:
+            case 72:
               lastOrderInfo = (_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 || (_this$store$order7$ge = _this$store$order7.getLastOrderInfo) === null || _this$store$order7$ge === void 0 ? void 0 : _this$store$order7$ge.call(_this$store$order7);
               historicalItems = hasOrderId && Array.isArray(lastOrderInfo === null || lastOrderInfo === void 0 ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce(function (acc, p) {
                 if (typeof (p === null || p === void 0 ? void 0 : p.product_id) !== 'number') return acc;
@@ -2687,13 +2690,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 } : {}));
                 return acc;
               }, []) : []; // pax 由 setEntryPaxNumber 负责写入 itemRuleRuntimeConfig.pax
-              _context36.next = 73;
+              _context36.next = 76;
               return this.setItemRuleRuntimeConfig({
-                serviceType: (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.businessCode,
+                serviceType: (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.businessCode,
                 submissionIndex: hasOrderId ? 1 : 0,
                 historicalItems: historicalItems
               });
-            case 73:
+            case 76:
               // operating_hours 超出营业时段 + closed_behavior=show_menu_disabled：
               // 允许浏览商品但 UI 层需拦截“下一步”，这里覆盖最终 mode 并回传错误提示
               if (outsideOperatingHours && closedBehaviorValue === 'show_menu_disabled') {
@@ -2715,18 +2718,18 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 isFull: resourceState.isFull
               });
               return _context36.abrupt("return", availabilityInfo);
-            case 78:
-              _context36.prev = 78;
+            case 81:
+              _context36.prev = 81;
               _context36.t0 = _context36["catch"](1);
               this.logMethodError('checkResourceAvailable', _context36.t0.message, {
                 resourceId: resourceId
               });
               throw _context36.t0;
-            case 82:
+            case 85:
             case "end":
               return _context36.stop();
           }
-        }, _callee36, this, [[1, 78]]);
+        }, _callee36, this, [[1, 81]]);
       }));
       function checkResourceAvailable(_x18, _x19) {
         return _checkResourceAvailable.apply(this, arguments);
@@ -2769,14 +2772,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getProductList",
     value: function () {
       var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38() {
-        var _this$otherParams13;
+        var _this$otherParams15;
         var menu_list_ids, _this$store$products, res, formattedRes;
         return _regeneratorRuntime().wrap(function _callee38$(_context38) {
           while (1) switch (_context38.prev = _context38.next) {
             case 0:
               this.logMethodStart('getProductList');
               // 可以直接通过配置里的 menu 读取
-              menu_list_ids = ((_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 || (_this$otherParams13 = _this$otherParams13.dineInConfig) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13['menu.associated_menus'].map(function (n) {
+              menu_list_ids = ((_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 || (_this$otherParams15 = _this$otherParams15.dineInConfig) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15['menu.associated_menus'].map(function (n) {
                 return Number(n.value);
               })) || [];
               _context38.prev = 2;
@@ -2979,9 +2982,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getFulfillmentModes",
     value: function getFulfillmentModes() {
-      var _this$otherParams14;
+      var _this$otherParams16;
       this.logMethodStart('getFulfillmentModes');
-      var dineInConfig = ((_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.dineInConfig) || {};
       var result = {
         enablePickup: Boolean(dineInConfig['fulfillment.enable_pickup']),
         enableTableService: Boolean(dineInConfig['fulfillment.enable_table_service'])
@@ -2995,9 +2998,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkManualPickupRef",
     value: function checkManualPickupRef() {
-      var _this$otherParams15;
+      var _this$otherParams17;
       this.logMethodStart('checkManualPickupRef');
-      var dineInConfig = ((_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.dineInConfig) || {};
       var refMode = dineInConfig['fulfillment.fulfillment_ref_mode'];
       var manualInputType = dineInConfig['fulfillment.manual_input_type'];
       var enabled = refMode === 'manual_input';

package/lib/solution/ScanOrder/index.js

@@ -1426,14 +1426,17 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   // 通过 resource_id + 店铺配置
   // hasOrderId 表示 url 上是否有 orderid，如果是的话，后续的流程会走加单
   async checkResourceAvailable(resourceId, hasOrderId) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     this.logMethodStart("checkResourceAvailable", {
       resourceId
     });
     try {
-      const openData = await ((_b = (_a = this.otherParams) == null ? void 0 : _a.getOpenData) == null ? void 0 : _b.call(_a, {
+      const businessCode = String(((_a = this.otherParams) == null ? void 0 : _a.businessCode) ?? "").trim();
+      const channel = String(((_b = this.otherParams) == null ? void 0 : _b.channel) ?? "").trim();
+      const openDataTarget = businessCode && channel ? `${businessCode}+${channel}` : "dine_in+scan_to_order";
+      const openData = await ((_d = (_c = this.otherParams) == null ? void 0 : _c.getOpenData) == null ? void 0 : _d.call(_c, {
         scope: "board",
-        target: "dine_in+scan_to_order",
+        target: openDataTarget,
         section_code: ["basic", "fulfillment", "reservation", "sale", "menu", "availability", "workflow"]
       }));
       if ((openData == null ? void 0 : openData.status) === false) {
@@ -1560,16 +1563,16 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         table_form_id: resourceState.tableFormId,
         deskmate_valid: resourceState.deskmate_valid,
         table_form_record: resourceState.table_form_record,
-        policy: (_c = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _c.policy,
-        partyroom_booking: (_d = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _d.partyroom_booking,
+        policy: (_e = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _e.policy,
+        partyroom_booking: (_f = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _f.partyroom_booking,
         ...this.store.resource.requestEntryPax !== void 0 ? { requestEntryPax: this.store.resource.requestEntryPax } : {},
         ...this.store.resource.requestPaxMin !== void 0 ? { requestPaxMin: this.store.resource.requestPaxMin } : {},
         ...this.store.resource.requestPaxMax !== void 0 ? { requestPaxMax: this.store.resource.requestPaxMax } : {}
       };
-      tempOrder.relation_id = resourceId || ((_e = this.otherParams) == null ? void 0 : _e.relation_id);
+      tempOrder.relation_id = resourceId || ((_g = this.otherParams) == null ? void 0 : _g.relation_id);
       tempOrder.table_form_id = resourceState.tableFormId;
       tempOrder.resource_id = resourceId;
-      (_f = this.store.order) == null ? void 0 : _f.persistTempOrder();
+      (_h = this.store.order) == null ? void 0 : _h.persistTempOrder();
       if (availabilityInfo.mode === "idle") {
         await this.addNewOrder();
       }
@@ -1577,16 +1580,16 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         tempOrder.order_id = resourceState.lastOrderId;
       }
       if (tempOrder.order_id) {
-        const res = await ((_g = this.store.order) == null ? void 0 : _g.getOrderInfoByRemote(tempOrder.order_id));
-        const entryPaxNumber = (_k = (_j = (_i = (_h = res == null ? void 0 : res.data) == null ? void 0 : _h.bookings) == null ? void 0 : _i.find((p) => {
+        const res = await ((_i = this.store.order) == null ? void 0 : _i.getOrderInfoByRemote(tempOrder.order_id));
+        const entryPaxNumber = (_m = (_l = (_k = (_j = res == null ? void 0 : res.data) == null ? void 0 : _j.bookings) == null ? void 0 : _k.find((p) => {
           var _a2;
           return (_a2 = p.metadata) == null ? void 0 : _a2.collect_pax;
-        })) == null ? void 0 : _j.metadata) == null ? void 0 : _k.collect_pax;
+        })) == null ? void 0 : _l.metadata) == null ? void 0 : _m.collect_pax;
         if (entryPaxNumber) {
           await this.setEntryPaxNumber(entryPaxNumber);
         }
       }
-      const lastOrderInfo = (_m = (_l = this.store.order) == null ? void 0 : _l.getLastOrderInfo) == null ? void 0 : _m.call(_l);
+      const lastOrderInfo = (_o = (_n = this.store.order) == null ? void 0 : _n.getLastOrderInfo) == null ? void 0 : _o.call(_n);
       const historicalItems = hasOrderId && Array.isArray(lastOrderInfo == null ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce((acc, p) => {
         if (typeof (p == null ? void 0 : p.product_id) !== "number")
           return acc;
@@ -1598,7 +1601,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         return acc;
       }, []) : [];
       await this.setItemRuleRuntimeConfig({
-        serviceType: (_n = this.otherParams) == null ? void 0 : _n.businessCode,
+        serviceType: (_p = this.otherParams) == null ? void 0 : _p.businessCode,
         submissionIndex: hasOrderId ? 1 : 0,
         historicalItems
       });

package/package.json

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