@pisell/pisellos 0.0.568 → 0.0.570

package/lib/solution/ScanOrder/index.js

@@ -7,7 +7,7 @@ var _exportNames = {
   ScanOrderImpl: true
 };
 exports.ScanOrderImpl = void 0;
-var _BaseModule = require("../../modules/BaseModule");
+var _BaseSales = require("../BaseSales");
 var _types = require("./types");
 Object.keys(_types).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -27,13 +27,12 @@ var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("./utils");
 var _types4 = require("../BookingByStep/types");
 var _ProductList = require("../../modules/ProductList");
-var _Schedule = require("../../modules/Schedule");
 var _getDateIsInSchedule = require("../../modules/Schedule/getDateIsInSchedule");
 var _utils2 = require("../../modules/Order/utils");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _itemRule = require("../../model/strategy/adapter/itemRule");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-class ScanOrderImpl extends _BaseModule.BaseModule {
+class ScanOrderImpl extends _BaseSales.BaseSalesImpl {
   defaultName = 'scanOrder';
   defaultVersion = '1.0.0';
   isSolution = true;
@@ -269,21 +268,22 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
   }
+  getRegisteredModuleNames() {
+    return ['scanOrderLogger', 'products', 'order', 'salesSummary', 'schedule'];
+  }
+  createSubModule(moduleName) {
+    if (moduleName === 'scanOrderLogger') {
+      return (0, _types4.createModule)('scanOrderLogger', this.name);
+    }
+    return super.createSubModule(moduleName);
+  }
 
   /** 与 `otherParams.cacheId` 一致，供宿主在 URL 变化时判断是否需要重新注册模块 */
   getCacheId() {
     return this.cacheId;
   }
-  async destroyRegisteredChildModules() {
-    const modules = [this.store.schedule, this.store.salesSummary, this.store.order, this.store.products, this.store.scanOrderLogger];
-    for (const mod of modules) {
-      if (mod && typeof mod.destroy === 'function') await Promise.resolve(mod.destroy());
-    }
-  }
   async initialize(core, options = {}) {
     this.logMethodStart('initialize');
-    this.core = core;
-    this.initializeOptions = options || {};
     this.store = {
       ...this.store,
       ...options.store
@@ -302,60 +302,17 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
       passed: null,
       failures: []
     };
-    this.window = core.getPlugin('window');
-    this.request = core.getPlugin('request');
-    if (!this.window) {
-      this.logMethodError('initialize', 'window plugin missing');
-      throw new Error('scanOrder解决方案需要 window 插件支持');
-    }
-    if (!this.request) {
-      this.logMethodError('initialize', 'request plugin missing');
-      throw new Error('scanOrder解决方案需要 request 插件支持');
-    }
-    const moduleArr = ['scanOrderLogger', 'products', 'order', 'salesSummary'];
-    moduleArr.forEach(step => {
-      const targetModule = (0, _types4.createModule)(step, this.name);
-      if (targetModule) {
-        this.store[step] = targetModule;
-        const initialState = step === 'salesSummary' ? {
-          summary: this.store.order?.getTempOrder()?.summary || (0, _utils.createEmptySummary)()
-        } : {};
-        const loggerProvider = this.otherParams?.scanOrderLoggerProvider || 'feishu';
-        const loggerConfig = this.otherParams?.scanOrderLoggerConfig || {
-          feishu: {
-            webhook: 'https://open.feishu.cn/open-apis/bot/v2/hook/216b3fe6-af98-424e-8706-f0471241a7ed',
-            errorHook: 'https://open.feishu.cn/open-apis/bot/v2/hook/015b7c2a-dd3c-4c30-9898-ef0f5253111f'
-          }
-        };
-        this.core.registerModule(targetModule, {
-          initialState,
-          otherParams: {
-            ...this.otherParams,
-            fatherModule: this.name,
-            openCache: this.otherParams?.cacheId ? true : false,
-            cacheId: this.otherParams?.cacheId,
-            salesSummaryModuleName: `${this.name}_salesSummary`,
-            provider: loggerProvider,
-            providerConfig: loggerConfig,
-            context: this.getScanOrderLoggerContext()
-          }
-        });
-      } else {
-        this.logMethodError('initialize', `module ${step} missing`);
-        throw new Error(`模块 ${step} 不存在`);
-      }
-    });
+    await super.initialize(core, options);
     if (this.store.scanOrderLogger) {
+      this.store.scanOrderLogger.setProvider(this.otherParams?.scanOrderLoggerProvider || 'feishu');
+      this.store.scanOrderLogger.setProviderConfig(this.otherParams?.scanOrderLoggerConfig || {
+        feishu: {
+          webhook: 'https://open.feishu.cn/open-apis/bot/v2/hook/216b3fe6-af98-424e-8706-f0471241a7ed',
+          errorHook: 'https://open.feishu.cn/open-apis/bot/v2/hook/015b7c2a-dd3c-4c30-9898-ef0f5253111f'
+        }
+      });
       this.store.scanOrderLogger.setContext(this.getScanOrderLoggerContext());
     }
-    const scheduleModule = new _Schedule.ScheduleModule(`${this.name}_schedule`);
-    this.store.schedule = scheduleModule;
-    this.core.registerModule(scheduleModule, {
-      otherParams: {
-        ...this.otherParams,
-        fatherModule: this.name
-      }
-    });
     this.registerCustomerLoginListeners();
     try {
       await this.store.order?.recalculateSummary({
@@ -392,7 +349,6 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
     this.logMethodStart('destroy');
     this.clearLoginEffectListeners();
     await this.core.effects.emit(_types.ScanOrderHooks.onDestroy, {});
-    await this.destroyRegisteredChildModules();
     super.destroy();
     this.logMethodSuccess('destroy');
   }
@@ -491,17 +447,26 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
     });
     return result;
   }
-  updateTempOrderNote(note) {
+  updateTempOrderNote(note, sync = false) {
     this.logMethodStart('updateTempOrderNote', {
       noteLength: String(note || '').length
     });
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');
-      const result = this.store.order.updateTempOrderNote(note);
+      const result = this.store.order.updateTempOrderNote(note, sync);
+      if (result && typeof result.then === 'function') {
+        return result.then(nextNote => {
+          this.logMethodSuccess('updateTempOrderNote', {
+            noteLength: nextNote.length
+          });
+          return nextNote;
+        });
+      }
+      const nextNote = result;
       this.logMethodSuccess('updateTempOrderNote', {
-        noteLength: result.length
+        noteLength: nextNote.length
       });
-      return result;
+      return nextNote;
     } catch (error) {
       this.logMethodError('updateTempOrderNote', error);
       throw error;
@@ -555,7 +520,7 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
       throw error;
     }
   }
-  ensureTempOrder() {
+  ensureScanOrderTempOrder() {
     if (!this.store.order) throw new Error('order 模块未初始化');
     return this.store.order.ensureTempOrder();
   }
@@ -608,7 +573,7 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
     this.logMethodStart('getSummary');
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');
-      const summary = await this.store.order.getScanOrderSummary();
+      const summary = await this.store.order.getOrderSummary();
       this.logMethodSuccess('getSummary', {
         totalAmount: summary.total_amount
       });
@@ -706,7 +671,7 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
         // 券作用于 source（不含 option、不含 bundle）；算出新 source 折后价后补回 options
         // 写入含 option 的 main_product_selling_price，再合成 composite 回写 selling_price。
         const totalPerUnitDiscount = (product.discount_list || []).reduce((sum, pd) => sum + (pd.amount || 0), 0);
-        const optionSum = (0, _utils2.sumOptionUnitPrice)(product.product_option_item);
+        const optionSum = (0, _utils2.sumOptionUnitPrice)((0, _utils2.getProductSkuOptions)(product));
         const sourcePrice = product.metadata?.source_product_price ?? (product.metadata?.main_product_original_price != null ? new _decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? '0');
         const newSourceSellingPrice = new _decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new _decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
@@ -818,8 +783,8 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
       mode: availabilityInfo.mode,
       retailMode: true,
       retailReason: reason,
-      persistedRelationId: tempOrder.relation_id,
-      persistedResourceId: tempOrder.resource_id
+      relationId: resourceState.relationId,
+      persistedResourceId: resourceState.relationId
     });
     return availabilityInfo;
   }
