@pisell/pisellos 2.2.292 → 2.2.293

package/dist/modules/Order/types.d.ts

@@ -8,6 +8,13 @@ import type { PaymentItem } from '../Payment/types';
 import type { ICustomer } from '../AccountList/types';
 import type { OrderProductDiscountItem } from '../../server/modules/order/types';
 export type { OrderProductDiscountItem } from '../../server/modules/order/types';
+export type PickupReferenceMode = 'counter_pickup' | 'table_service';
+export type ShopServiceType = 'dine_in' | 'takeaway';
+export interface ShopServiceData {
+    pickup_reference_mode?: PickupReferenceMode;
+    service_type?: ShopServiceType | '';
+    [key: string]: any;
+}
 export declare enum OrderHooks {
     OnOrderCreate = "order:onOrderCreate",
     OnOrderUpdate = "order:onOrderUpdate",
@@ -191,6 +198,8 @@ export interface OrderLocalizedText {
 export interface OrderProduct extends OrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     bundle_edit?: number;
     product_sku: OrderProductSku;
     gift_card?: number;
@@ -236,6 +245,72 @@ export interface OrderSummary {
     tax_title?: string;
     tax_rate?: number;
 }
+export type SalesNoteRelationType = 'about' | 'related_to';
+export type SalesNoteTargetType = 'order' | 'order_detail';
+export type SalesNoteLocalizedText = string | Record<string, string>;
+export interface SalesNoteLocalizedSelection {
+    id: string;
+    label: SalesNoteLocalizedText;
+}
+export type SalesNoteTextInput = {
+    kind: 'localizedSelections';
+    selections: SalesNoteLocalizedSelection[];
+    locale: string;
+    input?: string;
+} | {
+    kind: 'plain';
+    input: string;
+} | {
+    kind: 'resolved';
+    text: Record<string, string>;
+};
+export interface SalesNoteRelation {
+    uuid: string;
+    relation_type: SalesNoteRelationType;
+    target_type: SalesNoteTargetType;
+    target_uuid: string;
+    is_primary: 0 | 1;
+}
+export interface SalesNote {
+    uuid: string;
+    note_type: string;
+    content: {
+        text: Record<string, string>;
+    };
+    importance: string;
+    note_relations: SalesNoteRelation[];
+}
+export interface SalesNoteTarget {
+    target_type: 'order_detail';
+    target_uuid: string;
+}
+export interface SetSalesNoteInput {
+    note_type: string;
+    target: SalesNoteTarget;
+    text: SalesNoteTextInput;
+}
+export interface SalesNoteDraftInput {
+    note_type: string;
+    text: SalesNoteTextInput;
+}
+export interface SalesNotesRuntimeState {
+    loaded: boolean;
+    dirty: boolean;
+}
+/**
+ * Sales Notes 乐观写入前的可恢复快照。
+ * 该对象应视为 opaque token，只用于原样传回 restoreSalesNotesMutationSnapshot。
+ */
+export interface SalesNotesMutationSnapshot {
+    orderIdentity: {
+        orderId: number | string | null;
+        externalSaleNumber: string;
+    };
+    notes: SalesNote[];
+    state: SalesNotesRuntimeState;
+}
+export type SalesNoteProtocolRelation = SalesNoteRelation;
+export type SalesNoteProtocol = SalesNote;
 export interface OrderTempOrder {
     order_id: number | null;
     external_sale_number: string;
@@ -275,6 +350,7 @@ export interface OrderTempOrder {
     created_at: string | undefined;
     request_unique_idempotency_token?: string;
     products: OrderProduct[];
+    notes: SalesNote[];
     bookings: any[];
     payments: any[];
     surcharges: any[];
@@ -287,6 +363,7 @@ export interface OrderTempOrder {
     summary?: OrderSummary;
     _extend?: {
         productsByUid?: Record<string, Record<string, any>>;
+        salesNotesState?: SalesNotesRuntimeState;
         [key: string]: any;
     };
 }
@@ -295,7 +372,7 @@ export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identific
     payment_price: string;
     product_sku: OrderProductSku;
 }
-export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer' | 'discount_list' | 'created_at'> {
+export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | 'notes' | '_extend' | 'customer' | 'discount_list' | 'created_at'> {
     platform: string;
     created_at?: string | undefined;
     request_unique_idempotency_token?: string;
@@ -304,6 +381,7 @@ export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'p
         form_record_id: number | string;
     }>;
     products: OrderSubmitProduct[];
+    notes?: SalesNoteProtocol[];
     summary?: OrderSummary;
     small_ticket_data_flag?: number;
 }
@@ -332,6 +410,8 @@ export interface AddProductToOrderOptions {
     insertAfterProductUid?: string;
     /** 跳过同商品/规格匹配，始终新增购物车行。 */
     disableMerge?: boolean;
+    /** 商品行 UID 落定后，由 OrderModule 原子绑定到该行的 Sales Notes 草稿。 */
+    salesNotes?: SalesNoteDraftInput[];
 }
 /**
  * 删除商品后的可选位置保持策略。
@@ -747,9 +827,17 @@ export interface OrderModuleAPI {
     updateTempOrderShopDiscount: (amount: string | number) => string;
     updateTempOrderDepositAmount: (amount: string | number) => OrderSummary;
     updateTempOrderCustomer: (customer: UpdateTempOrderCustomerInput) => OrderSnapshot['customer'];
+    updateTempOrderPickupReferenceMode: (mode: PickupReferenceMode) => ShopServiceData;
+    updateTempOrderServiceType: (serviceType: ShopServiceType) => ShopServiceData;
     updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
     addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions) => Promise<OrderProduct[]>;
+    getSalesNotes: () => SalesNote[];
+    createSalesNotesMutationSnapshot: () => SalesNotesMutationSnapshot;
+    restoreSalesNotesMutationSnapshot: (snapshot: SalesNotesMutationSnapshot) => void;
+    setSalesNote: (input: SetSalesNoteInput) => Promise<SalesNote>;
+    removeSalesNote: (uuid: string) => Promise<void>;
+    clearSalesNotes: () => Promise<void>;
     updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
     /** 批量更新购物车行，末尾仅触发一次促销重算与 summary 刷新 */
     updateOrderProducts: (paramsList: UpdateOrderProductParams[]) => Promise<OrderProduct[]>;
@@ -897,10 +985,10 @@ export interface OrderModuleAPI {
     /** 读取上次 applyPromotion 产出的赠品操作 diff（toAdd / toReduce / toRemove） */
     getLastGiftActions: () => OrderLastGiftActions | null;
     /**
-   * 取消订单
-   * @param params 取消订单参数
-   * @returns 后端返回结果
-   */
+     * 取消订单
+     * @param params 取消订单参数
+     * @returns 后端返回结果
+     */
     cancelOrder: (params: CancelOrderParams) => Promise<any>;
     /**
      * 变更预约状态

package/dist/modules/Order/types.js

@@ -64,6 +64,11 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * 清空时整个 payload 为 null。
  */
 
+/**
+ * Sales Notes 乐观写入前的可恢复快照。
+ * 该对象应视为 opaque token，只用于原样传回 restoreSalesNotesMutationSnapshot。
+ */
+
 /**
  * 添加商品行时的顺序控制。
  * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，

package/dist/modules/Order/utils.d.ts

@@ -210,6 +210,18 @@ export interface SubmitPayloadEnhancerContext {
     now: Date;
 }
 export type SubmitPayloadEnhancer = (payload: OrderSubmitPayload, ctx: SubmitPayloadEnhancerContext) => OrderSubmitPayload;
+/**
+ * 解析 checkout 的订单类型。
+ * dine_in 普通落库单在新增桌台资源后，即使原类型仍是 virtual，也必须按 table-order 提交。
+ */
+export declare function resolveSubmitOrderType(params: {
+    requestedType?: string;
+    tempOrderType?: string;
+    orderId?: unknown;
+    businessCode?: string;
+    tempOrderBusinessCode?: string;
+    bookings?: unknown;
+}): string;
 export declare function buildSubmitPayload(params: {
     tempOrder: OrderTempOrder;
     cacheId?: string;

package/dist/modules/Order/utils.js

@@ -1,7 +1,7 @@
 var _excluded = ["custom_product_bundle_map_id"],
   _excluded2 = ["unique_identification_number"],
-  _excluded3 = ["num", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per"],
-  _excluded4 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "discount_list", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id"],
+  _excluded3 = ["num", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per", "production_code"],
+  _excluded4 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "discount_list", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id", "notes"],
   _excluded5 = ["collect_pax", "table_occupancy_duration"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -23,6 +23,7 @@ import Decimal from 'decimal.js';
 import { getProductHolderConfig } from "../Holder/utils";
 import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
 import { createUuidV4 } from "./utils/orderCollectionIdentity";
+import { encodeSalesNotes } from "./salesNotes";
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -814,6 +815,11 @@ function normalizeSubmitPlatform(platform) {
   if (lower === 'h5') return 'H5';
   return value;
 }
+function normalizeSubmitProductionCode(value) {
+  if (value === undefined || value === null) return undefined;
+  var productionCode = String(value).trim();
+  return productionCode || undefined;
+}
 
 // 后端 checkout 协议字段 option_group_item_id；tempOrder 内部也保持同一字段名。
 function formatSubmitOptionItems(options) {
@@ -825,6 +831,9 @@ function formatSubmitOptionItems(options) {
       option_group_item_id: d === null || d === void 0 ? void 0 : d.option_group_item_id,
       option_group_id: d === null || d === void 0 ? void 0 : d.option_group_id
     });
+    var productionCode = normalizeSubmitProductionCode(d === null || d === void 0 ? void 0 : d.production_code);
+    delete option.production_code;
+    if (productionCode !== undefined) option.production_code = productionCode;
     var addPrice = (_d$add_price = d === null || d === void 0 ? void 0 : d.add_price) !== null && _d$add_price !== void 0 ? _d$add_price : d === null || d === void 0 ? void 0 : d.price;
     if (addPrice !== undefined) option.add_price = String(addPrice);
     delete option.price;
@@ -865,9 +874,13 @@ function formatSubmitBundleItems(bundle) {
     var num = toBundleNumber((_rawBundle$num = rawBundle.num) !== null && _rawBundle$num !== void 0 ? _rawBundle$num : rawBundle.quantity, 1);
     var bundleMapId = resolveSubmitBundleMapId(rawBundle);
     var hasSubmitBundleDiscounts = Array.isArray(rawBundle.discount_list) && rawBundle.discount_list.length > 0;
-    return {
+    var productionCode = normalizeSubmitProductionCode(rawBundle.production_code);
+    return _objectSpread(_objectSpread({
       is_charge_tax: (_rawBundle$is_charge_ = rawBundle.is_charge_tax) !== null && _rawBundle$is_charge_ !== void 0 ? _rawBundle$is_charge_ : 0,
-      bundle_variant_id: (_rawBundle$bundle_var = rawBundle.bundle_variant_id) !== null && _rawBundle$bundle_var !== void 0 ? _rawBundle$bundle_var : 0,
+      bundle_variant_id: (_rawBundle$bundle_var = rawBundle.bundle_variant_id) !== null && _rawBundle$bundle_var !== void 0 ? _rawBundle$bundle_var : 0
+    }, productionCode !== undefined ? {
+      production_code: productionCode
+    } : {}), {}, {
       num: num,
       quantity: toBundleNumber((_rawBundle$quantity = rawBundle.quantity) !== null && _rawBundle$quantity !== void 0 ? _rawBundle$quantity : rawBundle.num, num),
       extension_id: (_rawBundle$extension_ = rawBundle.extension_id) !== null && _rawBundle$extension_ !== void 0 ? _rawBundle$extension_ : 0,
@@ -889,7 +902,7 @@ function formatSubmitBundleItems(bundle) {
         relation_surcharge_ids: relationSurchargeIds,
         product_discount_difference: productDiscountDifference
       })
-    };
+    });
   });
 }
 
@@ -921,7 +934,9 @@ function normalizeSubmitProduct(product) {
     _deprecatedDiscountway = submitProduct.discountway,
     _deprecatedProductDiscountReason = submitProduct.product_discount_reason,
     _deprecatedDiscountPer = submitProduct.discount_per,
+    rawProductionCode = submitProduct.production_code,
     productRest = _objectWithoutProperties(submitProduct, _excluded3);
+  var productionCode = normalizeSubmitProductionCode(rawProductionCode);
   delete productRest["product_".concat('option', "_item")];
   var rawMetadata = submitProduct.metadata || {};
   var bookingUid = rawMetadata.booking_uid;
@@ -953,7 +968,9 @@ function normalizeSubmitProduct(product) {
   var productSku = _objectSpread(_objectSpread({}, submitProduct.product_sku && _typeof(submitProduct.product_sku) === 'object' ? submitProduct.product_sku : {}), {}, {
     option: formatSubmitOptionItems((_submitProduct$produc = submitProduct.product_sku) === null || _submitProduct$produc === void 0 ? void 0 : _submitProduct$produc.option)
   });
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, productRest), bookingUid ? {
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, productRest), productionCode !== undefined ? {
+    production_code: productionCode
+  } : {}), bookingUid ? {
     booking_uid: bookingUid
   } : {}), bundleEdit !== undefined ? {
     bundle_edit: bundleEdit
@@ -1072,6 +1089,7 @@ export function createDefaultTempOrder(params) {
     request_unique_idempotency_token: '',
     vouchers: [],
     products: [],
+    notes: [],
     bookings: [],
     payments: [],
     surcharges: [],
@@ -1081,12 +1099,59 @@ export function createDefaultTempOrder(params) {
     holder: null,
     metadata: {},
     _extend: {
-      productsByUid: {}
+      productsByUid: {},
+      salesNotesState: {
+        loaded: true,
+        dirty: false
+      }
     }
   };
 }
+function hasBoundBookingResource(bookings) {
+  if (!Array.isArray(bookings)) return false;
+  return bookings.some(function (booking) {
+    if (!booking || _typeof(booking) !== 'object') return false;
+    if (Number(booking.parent_id) === 0) return false;
+    var resources = booking.resources;
+    if (!Array.isArray(resources)) return false;
+    return resources.some(function (resource) {
+      var _relation_id;
+      if (!resource || _typeof(resource) !== 'object') return false;
+      var relationId = String((_relation_id = resource.relation_id) !== null && _relation_id !== void 0 ? _relation_id : '').trim();
+      return relationId !== '' && relationId !== '0';
+    });
+  });
+}
+function isPersistedSubmitOrderId(orderId) {
+  if (orderId === undefined || orderId === null || orderId === '') return false;
+  var normalizedOrderId = Number(orderId);
+  return Number.isFinite(normalizedOrderId) && normalizedOrderId > 0;
+}
+
+/**
+ * 解析 checkout 的订单类型。
+ * dine_in 普通落库单在新增桌台资源后，即使原类型仍是 virtual，也必须按 table-order 提交。
+ */
+export function resolveSubmitOrderType(params) {
+  var requestedType = params.requestedType,
+    tempOrderType = params.tempOrderType,
+    orderId = params.orderId,
+    businessCode = params.businessCode,
+    tempOrderBusinessCode = params.tempOrderBusinessCode,
+    bookings = params.bookings;
+  var currentType = requestedType !== null && requestedType !== void 0 ? requestedType : tempOrderType;
+  var resolvedBusinessCode = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrderBusinessCode;
+  if (isPersistedSubmitOrderId(orderId) && resolvedBusinessCode === 'dine_in' && currentType === 'virtual' && hasBoundBookingResource(bookings)) {
+    return 'table-order';
+  }
+  if (currentType) return currentType;
+  if (Array.isArray(bookings) && bookings.length > 0) {
+    return businessCode === 'dine_in' ? 'table-order' : 'appointment_booking';
+  }
+  return 'virtual';
+}
 export function buildSubmitPayload(params) {
-  var _tempOrder$customer_i, _tempOrder$country_ca, _tempOrder$phone, _tempOrder$email, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref31, _tempOrder$is_price_i, _tempOrder$is_deposit, _enhancedPayload$summ;
+  var _tempOrder$customer_i, _tempOrder$country_ca, _tempOrder$phone, _tempOrder$email, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref31, _tempOrder$is_price_i, _tempOrder$is_deposit, _tempOrder$_extend, _enhancedPayload$summ;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -1118,23 +1183,18 @@ export function buildSubmitPayload(params) {
     _totalRefundAmount = _ref30.total_refund_amount,
     _createDate = _ref30.create_date,
     _holderId = _ref30.holder_id,
+    _notes = _ref30.notes,
     tempOrderRest = _objectWithoutProperties(_ref30, _excluded4);
-  var submitType = type !== null && type !== void 0 ? type : tempOrder.type;
-  if (!submitType) {
-    var _tempOrder$bookings;
-    // 如果外部没有传递 types，根据订单里当前是否有 bookings 来决定是 appointment_booking 还是 virtual
-    if (tempOrder !== null && tempOrder !== void 0 && (_tempOrder$bookings = tempOrder.bookings) !== null && _tempOrder$bookings !== void 0 && _tempOrder$bookings.length) {
-      // 260807 如果 biz 是堂食，type 使用table-order
-      if (businessCode === 'dine_in') {
-        submitType = 'table-order';
-      } else {
-        submitType = 'appointment_booking';
-      }
-    } else {
-      submitType = 'virtual';
-    }
-  }
-  var payload = _objectSpread(_objectSpread({}, tempOrderRest), {}, {
+  var resolvedBusinessCode = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code;
+  var submitType = resolveSubmitOrderType({
+    requestedType: type,
+    tempOrderType: tempOrder.type,
+    orderId: tempOrder.order_id,
+    businessCode: businessCode,
+    tempOrderBusinessCode: tempOrder.business_code,
+    bookings: tempOrder.bookings
+  });
+  var payload = _objectSpread(_objectSpread(_objectSpread({}, tempOrderRest), {}, {
     customer_id: (_tempOrder$customer_i = tempOrder.customer_id) !== null && _tempOrder$customer_i !== void 0 ? _tempOrder$customer_i : 1,
     customer_name: tempOrder.customer_name || 'Walk-In',
     country_calling_code: String((_tempOrder$country_ca = tempOrder.country_calling_code) !== null && _tempOrder$country_ca !== void 0 ? _tempOrder$country_ca : ''),
@@ -1146,7 +1206,7 @@ export function buildSubmitPayload(params) {
     platform: normalizeSubmitPlatform(platform),
     request_unique_idempotency_token: (params === null || params === void 0 ? void 0 : params.request_unique_idempotency_token) || tempOrder.request_unique_idempotency_token || "".concat(tempOrder.external_sale_number, "_").concat(now.getTime()),
     type: submitType,
-    business_code: businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code,
+    business_code: resolvedBusinessCode,
     sales_channel: tempOrder.sales_channel || 'my_pisel',
     order_sales_channel: (_ref31 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref31 !== void 0 ? _ref31 : 'online_store',
     status: tempOrder.status || 'normal',
@@ -1179,7 +1239,12 @@ export function buildSubmitPayload(params) {
         _tableOccupancyDuration = _ref32.table_occupancy_duration,
         rest = _objectWithoutProperties(_ref32, _excluded5);
       return _objectSpread({}, rest);
-    }(),
+    }()
+  }, (_tempOrder$_extend = tempOrder._extend) !== null && _tempOrder$_extend !== void 0 && (_tempOrder$_extend = _tempOrder$_extend.salesNotesState) !== null && _tempOrder$_extend !== void 0 && _tempOrder$_extend.dirty ? {
+    notes: encodeSalesNotes(tempOrder.notes || [], {
+      allowUnresolvedOrderTarget: true
+    })
+  } : {}), {}, {
     products: (tempOrder.products || []).map(function (product) {
       return normalizeSubmitProduct(product);
     })
@@ -1307,7 +1372,7 @@ export function hasAssignedHolderId(value) {
  * clearTempOrderHolderAssignments(tempOrder);
  */
 export function clearTempOrderHolderAssignments(tempOrder) {
-  var _tempOrder$_extend;
+  var _tempOrder$_extend2;
   var changed = false;
   var resetHolderField = function resetHolderField(target) {
     var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'holder_id';
@@ -1348,7 +1413,7 @@ export function clearTempOrderHolderAssignments(tempOrder) {
   } finally {
     _iterator9.f();
   }
-  var productsByUid = (_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.productsByUid;
+  var productsByUid = (_tempOrder$_extend2 = tempOrder._extend) === null || _tempOrder$_extend2 === void 0 ? void 0 : _tempOrder$_extend2.productsByUid;
   if (productsByUid && _typeof(productsByUid) === 'object') {
     for (var _i4 = 0, _Object$values = Object.values(productsByUid); _i4 < _Object$values.length; _i4++) {
       var entry = _Object$values[_i4];
@@ -1379,9 +1444,9 @@ export function getOrderProductLineUid(product) {
   return String(uid);
 }
 export function getRuntimeProductOrigin(tempOrder, product) {
-  var _tempOrder$_extend2, _tempOrder$_extend3;
+  var _tempOrder$_extend3, _tempOrder$_extend4;
   var uid = getOrderProductLineUid(product);
-  if (uid && tempOrder !== null && tempOrder !== void 0 && (_tempOrder$_extend2 = tempOrder._extend) !== null && _tempOrder$_extend2 !== void 0 && (_tempOrder$_extend2 = _tempOrder$_extend2.productsByUid) !== null && _tempOrder$_extend2 !== void 0 && (_tempOrder$_extend2 = _tempOrder$_extend2[uid]) !== null && _tempOrder$_extend2 !== void 0 && _tempOrder$_extend2.origin) {
+  if (uid && tempOrder !== null && tempOrder !== void 0 && (_tempOrder$_extend3 = tempOrder._extend) !== null && _tempOrder$_extend3 !== void 0 && (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) !== null && _tempOrder$_extend3 !== void 0 && (_tempOrder$_extend3 = _tempOrder$_extend3[uid]) !== null && _tempOrder$_extend3 !== void 0 && _tempOrder$_extend3.origin) {
     return tempOrder._extend.productsByUid[uid].origin;
   }
   var matchedProduct = ((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || []).find(function (item) {
@@ -1389,7 +1454,7 @@ export function getRuntimeProductOrigin(tempOrder, product) {
     return item === product || getOrderProductLineUid(item) === uid || String((_ref33 = (_item$product_id = item === null || item === void 0 ? void 0 : item.product_id) !== null && _item$product_id !== void 0 ? _item$product_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref33 !== void 0 ? _ref33 : '') === String((_ref34 = (_product$product_id = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product === null || product === void 0 ? void 0 : product.id) !== null && _ref34 !== void 0 ? _ref34 : '');
   });
   var matchedUid = matchedProduct ? getOrderProductLineUid(matchedProduct) : '';
-  return matchedUid ? (tempOrder === null || tempOrder === void 0 || (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[matchedUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin) || null : null;
+  return matchedUid ? (tempOrder === null || tempOrder === void 0 || (_tempOrder$_extend4 = tempOrder._extend) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4.productsByUid) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4[matchedUid]) === null || _tempOrder$_extend4 === void 0 ? void 0 : _tempOrder$_extend4.origin) || null : null;
 }
 export function isHolderConfigRequired(holderConfig) {
   if (!holderConfig || _typeof(holderConfig) !== 'object') return false;

package/dist/modules/Product/types.d.ts

@@ -77,6 +77,8 @@ export interface ProductData {
     is_gst: number;
     /** 商品编码 */
     code: string;
+    /** ERP/生产侧商品编码；有规格时以选中 Variant 的值为准 */
+    production_code?: string;
     /** 商品条码 */
     barcode: string;
     /** 是否支持配送 */

package/dist/modules/ProductList/clientDataVariants.d.ts

@@ -0,0 +1,50 @@
+import type { PisellCore } from '../../types';
+import type { RequestPlugin } from '../../plugins';
+import type { ProductData } from '../Product/types';
+export declare const PRODUCT_QUERY_DATA_VARIANT_RELATIONS: readonly ["category", "collection", "resourceRelation", "bundleGroup.bundleItem", "optionGroup.optionItem", "variantGroup.variantItem", "dataVariants"];
+/**
+ * 判断当前商品查询是否会被本地 OS Server 接管。
+ *
+ * H5 RequestPlugin 即使收到 osServer=true 仍会直接请求远端接口，因此必须按
+ * RequestPlugin 实际 baseUrl 对应的已注册路由判断，不能只看请求选项。
+ */
+export declare function isProductQueryHandledByOsServer(core: PisellCore | undefined, request: RequestPlugin | undefined): boolean;
+export interface ResolveClientDataVariantsParams {
+    core: PisellCore | undefined;
+    otherParams?: Record<string, any>;
+    products: ProductData[];
+    queryPayload: Record<string, any>;
+    handledByOsServer: boolean;
+    scheduleList?: unknown;
+    menuList?: unknown;
+    /** Quote fast paths require hydrated relations; legacy list resolution does not. */
+    requireCompleteDataVariantRelations?: boolean;
+    /** Quote fast paths require every referenced rule; legacy list resolution is best-effort. */
+    requireEvaluatorReady?: boolean;
+}
+export type ResolveClientDataVariantsResult = {
+    status: 'handled-by-os-server' | 'empty' | 'data-variants-unavailable' | 'evaluator-unavailable' | 'evaluator-not-ready';
+    products: ProductData[];
+} | {
+    status: 'resolved';
+    products: ProductData[];
+} | {
+    status: 'error';
+    products: ProductData[];
+    error: unknown;
+};
+/**
+ * Strict client-side Data Variant resolution for quote fast paths.
+ *
+ * Unlike resolveClientDataVariants, callers can distinguish a complete local
+ * result from a capability/readiness/error fallback and decide to query the
+ * remote product endpoint instead.
+ */
+export declare function tryResolveClientDataVariants({ core, otherParams, products, queryPayload, handledByOsServer, scheduleList: explicitScheduleList, menuList: explicitMenuList, requireCompleteDataVariantRelations, requireEvaluatorReady, }: ResolveClientDataVariantsParams): ResolveClientDataVariantsResult;
+/**
+ * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
+ *
+ * 商品列表和预约报价必须共用这个边界，避免 H5 的弹窗报价绕过客户端智能定价。
+ * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
+ */
+export declare function resolveClientDataVariants({ core, otherParams, products, queryPayload, handledByOsServer, scheduleList: explicitScheduleList, menuList: explicitMenuList, }: ResolveClientDataVariantsParams): ProductData[];