@pisell/pisellos 0.0.551 → 0.0.553

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

@@ -118,7 +118,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     setItemRuleRuntimeConfig(config?: ScanOrderItemRuleRuntimeConfig): Promise<void>;
     private normalizeResourceState;
     private resolveResourceSelectType;
-    private fetchResourceOccupyDetailByResourceId;
+    private fetchResourceOccupyDetailsByResourceId;
     checkResourceAvailable(resourceId?: string | null, hasOrderId?: boolean): Promise<ScanOrderAvailabilityInfo>;
     getAdditionalOrderInfo(): Promise<{
         orderId: string;

package/dist/solution/ScanOrder/index.js

@@ -2569,9 +2569,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       return matched === null || matched === void 0 ? void 0 : matched.type;
     }
   }, {
-    key: "fetchResourceOccupyDetailByResourceId",
+    key: "fetchResourceOccupyDetailsByResourceId",
     value: function () {
-      var _fetchResourceOccupyDetailByResourceId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(resourceId) {
+      var _fetchResourceOccupyDetailsByResourceId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(resourceId) {
         var _this$otherParams10, _this$otherParams10$g, _response$data$occupy, _response$data;
         var formRecordId, shopId, response;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
@@ -2607,17 +2607,17 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error((response === null || response === void 0 ? void 0 : response.message) || '获取资源占用详情失败');
             case 11:
-              return _context36.abrupt("return", (_response$data$occupy = response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 || (_response$data = _response$data.occupy_details) === null || _response$data === void 0 ? void 0 : _response$data[0]) !== null && _response$data$occupy !== void 0 ? _response$data$occupy : null);
+              return _context36.abrupt("return", (_response$data$occupy = response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.occupy_details) !== null && _response$data$occupy !== void 0 ? _response$data$occupy : []);
             case 12:
             case "end":
               return _context36.stop();
           }
         }, _callee36, this);
       }));
-      function fetchResourceOccupyDetailByResourceId(_x18) {
-        return _fetchResourceOccupyDetailByResourceId.apply(this, arguments);
+      function fetchResourceOccupyDetailsByResourceId(_x18) {
+        return _fetchResourceOccupyDetailsByResourceId.apply(this, arguments);
       }
-      return fetchResourceOccupyDetailByResourceId;
+      return fetchResourceOccupyDetailsByResourceId;
     }() // 检测当前链接是否可用
     // 通过 resource_id + 店铺配置
     // hasOrderId 表示 url 上是否有 orderid，如果是的话，后续的流程会走加单
@@ -2633,6 +2633,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           _this$otherParams12,
           _this$otherParams13,
           _this$otherParams13$g,
+          _occupyDetails$,
           _occupyDetail$form_re,
           _occupyDetail$form_re2,
           _this$otherParams14,
@@ -2666,10 +2667,17 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           occupancyMinutes,
           paxBounds,
           error,
+          occupyDetails,
           occupyDetail,
+          currentOrderId,
+          orderListIds,
+          multipleOrdersState,
+          _availabilityInfo,
           resourceSelectType,
           resourceState,
+          additionalOrderId,
           availabilityInfo,
+          isAdditionalOrderMode,
           _this$store$order7,
           _res$data,
           res,
@@ -2828,15 +2836,50 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 });
               }
 
-              // Step2: 请求新的资源占用详情接口
+              // Step2: 请求新的资源占用详情接口。occupy_details 第一维是资源，不是订单。
               _context37.next = 50;
-              return this.fetchResourceOccupyDetailByResourceId(normalizedResourceId);
+              return this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
             case 50:
-              occupyDetail = _context37.sent;
+              occupyDetails = _context37.sent;
+              occupyDetail = (_occupyDetails$ = occupyDetails[0]) !== null && _occupyDetails$ !== void 0 ? _occupyDetails$ : null;
+              currentOrderId = toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.order_id);
+              orderListIds = (Array.isArray(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.order_list) ? (occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.order_list) || [] : []).map(function (order) {
+                return toPositiveString(order === null || order === void 0 ? void 0 : order.id);
+              }).filter(Boolean);
+              if (!(!currentOrderId && orderListIds.length > 1)) {
+                _context37.next = 60;
+                break;
+              }
+              multipleOrdersState = _objectSpread(_objectSpread({}, this.normalizeResourceState(occupyDetail, undefined, hasOrderId)), {}, {
+                mode: 'multiple_orders'
+              });
+              this.store.resource = multipleOrdersState;
+              _availabilityInfo = {
+                mode: 'multiple_orders',
+                deskmate_valid: multipleOrdersState.deskmate_valid,
+                relation_id: multipleOrdersState.relationId,
+                table_form_id: multipleOrdersState.tableFormId,
+                table_form_record: multipleOrdersState.table_form_record
+              };
+              this.logMethodSuccess('checkResourceAvailable', {
+                resourceId: normalizedResourceId,
+                mode: _availabilityInfo.mode,
+                orderListCount: orderListIds.length
+              });
+              return _context37.abrupt("return", _availabilityInfo);
+            case 60:
               // Step3: 结合预约规则商品的 product_resource.resources 与占用接口返回的 form_id，
               // 计算当前桌台的 resourceSelectType（single/multiple/capacity）
               resourceSelectType = this.resolveResourceSelectType(toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id)); // Step4: 用 occupyDetail + resourceSelectType 规整为 resourceState
               resourceState = this.normalizeResourceState(occupyDetail, resourceSelectType, hasOrderId);