@@ -848,8 +813,8 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
       bookingUuid,
       tempOrder
     }) => {
-      const resourceId = String(tempOrder.resource_id ?? resourceState?.relationId ?? '').trim();
-      const hasReservationBookingContext = Boolean(ruleProduct && resourceState && resourceId && (tempOrder.relation_id || resourceState.relationId) && (tempOrder.table_form_id || resourceState.tableFormId));
+      const resourceId = String(resourceState?.relationId ?? '').trim();
+      const hasReservationBookingContext = Boolean(ruleProduct && resourceState && resourceId && resourceState.relationId && resourceState.tableFormId);
       if (!hasReservationBookingContext) {
         return {
           ...payload,
@@ -930,7 +895,9 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
           original_price: originalPrice,
           payment_price: sellingPrice,
           is_charge_tax: ruleProduct.is_gst ?? 0,
-          product_option_item: [],
+          product_sku: {
+            option: []
+          },
           discount_list: [],
           product_bundle: [],
           booking_uid: bookingUuid,
@@ -948,6 +915,52 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
       };
     };
   }
+  isScanOrderMoreMode(tempOrder) {
+    const mode = this.store.resource?.mode;
+    return Boolean(tempOrder.order_id && (mode === 'additional_order' || mode === 'additional_order_with_code' || this.store.entryContext?.mode === 'append'));
+  }
+  async submitScanOrderMore(params) {
+    if (!this.request) {
+      throw new Error('scanOrder解决方案需要 request 插件支持');
+    }
+    if (!this.store.order) {
+      throw new Error('scanOrder解决方案需要 order 模块支持');
+    }
+    const {
+      tempOrder,
+      enhancePayload
+    } = params;
+    const latestSummary = await this.store.order.recalculateSummary({
+      createIfMissing: true
+    });
+    const payload = (0, _utils2.buildSubmitPayload)({
+      tempOrder: tempOrder,
+      cacheId: this.cacheId,
+      platform: this.otherParams?.platform,
+      businessCode: this.otherParams?.businessCode || this.otherParams?.business_code,
+      channel: this.otherParams?.channel,
+      type: this.otherParams?.type,
+      summary: latestSummary,
+      enhance: enhancePayload
+    });
+    const products = (0, _utils.filterProductsForScanOrderMore)(payload.products);
+    const orderId = tempOrder.order_id;
+    const result = await this.request.put(`/order/order/product/${orderId}`, {
+      products,
+      request_unique_idempotency_token: payload.request_unique_idempotency_token
+    }, {
+      customToast: () => {}
+    });
+    if (result?.code === 200 && !result?.data) {
+      return {
+        ...result,
+        data: {
+          order_id: orderId
+        }
+      };
+    }
+    return result;
+  }
   async submitScanOrder() {
     this.logMethodStart('submitScanOrder');
     try {
@@ -955,7 +968,13 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
       if (!this.store.order) {
         throw new Error('scanOrder解决方案需要 order 模块支持');
       }
+      const pax = (0, _utils2.normalizeSubmitCollectPaxValue)(this.store.entryPaxNumber);
+      this.store.entryPaxNumber = pax;
       const tempOrderForSubmit = this.store.order.ensureTempOrder();
+      tempOrderForSubmit.metadata = {
+        ...tempOrderForSubmit.metadata,
+        collect_pax: pax
+      };
       tempOrderForSubmit.delivery_type = 'shop_service';
       const resourceTableName = this.store.resource?.table_form_record?.name;
       if (resourceTableName && typeof resourceTableName === 'object') {
@@ -965,12 +984,10 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
       }
       this.store.order.persistTempOrder();
       const enhancePayload = this.buildSubmitPayloadEnhancer();
-      const result = await this.store.order.submitTempOrder({
-        cacheId: this.cacheId,
-        platform: this.otherParams?.platform,
-        businessCode: this.otherParams?.businessCode,
-        channel: this.otherParams?.channel,
-        type: this.otherParams?.type,
+      const result = this.isScanOrderMoreMode(tempOrderForSubmit) ? await this.submitScanOrderMore({
+        tempOrder: tempOrderForSubmit,
+        enhancePayload
+      }) : await this.submitSalesOrder({
         enhancePayload
       });
       const tempOrder = this.store.order.getTempOrder();
@@ -1002,22 +1019,22 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
       throw error;
     }
   }
-  async updateProductInOrder(params) {
-    this.logMethodStart('updateProductInOrder', {
+  async updateOrderProduct(params) {
+    this.logMethodStart('updateOrderProduct', {
       product_id: params.product_id,
       product_variant_id: params.product_variant_id
     });
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');
-      const products = await this.store.order.updateProductInOrder(params);
+      const products = await this.store.order.updateOrderProduct(params);
       await this.refreshItemRuleQuantityLimits();
       await this.refreshCartValidationPassed();
-      this.logMethodSuccess('updateProductInOrder', {
+      this.logMethodSuccess('updateOrderProduct', {
         productCount: products.length
       });
       return products;
     } catch (error) {
-      this.logMethodError('updateProductInOrder', error);
+      this.logMethodError('updateOrderProduct', error);
       throw error;
     }
   }
@@ -1040,11 +1057,11 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
         }
       };
       if (identity.identity_key !== undefined) params.identity_key = identity.identity_key;
-      if (identity.product_option_item !== undefined) {
-        params.product_option_item = identity.product_option_item;
+      if (identity.product_sku !== undefined) {
+        params.product_sku = identity.product_sku;
       }
       if (identity.product_bundle !== undefined) params.product_bundle = identity.product_bundle;
-      const products = await this.updateProductInOrder(params);
+      const products = await this.updateOrderProduct(params);
       this.logMethodSuccess('setOrderProductLineNote', {
         productCount: products.length
       });
@@ -1204,7 +1221,7 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
         return [];
       }
       const businessData = (0, _utils.buildItemRuleBusinessData)({
-        tempOrder: this.ensureTempOrder(),
+        tempOrder: this.ensureScanOrderTempOrder(),
         runtimeConfig: this.getItemRuleRuntimeConfig(),
         itemRuleConfigs: this.itemRuleConfigs
       });
@@ -1226,7 +1243,7 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
     const strategyConfigs = await this.ensureItemRuleConfigsLoaded();
     if (!strategyConfigs.length) return;
     const businessData = (0, _utils.buildItemRuleBusinessData)({
-      tempOrder: this.ensureTempOrder(),
+      tempOrder: this.ensureScanOrderTempOrder(),
       runtimeConfig: this.getItemRuleRuntimeConfig(),
       itemRuleConfigs: this.itemRuleConfigs
     });
@@ -1236,7 +1253,7 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
       return;
     }
     const productSourceMap = await this.buildPrefillProductSourceMap();
-    const tempOrder = this.ensureTempOrder();
+    const tempOrder = this.ensureScanOrderTempOrder();
     let hasChanges = false;
     for (const prefillItem of prefillItems) {
       const productId = Number(prefillItem.product_id);
@@ -1329,7 +1346,7 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
       };
     }
     const businessData = (0, _utils.buildItemRuleBusinessData)({
-      tempOrder: this.ensureTempOrder(),
+      tempOrder: this.ensureScanOrderTempOrder(),
       runtimeConfig: this.getItemRuleRuntimeConfig(),
       itemRuleConfigs: this.itemRuleConfigs
     });
@@ -1614,7 +1631,7 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
 
       // Step1: 先加载预约规则商品，拿到 enabledReservationRuleProducts 与容量附加信息
       // （resourceSelectType 需要基于这些商品 + 占用接口的 form_id 计算，故必须前置）
-      const tempOrder = this.ensureTempOrder();
+      const tempOrder = this.ensureScanOrderTempOrder();
       const reservationLinkIds = (0, _utils.collectLinkProductIdsFromReservationRules)(dineInConfig['fulfillment.enabled_resource_rules']);
       if (!normalizedResourceId || reservationLinkIds.length === 0) {
         return await this.prepareRetailAvailability({
@@ -1676,6 +1693,29 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
           scheduleDatetime,
           cacheId: this.cacheId
         });
+        if (Array.isArray(loaded)) {
+          this.enabledReservationRuleProducts = loaded;
+          const occupancyMinutes = (0, _utils.pickFirstDurationMinutesFromProducts)(loaded);
+          if (occupancyMinutes !== undefined) {
+            tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
+          }
+          if ((0, _utils.hasCustomCapacityProduct)(loaded)) {
+            pendingRequestEntryPax = 1;
+            const paxBounds = (0, _utils.pickFirstCustomCapacityPaxBounds)(loaded);
+            if (paxBounds?.min !== undefined) pendingRequestPaxMin = paxBounds.min;
+            if (paxBounds?.max !== undefined) pendingRequestPaxMax = paxBounds.max;
+          }
+        } else {
+          this.enabledReservationRuleProducts = [];
+          const error = loaded instanceof Error ? loaded : new Error('预约规则商品列表接口返回异常');
+          this.logMethodError('loadReservationRuleProducts', error, {
+            resourceId,
+            reservationLinkIds,
+            scheduleDate,
+            scheduleDatetime,
+            cacheId: this.cacheId
+          });
+        }
       }
 
       // Step2: 请求新的资源占用详情接口。occupy_details 第一维是资源，不是订单。
@@ -1753,9 +1793,6 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
           requestPaxMax: this.store.resource.requestPaxMax
         } : {})
       };
