@pisell/pisellos 2.2.291 → 2.2.293

package/lib/modules/Order/utils.js

@@ -101,6 +101,7 @@ Object.defineProperty(exports, "resolveSafeProductNum", {
   }
 });
 exports.resolveSubmitCollectPax = resolveSubmitCollectPax;
+exports.resolveSubmitOrderType = resolveSubmitOrderType;
 Object.defineProperty(exports, "shouldBuildManualProductDiscount", {
   enumerable: true,
   get: function () {
@@ -125,6 +126,7 @@ var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("../Holder/utils");
 var _utils2 = require("../../solution/ScanOrder/utils");
 var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
+var _salesNotes = require("./salesNotes");
 var _manualProductDiscount = require("./utils/manualProductDiscount");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
@@ -855,6 +857,11 @@ function normalizeSubmitPlatform(platform) {
   if (lower === 'h5') return 'H5';
   return value;
 }
+function normalizeSubmitProductionCode(value) {
+  if (value === undefined || value === null) return undefined;
+  const productionCode = String(value).trim();
+  return productionCode || undefined;
+}
 
 // 后端 checkout 协议字段 option_group_item_id；tempOrder 内部也保持同一字段名。
 function formatSubmitOptionItems(options) {
@@ -866,6 +873,9 @@ function formatSubmitOptionItems(options) {
       option_group_item_id: d?.option_group_item_id,
       option_group_id: d?.option_group_id
     };
+    const productionCode = normalizeSubmitProductionCode(d?.production_code);
+    delete option.production_code;
+    if (productionCode !== undefined) option.production_code = productionCode;
     const addPrice = d?.add_price ?? d?.price;
     if (addPrice !== undefined) option.add_price = String(addPrice);
     delete option.price;
@@ -906,9 +916,13 @@ function formatSubmitBundleItems(bundle) {
     const num = toBundleNumber(rawBundle.num ?? rawBundle.quantity, 1);
     const bundleMapId = resolveSubmitBundleMapId(rawBundle);
     const hasSubmitBundleDiscounts = Array.isArray(rawBundle.discount_list) && rawBundle.discount_list.length > 0;
+    const productionCode = normalizeSubmitProductionCode(rawBundle.production_code);
     return {
       is_charge_tax: rawBundle.is_charge_tax ?? 0,
       bundle_variant_id: rawBundle.bundle_variant_id ?? 0,
+      ...(productionCode !== undefined ? {
+        production_code: productionCode
+      } : {}),
       num,
       quantity: toBundleNumber(rawBundle.quantity ?? rawBundle.num, num),
       extension_id: rawBundle.extension_id ?? 0,
@@ -965,8 +979,10 @@ function normalizeSubmitProduct(product) {
     discountway: _deprecatedDiscountway,
     product_discount_reason: _deprecatedProductDiscountReason,
     discount_per: _deprecatedDiscountPer,
+    production_code: rawProductionCode,
     ...productRest
   } = submitProduct;
+  const productionCode = normalizeSubmitProductionCode(rawProductionCode);
   delete productRest[`product_${'option'}_item`];
   const rawMetadata = submitProduct.metadata || {};
   const bookingUid = rawMetadata.booking_uid;
@@ -1000,6 +1016,9 @@ function normalizeSubmitProduct(product) {
   };
   return {
     ...productRest,
+    ...(productionCode !== undefined ? {
+      production_code: productionCode
+    } : {}),
     ...(bookingUid ? {
       booking_uid: bookingUid
     } : {}),
@@ -1110,6 +1129,7 @@ function createDefaultTempOrder(params) {
     request_unique_idempotency_token: '',
     vouchers: [],
     products: [],
+    notes: [],
     bookings: [],
     payments: [],
     surcharges: [],
@@ -1119,10 +1139,58 @@ 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(booking => {
+    if (!booking || typeof booking !== 'object') return false;
+    if (Number(booking.parent_id) === 0) return false;
+    const resources = booking.resources;
+    if (!Array.isArray(resources)) return false;
+    return resources.some(resource => {
+      if (!resource || typeof resource !== 'object') return false;
+      const relationId = String(resource.relation_id ?? '').trim();
+      return relationId !== '' && relationId !== '0';
+    });
+  });
+}
+function isPersistedSubmitOrderId(orderId) {
+  if (orderId === undefined || orderId === null || orderId === '') return false;
+  const normalizedOrderId = Number(orderId);
+  return Number.isFinite(normalizedOrderId) && normalizedOrderId > 0;
+}
+
+/**
+ * 解析 checkout 的订单类型。
+ * dine_in 普通落库单在新增桌台资源后，即使原类型仍是 virtual，也必须按 table-order 提交。
+ */
+function resolveSubmitOrderType(params) {
+  const {
+    requestedType,
+    tempOrderType,
+    orderId,
+    businessCode,
+    tempOrderBusinessCode,
+    bookings
+  } = params;
+  const currentType = requestedType ?? tempOrderType;
+  const resolvedBusinessCode = 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';
+}
 function buildSubmitPayload(params) {
   const {
     tempOrder,
@@ -1156,22 +1224,18 @@ function buildSubmitPayload(params) {
     total_refund_amount: _totalRefundAmount,
     create_date: _createDate,
     holder_id: _holderId,
+    notes: _notes,
     ...tempOrderRest
   } = tempOrder;
-  let submitType = type ?? tempOrder.type;
-  if (!submitType) {
-    // 如果外部没有传递 types，根据订单里当前是否有 bookings 来决定是 appointment_booking 还是 virtual
-    if (tempOrder?.bookings?.length) {
-      // 260807 如果 biz 是堂食，type 使用table-order
-      if (businessCode === 'dine_in') {
-        submitType = 'table-order';
-      } else {
-        submitType = 'appointment_booking';
-      }
-    } else {
-      submitType = 'virtual';
-    }
-  }
+  const resolvedBusinessCode = businessCode ?? tempOrder.business_code;
+  const submitType = resolveSubmitOrderType({
+    requestedType: type,
+    tempOrderType: tempOrder.type,
+    orderId: tempOrder.order_id,
+    businessCode,
+    tempOrderBusinessCode: tempOrder.business_code,
+    bookings: tempOrder.bookings
+  });
   const payload = {
     ...tempOrderRest,
     customer_id: tempOrder.customer_id ?? 1,
@@ -1185,7 +1249,7 @@ function buildSubmitPayload(params) {
     platform: normalizeSubmitPlatform(platform),
     request_unique_idempotency_token: params?.request_unique_idempotency_token || tempOrder.request_unique_idempotency_token || `${tempOrder.external_sale_number}_${now.getTime()}`,
     type: submitType,
-    business_code: businessCode ?? tempOrder.business_code,
+    business_code: resolvedBusinessCode,
     sales_channel: tempOrder.sales_channel || 'my_pisel',
     order_sales_channel: channel ?? tempOrder.order_sales_channel ?? 'online_store',
     status: tempOrder.status || 'normal',
@@ -1218,6 +1282,11 @@ function buildSubmitPayload(params) {
         ...rest
       };
     })(),
+    ...(tempOrder._extend?.salesNotesState?.dirty ? {
+      notes: (0, _salesNotes.encodeSalesNotes)(tempOrder.notes || [], {
+        allowUnresolvedOrderTarget: true
+      })
+    } : {}),
     products: (tempOrder.products || []).map(product => normalizeSubmitProduct(product))
   };
   if (!enhance) return payload;

package/lib/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/lib/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[];

package/lib/modules/ProductList/clientDataVariants.js

@@ -0,0 +1,204 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PRODUCT_QUERY_DATA_VARIANT_RELATIONS = void 0;
+exports.isProductQueryHandledByOsServer = isProductQueryHandledByOsServer;
+exports.resolveClientDataVariants = resolveClientDataVariants;
+exports.tryResolveClientDataVariants = tryResolveClientDataVariants;
+const PRODUCT_QUERY_DATA_VARIANT_RELATIONS = exports.PRODUCT_QUERY_DATA_VARIANT_RELATIONS = ['category', 'collection', 'resourceRelation', 'bundleGroup.bundleItem', 'optionGroup.optionItem', 'variantGroup.variantItem', 'dataVariants'];
+
+/**
+ * 判断当前商品查询是否会被本地 OS Server 接管。
+ *
+ * H5 RequestPlugin 即使收到 osServer=true 仍会直接请求远端接口，因此必须按
+ * RequestPlugin 实际 baseUrl 对应的已注册路由判断，不能只看请求选项。
+ */
+function isProductQueryHandledByOsServer(core, request) {
+  const server = core?.server;
+  if (!server || typeof server.hasRoute !== 'function') return false;
+  const requestBaseUrl = String(request?.baseUrl || '/shop').replace(/\/+$/, '');
+  return server.hasRoute('post', `${requestBaseUrl}/product/query`) === true;
+}
+function getBundleItems(product) {
+  if (!Array.isArray(product.bundle_group)) return [];
+  return product.bundle_group.flatMap(group => Array.isArray(group?.bundle_item) ? group.bundle_item : []);
+}
+function hasCompleteDataVariantRelations(products) {
+  return products.every(product => Array.isArray(product?.data_variants));
+}
+function hasAnyDataVariants(products) {
+  return products.some(product => (product.data_variants?.length || 0) > 0 || getBundleItems(product).some(item => Array.isArray(item?.data_variants) && item.data_variants.length > 0));
+}
+function collectReferencedRuleIds(products) {
+  const ids = new Set();
+  const remember = variants => {
+    if (!Array.isArray(variants)) return;
+    variants.forEach(variant => {
+      const id = String(variant?.data_variant_rule_id ?? '').trim();
+      if (id) ids.add(id);
+    });
+  };
+  products.forEach(product => {
+    remember(product.data_variants);
+    getBundleItems(product).forEach(item => remember(item?.data_variants));
+  });
+  return ids;
+}
+function isEvaluatorReady(evaluator, products) {
+  if (typeof evaluator.isReady === 'function') {
+    if (evaluator.isReady() === false) return false;
+  }
+  if (evaluator.isReady === false || evaluator.ready === false) return false;
+
+  // The built-in evaluator is installed before its strategy request completes.
+  // A referenced Data Variant cannot be evaluated authoritatively until those
+  // configs have arrived. Evaluators without this capability remain compatible.
+  if (typeof evaluator.getStrategyConfigs === 'function') {
+    const configs = evaluator.getStrategyConfigs();
+    if (!Array.isArray(configs) || configs.length === 0) return false;
+    const availableRuleIds = new Set(configs.map(config => String(config?.metadata?.id ?? '').trim()).filter(Boolean));
+    return Array.from(collectReferencedRuleIds(products)).every(id => availableRuleIds.has(id));
+  }
+  return true;
+}
+
+/**
+ * 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.
+ */
+function tryResolveClientDataVariants({
+  core,
+  otherParams = {},
+  products,
+  queryPayload,
+  handledByOsServer,
+  scheduleList: explicitScheduleList,
+  menuList: explicitMenuList,
+  requireCompleteDataVariantRelations = true,
+  requireEvaluatorReady = true
+}) {
+  if (handledByOsServer) {
+    return {
+      status: 'handled-by-os-server',
+      products
+    };
+  }
+  if (products.length === 0) {
+    return {
+      status: 'empty',
+      products
+    };
+  }
+  if (requireCompleteDataVariantRelations && !hasCompleteDataVariantRelations(products)) {
+    return {
+      status: 'data-variants-unavailable',
+      products
+    };
+  }
+
+  // Explicit empty arrays mean the query hydrated the relation and there is no
+  // rule to apply. This is an authoritative local base-price result even when
+  // no evaluator has been installed.
+  if (!hasAnyDataVariants(products)) {
+    return {
+      status: 'resolved',
+      products
+    };
+  }
+  const evaluator = core?.context?.dataVariantEvaluator;
+  if (!evaluator || typeof evaluator.resolveProducts !== 'function') {
+    return {
+      status: 'evaluator-unavailable',
+      products
+    };
+  }
+  try {
+    if (requireEvaluatorReady && !isEvaluatorReady(evaluator, products)) {
+      return {
+        status: 'evaluator-not-ready',
+        products
+      };
+    }
+  } catch (error) {
+    return {
+      status: 'error',
+      products,
+      error
+    };
+  }
+  const strategyContext = queryPayload.strategy_context && typeof queryPayload.strategy_context === 'object' ? queryPayload.strategy_context : {};
+  const fatherModule = String(otherParams.fatherModule || '').trim();
+  const scheduleModule = (fatherModule ? core?.getModule(`${fatherModule}_schedule`) : null) || core?.getModule('schedule');
+  const moduleScheduleList = scheduleModule?.getScheduleList?.();
+  const contextScheduleList = core?.context?.scheduleList;
+  const contextMenuList = core?.context?.menuList;
+  const businessData = {
+    products,
+    scheduleDateTime: queryPayload.schedule_datetime || queryPayload.schedule_date,
+    scheduleList: Array.isArray(explicitScheduleList) && explicitScheduleList.length > 0 ? explicitScheduleList : Array.isArray(moduleScheduleList) && moduleScheduleList.length > 0 ? moduleScheduleList : Array.isArray(contextScheduleList) ? contextScheduleList : [],
+    menuList: Array.isArray(explicitMenuList) ? explicitMenuList : Array.isArray(otherParams.menuList) ? otherParams.menuList : Array.isArray(contextMenuList) ? contextMenuList : [],
+    customerId: queryPayload.customer_id,
+    channel: strategyContext.channel,
+    orderType: strategyContext.orderType || strategyContext.order_type,
+    businessCode: strategyContext.business_code ?? strategyContext.businessCode,
+    availableWalletIds: strategyContext.available_wallet_ids,
+    custom: strategyContext
+  };
+  try {
+    const result = evaluator.resolveProducts(businessData);
+    if (!Array.isArray(result?.products)) {
+      return {
+        status: 'error',
+        products,
+        error: new Error('Data Variant evaluator returned an invalid product list')
+      };
+    }
+    return {
+      status: 'resolved',
+      products: result.products
+    };
+  } catch (error) {
+    return {
+      status: 'error',
+      products,
+      error
+    };
+  }
+}
+
+/**
+ * 未启用商品 OS 路由时，在客户端补做 Data Variant 解析。
+ *
+ * 商品列表和预约报价必须共用这个边界，避免 H5 的弹窗报价绕过客户端智能定价。
+ * OS Server 已接管时直接信任服务端结果，确保同一批商品只评估一次。
+ */
+function resolveClientDataVariants({
+  core,
+  otherParams = {},
+  products,
+  queryPayload,
+  handledByOsServer,
+  scheduleList: explicitScheduleList,
+  menuList: explicitMenuList
+}) {
+  const result = tryResolveClientDataVariants({
+    core,
+    otherParams,
+    products,
+    queryPayload,
+    handledByOsServer,
+    scheduleList: explicitScheduleList,
+    menuList: explicitMenuList,
+    requireCompleteDataVariantRelations: false,
+    requireEvaluatorReady: false
+  });
+  if (result.status === 'error') {
+    console.error('[ClientDataVariants] Data Variant 客户端解析失败', result.error);
+  }
+  return result.products;
+}

package/lib/modules/ProductList/index.d.ts

@@ -1,6 +1,6 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { ProductListLoadProductsParams } from './types';
+import { ProductListLoadProductsParams, ProductListStoreQueryParams } from './types';
 import { ProductData } from '../Product/types';
 export * from './types';
 export declare class ProductList extends BaseModule implements Module {
@@ -9,6 +9,7 @@ export declare class ProductList extends BaseModule implements Module {
     private store;
     private request;
     private otherParams;
+    private rawProductPriceSources;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     /**
@@ -25,19 +26,33 @@ export declare class ProductList extends BaseModule implements Module {
      * @example
      * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
      */
-    getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<any>;
+    getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<ProductData[]>;
     loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, strategy_context, }?: ProductListLoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];
         customer_id?: number;
         schedule_date?: string;
         channel?: string;
     }): Promise<any>;
+    /**
+     * Remember raw remote product records before client-side Data Variant
+     * evaluation. Quote-only reads can then always start from a clean baseline.
+     */
+    rememberRawProductQueryResult(products: Array<ProductData | Record<string, any>>): void;
+    private replaceRawProductQueryResult;
+    /**
+     * Return isolated raw price sources for the requested products.
+     *
+     * Missing IDs are intentionally omitted so callers can remotely fetch only
+     * the incomplete part of a batch quote.
+     */
+    getRawProductPriceSources(ids: number[]): Map<number, ProductData>;
     getProducts(): Promise<ProductData[]>;
     getProduct(id: number): Promise<ProductData | undefined>;
+    queryProducts(params?: ProductListStoreQueryParams): Promise<ProductData[]>;
     getProductByIds(ids: number[]): Promise<ProductData[] | undefined>;
     addProduct(products: ProductData[]): Promise<void>;
     selectProducts(products: ProductData[]): Promise<void>;