+              additionalOrderId = currentOrderId || orderListIds[0];
+              if (additionalOrderId) {
+                resourceState.mode = 'additional_order';
+                resourceState.order_id = additionalOrderId;
+              } else if (!currentOrderId && orderListIds.length === 0) {
+                resourceState.mode = 'idle';
+                resourceState.order_id = undefined;
+              }
               this.store.resource = resourceState;
 
               // Step5: 把预约规则商品阶段暂存的 requestEntryPax 等注入 store.resource
@@ -2872,23 +2915,23 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 空闲状态下自动准备本地临时订单，供后续“购物车式”商品操作使用
               if (!(availabilityInfo.mode === 'idle')) {
-                _context37.next = 65;
+                _context37.next = 76;
                 break;
               }
-              _context37.next = 65;
+              _context37.next = 76;
               return this.addNewOrder();
-            case 65:
-              // 如果是加单模式，tempOrder 里 需要记录 lastOrderId，提交的时候走加单接口
-              if (availabilityInfo.mode === 'additional_order' || availabilityInfo.mode === 'additional_order_with_code') {
-                tempOrder.order_id = resourceState.lastOrderId;
+            case 76:
+              isAdditionalOrderMode = availabilityInfo.mode === 'additional_order' || availabilityInfo.mode === 'additional_order_with_code'; // 如果是加单模式，tempOrder 里需要记录目标订单 id，提交的时候走加单接口
+              if (isAdditionalOrderMode) {
+                tempOrder.order_id = additionalOrderId;
               }
               if (!tempOrder.order_id) {
-                _context37.next = 74;
+                _context37.next = 86;
                 break;
               }
-              _context37.next = 69;
+              _context37.next = 81;
               return (_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 ? void 0 : _this$store$order7.getOrderInfoByRemote(tempOrder.order_id);
-            case 69:
+            case 81:
               res = _context37.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) {
@@ -2896,14 +2939,14 @@ 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) {
-                _context37.next = 74;
+                _context37.next = 86;
                 break;
               }
-              _context37.next = 74;
+              _context37.next = 86;
               return this.setEntryPaxNumber(entryPaxNumber);
-            case 74:
+            case 86:
               lastOrderInfo = (_this$store$order8 = this.store.order) === null || _this$store$order8 === void 0 || (_this$store$order8$ge = _this$store$order8.getLastOrderInfo) === null || _this$store$order8$ge === void 0 ? void 0 : _this$store$order8$ge.call(_this$store$order8);
-              historicalItems = hasOrderId && Array.isArray(lastOrderInfo === null || lastOrderInfo === void 0 ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce(function (acc, p) {
+              historicalItems = isAdditionalOrderMode && 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;
                 acc.push(_objectSpread({
                   product_id: p.product_id,
@@ -2913,13 +2956,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 } : {}));
                 return acc;
               }, []) : []; // pax 由 setEntryPaxNumber 负责写入 itemRuleRuntimeConfig.pax
-              _context37.next = 78;
+              _context37.next = 90;
               return this.setItemRuleRuntimeConfig({
                 serviceType: (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.businessCode,
-                submissionIndex: hasOrderId ? 1 : 0,
+                submissionIndex: isAdditionalOrderMode ? 1 : 0,
                 historicalItems: historicalItems
               });
-            case 78:
+            case 90:
               // operating_hours 超出营业时段 + closed_behavior=show_menu_disabled：
               // 允许浏览商品但 UI 层需拦截“下一步”，这里覆盖最终 mode 并回传错误提示
               if (outsideOperatingHours && closedBehaviorValue === 'show_menu_disabled') {
@@ -2941,18 +2984,18 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 isFull: resourceState.isFull
               });
               return _context37.abrupt("return", availabilityInfo);
-            case 83:
-              _context37.prev = 83;
+            case 95:
+              _context37.prev = 95;
               _context37.t0 = _context37["catch"](3);
               this.logMethodError('checkResourceAvailable', _context37.t0.message, {
                 resourceId: normalizedResourceId
               });
               throw _context37.t0;
-            case 87:
+            case 99:
             case "end":
               return _context37.stop();
           }
-        }, _callee37, this, [[3, 83]]);
+        }, _callee37, this, [[3, 95]]);
       }));
       function checkResourceAvailable(_x19) {
         return _checkResourceAvailable.apply(this, arguments);

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;
@@ -185,7 +186,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;
@@ -228,6 +229,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;

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

@@ -7,7 +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 } from '../../modules/Holder/types';
+import type { IAppendFormRecordParams, IRefreshAllFormRecordsParams } from '../../modules/Holder/types';
 export * from './types';
 interface VenueBookingItemRuleRuntimeConfig {
     strategyConfigs?: StrategyConfig[];
@@ -54,7 +54,6 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private normalizeCustomerId;
     private resolveCustomerIdFromLoginPayload;
     private resolveHolderCustomerId;
-    private ensureProductHolderForm;
     /**
      * 按商品 holder_config 预加载表单数据到 holderMap。
      * appointment_booking 在加购时触发；venueBooking 在商品加载后预加载，避免 getHolderFormMap 为空。
@@ -206,6 +205,10 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
      * 获取 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>;
     /**
      * 添加表单记录
      */