-      tempOrder.relation_id = normalizedResourceId || this.otherParams?.relation_id;
-      tempOrder.table_form_id = resourceState.tableFormId;
-      tempOrder.resource_id = normalizedResourceId;
       this.store.order?.persistTempOrder();
 
       // 空闲状态下自动准备本地临时订单，供后续“购物车式”商品操作使用
@@ -1800,8 +1837,8 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
         orderId: availabilityInfo.order_id,
         relationId: availabilityInfo.relation_id,
         tableFormId: availabilityInfo.table_form_id,
-        persistedRelationId: tempOrder.relation_id,
-        persistedResourceId: tempOrder.resource_id,
+        persistedRelationId: this.store.resource?.relationId,
+        persistedResourceId: this.store.resource?.relationId,
         deskmateValid: availabilityInfo.deskmate_valid,
         resourceSelectType: resourceState.resourceSelectType,
         isExclusive: resourceState.isExclusive,
@@ -1818,9 +1855,11 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
 
   // 恢复之前订单的数据，读取 entrypax
   async restorePreviousOrderData() {
-    const tempOrder = this.ensureTempOrder();
+    const orderModule = this.store.order;
+    if (!orderModule) return;
+    const tempOrder = orderModule.ensureTempOrder();
     if (tempOrder.order_id) {
-      const res = await this.store.order?.getOrderInfoByRemote(tempOrder.order_id);
+      const res = await orderModule.getOrderInfo(tempOrder.order_id);
       // 找到下单的时候输入的 entryPaxNumber
       const entryPaxNumber = res?.data?.bookings?.find(p => p.metadata?.collect_pax)?.metadata?.collect_pax;
       if (entryPaxNumber) {
@@ -1850,7 +1889,8 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
   async getProductList() {
     this.logMethodStart('getProductList');
     // 可以直接通过配置里的 menu 读取
-    const menu_list_ids = this.otherParams?.dineInConfig?.['menu.associated_menus'].map(n => Number(n.value)) || [];
+    const associatedMenus = this.otherParams?.dineInConfig?.['menu.associated_menus'];
+    const menu_list_ids = associatedMenus.map(n => Number(n.value)) || [];
     try {
       if (!this.store.products) throw new Error('products 模块未初始化');
       const res = await this.store.products.loadProducts({
@@ -1991,7 +2031,8 @@ class ScanOrderImpl extends _BaseModule.BaseModule {
     return this.store.entryPaxNumber;
   }
   async syncAdditionalOrderFromResource(resourceId) {
-    const tempOrder = this.ensureTempOrder();
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    const tempOrder = this.store.order.ensureTempOrder();
     const normalizedResourceId = String(resourceId ?? tempOrder.resource_id ?? this.store.resource?.relationId ?? this.store.resource?.relation_id ?? '').trim();
     this.logMethodStart('syncAdditionalOrderFromResource', {
       resourceId: normalizedResourceId

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

@@ -10,8 +10,8 @@ export declare enum ScanOrderHooks {
     onRefresh = "scanOrder:onRefresh",
     onCartValidationChanged = "scanOrder:onCartValidationChanged"
 }
-export type ScanOrderStatus = 'idle' | 'initializing' | 'ready' | 'error';
-export type ScanOrderEntryContext = {
+export declare type ScanOrderStatus = 'idle' | 'initializing' | 'ready' | 'error';
+export declare type ScanOrderEntryContext = {
     biz: string;
     mode: 'scan' | 'append';
     resourceId?: string;
@@ -31,15 +31,20 @@ export interface ScanOrderOrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;
     identity_key?: string;
+    unique_identification_number?: string;
     /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
-    product_option_item?: any[];
+    product_sku?: ScanOrderProductSku;
     product_bundle?: any[];
     shop_id?: number | string;
 }
+export interface ScanOrderProductSku {
+    option: any[];
+    [key: string]: any;
+}
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
-    product_option_item: any[];
+    product_sku: ScanOrderProductSku;
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`
      *   + Σ((bundle.bundle_selling_price ?? bundle.price) × (bundle.num ?? 1))
@@ -61,6 +66,8 @@ export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     is_charge_tax: number;
     discount_list: any[];
     product_bundle: any[];
+    /** 关联 booking.metadata.unique_identification_number */
+    booking_uid?: string;
     /**
      * 行级扩展 metadata。价格相关的权威字段：
      *
@@ -76,19 +83,19 @@ export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     metadata: Record<string, any>;
     /** 商品行备注（如顾客对单品的特殊要求） */
     note?: string;
+    /** @deprecated UI/SDK 运行态数据迁移到 tempOrder._extend */
     _origin?: Record<string, any>;
 }
 /**
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `ScanOrderOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ product_option_item_id, option_group_id, num, price, ... }`，
- *   出站由 `normalizeSubmitProduct` 重命名为 `{ option_group_item_id, option_group_id, num }`
- *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
+ * - `product_sku.option[*]`：内部直接维护统一 Sales 协议字段；
+ *   提交时仅规范 `add_price`，保留传入/恢复得到的展示字段。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
- * 运行时（UI 显示、加购合并、指纹、持久化）全部消费内部字段名 `product_option_item_id`，
- * 仅在 SDK 提交边界做一次出站映射，不影响 opaque identity 契约。
+ * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名
+ * `option_group_item_id`，保持 tempOrder 与后端协议一致。
  */
 export interface ScanOrderSubmitProduct extends Omit<ScanOrderOrderProduct, '_origin' | 'identity_key'> {
     /**
@@ -109,6 +116,7 @@ export interface ScanOrderSummary {
     shipping_tax_fee: string;
     tax_fee: string;
     surcharge_fee: string;
+    surcharges: any[];
     discount_amount: string;
     deposit_amount: string;
     deposit?: {
@@ -118,6 +126,9 @@ export interface ScanOrderSummary {
     };
     expect_amount: string;
     total_amount: string;
+    total_refund_amount: string;
+    customer_paid_amount: string;
+    order_paid_amount: string;
     amount_gap: string;
     rounding_amount: string;
     pay_service_charge_amount: string;
@@ -130,11 +141,15 @@ export interface ScanOrderSummary {
  */
 export interface ScanOrderTempOrder {
     order_id: number | null;
+    /** @deprecated 资源运行态迁移到 ScanOrder store；仅旧缓存兼容 */
     relation_id?: string;
+    /** @deprecated 资源运行态迁移到 ScanOrder store；仅旧缓存兼容 */
     table_form_id?: string;
+    /** @deprecated 资源运行态迁移到 ScanOrder store；仅旧缓存兼容 */
     resource_id?: string;
     order_number: string;
     shop_order_number: string;
+    shop_full_order_number: string;
     type: string;
     business_code: string;
     platform: string;
@@ -164,6 +179,7 @@ export interface ScanOrderTempOrder {
     table_number?: Record<string, any>;
     schedule_date: string;
     created_at: string;
+    request_unique_idempotency_token?: string;
     products: ScanOrderOrderProduct[];
     bookings: any[];
     payments: any[];
@@ -171,14 +187,20 @@ export interface ScanOrderTempOrder {
     discount_list: any[];
     relation_forms: any[];
     contacts: any[];
-    contacts_info: any[];
+    contacts_info: Record<string, any> | null;
     holder: Record<string, any> | null;
-    summary: ScanOrderSummary;
     metadata: Record<string, any>;
+    _extend?: {
+        productsByUid?: Record<string, Record<string, any>>;
+        [key: string]: any;
+    };
+    /** @deprecated summary 是 OrderState 派生状态，不属于可提交 tempOrder */
+    summary?: ScanOrderSummary;
+    /** @deprecated lastOrderInfo 迁移到 OrderState 同层级 */
     lastOrderInfo?: Record<string, any>;
 }
-export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platform' | 'products' | 'created_at' | 'summary' | 'surcharges'> {
-    platform: 'H5' | 'PC';
+export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platform' | 'products' | 'summary' | 'surcharges'> {
+    platform: string;
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{
         form_id: number | string;
@@ -186,7 +208,7 @@ export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platfo
     }>;
     products: ScanOrderSubmitProduct[];
 }
-export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'multiple_orders' | 'additional_order_with_code' | 'additional_order';
+export declare 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;
@@ -245,7 +267,7 @@ export interface ScanOrderResourceOccupyDetailApiResponse {
         occupy_details?: ScanOrderResourceOccupyDetail[] | null;
     } | null;
 }
-export type ScanOrderResourceSelectType = 'single' | 'multiple' | 'capacity';
+export declare type ScanOrderResourceSelectType = 'single' | 'multiple' | 'capacity';
 export interface ScanOrderReservationResourceSelectInfo {
     resourceSelectType?: ScanOrderResourceSelectType;
     isSingleReservation: boolean;
@@ -255,7 +277,7 @@ export interface ScanOrderReservationResourceSelectInfo {
 export interface ScanOrderAllowAddItemsInfo {
     enabled: boolean;
 }
-export type ScanOrderSyncAdditionalOrderReason = 'missing_resource_id' | 'no_order' | 'multiple_orders' | 'add_items_disabled' | 'invalid_order_id';
+export declare type ScanOrderSyncAdditionalOrderReason = 'missing_resource_id' | 'no_order' | 'multiple_orders' | 'add_items_disabled' | 'invalid_order_id';
 export interface ScanOrderSyncAdditionalOrderResult {
     matched: boolean;
     order_id?: string;

package/lib/solution/ScanOrder/types.js

@@ -19,13 +19,12 @@ let ScanOrderHooks = exports.ScanOrderHooks = /*#__PURE__*/function (ScanOrderHo
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `ScanOrderOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ product_option_item_id, option_group_id, num, price, ... }`，
- *   出站由 `normalizeSubmitProduct` 重命名为 `{ option_group_item_id, option_group_id, num }`
- *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
+ * - `product_sku.option[*]`：内部直接维护统一 Sales 协议字段；
+ *   提交时仅规范 `add_price`，保留传入/恢复得到的展示字段。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
- * 运行时（UI 显示、加购合并、指纹、持久化）全部消费内部字段名 `product_option_item_id`，
- * 仅在 SDK 提交边界做一次出站映射，不影响 opaque identity 契约。
+ * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名
+ * `option_group_item_id`，保持 tempOrder 与后端协议一致。
  */
 /**
  * ScanOrder 临时订单（runtime-clean 版本）