@pisell/pisellos 2.2.258 → 2.2.260

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

@@ -491,7 +491,7 @@ export interface OrderPaymentData {
     voucher_id?: string | number;
     origin_amount?: string;
     service_fee?: string;
-    status?: 'active' | 'paid' | 'voided' | 'payment_pending' | string;
+    status?: 'active' | 'voided' | string;
     /** 支付时间 (格式: YYYY-MM-DD HH:mm:ss) */
     payment_time?: string;
     wallet_pass_usage_unit?: unknown;
@@ -537,15 +537,9 @@ export interface SyncPaymentsToOrderParams {
     smallTicketDataFlag?: number;
     businessCode?: string;
     channel?: string;
-    confirmPendingVoucherPayments?: boolean;
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;
-    isOrderFullyPaid: boolean;
-    isDepositFullyPaid: boolean;
-    paymentStage: 'deposit' | 'normal';
-    depositAmount: string;
-    orderExpectedAmount: string;
     submitResult?: T;
 }
 export interface OrderIdentitySnapshot {
@@ -697,7 +691,6 @@ export interface OrderModuleAPI {
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
-        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }) => Promise<T>;
     submitTempOrderAsync: <T = any>(params?: {
@@ -709,7 +702,6 @@ export interface OrderModuleAPI {
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
-        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }) => Promise<T>;
     getOrderPayments: () => OrderPaymentData[];
@@ -717,17 +709,7 @@ export interface OrderModuleAPI {
     addOrderPayment: (payment: OrderPaymentSource) => OrderPaymentData[];
     updateOrderPayment: (paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>) => OrderPaymentData[];
     deleteOrderPayment: (paymentIdentity: string | number) => OrderPaymentData[];
-    updateVoucherOrderPayments: (payments: OrderPaymentSource[], options?: {
-        status?: 'paid' | 'payment_pending';
-    }) => OrderPaymentData[];
-    confirmPendingVoucherPayments: (options?: {
-        persist?: boolean;
-        recalculateSummary?: boolean;
-    }) => OrderPaymentData[];
-    discardPendingVoucherPayments: (options?: {
-        persist?: boolean;
-        recalculateSummary?: boolean;
-    }) => OrderPaymentData[];
+    updateVoucherOrderPayments: (payments: OrderPaymentSource[]) => OrderPaymentData[];
     sendCustomerPayLink: <T = any>(params: SendCustomerPayLinkParams) => Promise<T>;
     saveDraft: () => Promise<void>;
     hydrateTempOrderFromRecord: (record: Record<string, any>, options?: {

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

@@ -254,10 +254,6 @@ export declare function clearTempOrderHolderAssignments(tempOrder: OrderTempOrde
  * getOrderProductLineUid({ metadata: { unique_identification_number: 'line-1' } }); // 'line-1'
  */
 export declare function getOrderProductLineUid(product: Record<string, any> | null | undefined): string | null;
-export declare function getRuntimeProductOrigin(tempOrder: OrderTempOrder | null | undefined, product: any): Record<string, any> | null;
-export declare function isHolderConfigRequired(holderConfig: any): boolean;
-export declare function productRequiresFormSubject(tempOrder: OrderTempOrder | null | undefined, product: any): boolean;
-export declare function resolveIsFormSubject(tempOrder: OrderTempOrder | null | undefined, product?: any): boolean;
 /**
  * 判断展示字段是否为空（含 i18n 对象全空）。
  *

package/dist/modules/Order/utils.js

@@ -1,8 +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"],
-  _excluded5 = ["collect_pax", "table_occupancy_duration"];
+var _excluded = ["unique_identification_number"],
+  _excluded2 = ["num", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per"],
+  _excluded3 = ["_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"],
+  _excluded4 = ["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; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -447,54 +446,6 @@ export function normalizeOrderProductDiscountList(discountList) {
     return normalized;
   });
 }
-function resolveSubmitBundleMapId(bundle) {
-  var _bundle$metadata;
-  var metadataMapId = (_bundle$metadata = bundle.metadata) === null || _bundle$metadata === void 0 ? void 0 : _bundle$metadata.custom_product_bundle_map_id;
-  if (metadataMapId !== undefined && metadataMapId !== null && metadataMapId !== '') {
-    return metadataMapId;
-  }
-  if (bundle._id !== undefined && bundle._id !== null && bundle._id !== '') {
-    return bundle._id;
-  }
-  return undefined;
-}
-function collectSubmitProductDiscountList(product) {
-  var submitDiscountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? _toConsumableArray(product.discount_list) : [];
-  var _iterator6 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
-    _step6;
-  try {
-    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-      var bundle = _step6.value;
-      if (!bundle || _typeof(bundle) !== 'object') continue;
-      var bundleMapId = resolveSubmitBundleMapId(bundle);
-      var bundleDiscountList = Array.isArray(bundle.discount_list) ? bundle.discount_list : [];
-      var _iterator7 = _createForOfIteratorHelper(bundleDiscountList),
-        _step7;
-      try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var discount = _step7.value;
-          if (!discount || _typeof(discount) !== 'object') continue;
-          var discountMetadata = discount.metadata && _typeof(discount.metadata) === 'object' ? discount.metadata : {};
-          var discountMapId = discountMetadata.custom_product_bundle_map_id !== undefined && discountMetadata.custom_product_bundle_map_id !== null && discountMetadata.custom_product_bundle_map_id !== '' ? discountMetadata.custom_product_bundle_map_id : bundleMapId;
-          submitDiscountList.push(_objectSpread(_objectSpread({}, discount), discountMapId !== undefined ? {
-            metadata: _objectSpread(_objectSpread({}, discountMetadata), {}, {
-              custom_product_bundle_map_id: discountMapId
-            })
-          } : {}));
-        }
-      } catch (err) {
-        _iterator7.e(err);
-      } finally {
-        _iterator7.f();
-      }
-    }
-  } catch (err) {
-    _iterator6.e(err);
-  } finally {
-    _iterator6.f();
-  }
-  return normalizeOrderProductDiscountList(submitDiscountList);
-}
 
 /**
  * 手动改价（price_override）时行级 original_price（composite 单价）：
@@ -832,8 +783,6 @@ function formatSubmitBundleItems(bundle) {
     var _ref25, _rawBundle$price, _rawBundle$surcharge_, _rawBundle$num, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$quantity, _rawBundle$extension_, _rawBundle$extension_2, _ref26, _rawBundle$price_type, _ref27, _rawBundle$price_type2, _rawBundle$bundle_gro, _rawBundle$bundle_id, _rawBundle$bundle_pro;
     var rawBundle = b && _typeof(b) === 'object' ? b : {};
     var existedMetadata = rawBundle.metadata && _typeof(rawBundle.metadata) === 'object' ? rawBundle.metadata : {};
-    var _customProductBundleMapId = existedMetadata.custom_product_bundle_map_id,
-      submitMetadata = _objectWithoutProperties(existedMetadata, _excluded);
 
     // bundle_selling_price 出站存「正净额」：markdown 为 |price| − Σoptions（如 3.70），
     // markup/原价维持原值；与后端口径一致（price 仍为毛价）。
@@ -845,8 +794,6 @@ function formatSubmitBundleItems(bundle) {
     var surchargeFee = toMoneyString((_rawBundle$surcharge_ = rawBundle.surcharge_fee) !== null && _rawBundle$surcharge_ !== void 0 ? _rawBundle$surcharge_ : existedMetadata.surcharge_fee);
     var productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
     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 {
       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,
@@ -863,9 +810,7 @@ function formatSubmitBundleItems(bundle) {
       bundle_group_id: (_rawBundle$bundle_gro = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_group_id) !== null && _rawBundle$bundle_gro !== void 0 ? _rawBundle$bundle_gro : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.group_id,
       bundle_id: (_rawBundle$bundle_id = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_id) !== null && _rawBundle$bundle_id !== void 0 ? _rawBundle$bundle_id : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.id,
       bundle_product_id: (_rawBundle$bundle_pro = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_product_id) !== null && _rawBundle$bundle_pro !== void 0 ? _rawBundle$bundle_pro : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle._bundle_product_id,
-      metadata: _objectSpread(_objectSpread(_objectSpread({}, submitMetadata), hasSubmitBundleDiscounts && bundleMapId !== undefined ? {
-        custom_product_bundle_map_id: bundleMapId
-      } : {}), {}, {
+      metadata: _objectSpread(_objectSpread({}, existedMetadata), {}, {
         surcharge_fee: surchargeFee,
         relation_surcharge_ids: relationSurchargeIds,
         product_discount_difference: productDiscountDifference
@@ -894,7 +839,7 @@ function normalizeSubmitProduct(product) {
   var _rawMetadata$product_, _submitProduct$produc, _submitProduct$paymen;
   var _ref28 = product,
     _runtimeUid = _ref28.unique_identification_number,
-    submitProduct = _objectWithoutProperties(_ref28, _excluded2);
+    submitProduct = _objectWithoutProperties(_ref28, _excluded);
   var num = submitProduct.num,
     _productSurchargeFee = submitProduct.surcharge_fee,
     _deprecatedDiscountAmount = submitProduct.discount_amount,
@@ -902,7 +847,7 @@ function normalizeSubmitProduct(product) {
     _deprecatedDiscountway = submitProduct.discountway,
     _deprecatedProductDiscountReason = submitProduct.product_discount_reason,
     _deprecatedDiscountPer = submitProduct.discount_per,
-    productRest = _objectWithoutProperties(submitProduct, _excluded3);
+    productRest = _objectWithoutProperties(submitProduct, _excluded2);
   delete productRest["product_".concat('option', "_item")];
   var rawMetadata = submitProduct.metadata || {};
   var bookingUid = rawMetadata.booking_uid;
@@ -932,7 +877,7 @@ function normalizeSubmitProduct(product) {
   } : {}), {}, {
     product_quantity: toBundleNumber(num !== null && num !== void 0 ? num : submitProduct.product_quantity, 1),
     product_sku: productSku,
-    discount_list: collectSubmitProductDiscountList(submitProduct),
+    discount_list: normalizeOrderProductDiscountList(submitProduct.discount_list),
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
     // 出站兼容：后端消费 payment_price 字段（行 composite 已减整单折扣均摊）。
@@ -954,19 +899,19 @@ export function normalizeBookingSubType(booking) {
 export function normalizeSubmitBooking(booking) {
   var rawMetadata = booking.metadata || {};
   var cleanMetadata = {};
-  var _iterator8 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
-    _step8;
+  var _iterator6 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
+    _step6;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-      var key = _step8.value;
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+      var key = _step6.value;
       if (rawMetadata[key] !== undefined) {
         cleanMetadata[key] = rawMetadata[key];
       }
     }
   } catch (err) {
-    _iterator8.e(err);
+    _iterator6.e(err);
   } finally {
-    _iterator8.f();
+    _iterator6.f();
   }
   if (cleanMetadata.holder_id === undefined) cleanMetadata.holder_id = null;
   var bookingRecord = booking;
@@ -1090,7 +1035,7 @@ export function buildSubmitPayload(params) {
     _totalRefundAmount = _ref29.total_refund_amount,
     _createDate = _ref29.create_date,
     _holderId = _ref29.holder_id,
-    tempOrderRest = _objectWithoutProperties(_ref29, _excluded4);
+    tempOrderRest = _objectWithoutProperties(_ref29, _excluded3);
   var submitType = type !== null && type !== void 0 ? type : tempOrder.type;
   if (!submitType) {
     var _tempOrder$bookings;
@@ -1141,7 +1086,7 @@ export function buildSubmitPayload(params) {
       var _ref31 = tempOrder.metadata || {},
         _collectPax = _ref31.collect_pax,
         _tableOccupancyDuration = _ref31.table_occupancy_duration,
-        rest = _objectWithoutProperties(_ref31, _excluded5);
+        rest = _objectWithoutProperties(_ref31, _excluded4);
       return _objectSpread({}, rest);
     }(),
     products: (tempOrder.products || []).map(function (product) {
@@ -1279,25 +1224,25 @@ export function clearTempOrderHolderAssignments(tempOrder) {
     target[key] = null;
     changed = true;
   };
-  var _iterator9 = _createForOfIteratorHelper(tempOrder.products || []),
-    _step9;
+  var _iterator7 = _createForOfIteratorHelper(tempOrder.products || []),
+    _step7;
   try {
-    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-      var product = _step9.value;
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+      var product = _step7.value;
       if (product.metadata && _typeof(product.metadata) === 'object') {
         resetHolderField(product.metadata);
       }
     }
   } catch (err) {
-    _iterator9.e(err);
+    _iterator7.e(err);
   } finally {
-    _iterator9.f();
+    _iterator7.f();
   }
-  var _iterator10 = _createForOfIteratorHelper(tempOrder.bookings || []),
-    _step10;
+  var _iterator8 = _createForOfIteratorHelper(tempOrder.bookings || []),
+    _step8;
   try {
-    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-      var booking = _step10.value;
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      var booking = _step8.value;
       var bookingRecord = booking;
       if (booking.metadata && _typeof(booking.metadata) === 'object') {
         resetHolderField(booking.metadata);
@@ -1308,9 +1253,9 @@ export function clearTempOrderHolderAssignments(tempOrder) {
       }
     }
   } catch (err) {
-    _iterator10.e(err);
+    _iterator8.e(err);
   } finally {
-    _iterator10.f();
+    _iterator8.f();
   }
   var productsByUid = (_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.productsByUid;
   if (productsByUid && _typeof(productsByUid) === 'object') {
@@ -1342,37 +1287,6 @@ export function getOrderProductLineUid(product) {
   if (uid === undefined || uid === null || uid === '') return null;
   return String(uid);
 }
-export function getRuntimeProductOrigin(tempOrder, product) {
-  var _tempOrder$_extend2, _tempOrder$_extend3;
-  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) {
-    return tempOrder._extend.productsByUid[uid].origin;
-  }
-  var matchedProduct = ((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || []).find(function (item) {
-    var _ref32, _item$product_id, _ref33, _product$product_id;
-    return item === product || getOrderProductLineUid(item) === uid || String((_ref32 = (_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 && _ref32 !== void 0 ? _ref32 : '') === String((_ref33 = (_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 && _ref33 !== void 0 ? _ref33 : '');
-  });
-  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;
-}
-export function isHolderConfigRequired(holderConfig) {
-  if (!holderConfig || _typeof(holderConfig) !== 'object') return false;
-  if (holderConfig.status === 'disable') return false;
-  return Number(holderConfig.required) === 1;
-}
-export function productRequiresFormSubject(tempOrder, product) {
-  var runtimeOrigin = getRuntimeProductOrigin(tempOrder, product);
-  return isHolderConfigRequired(product === null || product === void 0 ? void 0 : product.holder_config) || isHolderConfigRequired(runtimeOrigin === null || runtimeOrigin === void 0 ? void 0 : runtimeOrigin.holder_config);
-}
-export function resolveIsFormSubject(tempOrder, product) {
-  var _tempOrder$holder;
-  // 旧版预约维度的 holder 类型仍然生效；新版则从当前商品 holder_config 判断。
-  if ((tempOrder === null || tempOrder === void 0 || (_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.type) === 'form') return true;
-  if (product) return productRequiresFormSubject(tempOrder, product);
-  return ((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || []).some(function (item) {
-    return productRequiresFormSubject(tempOrder, item);
-  });
-}
 
 /**
  * 判断展示字段是否为空（含 i18n 对象全空）。

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -9,6 +9,26 @@ export interface ProductCollection {
     /** 商品集合封面 */
     cover: string;
 }
+/**
+ * 商品 Data Variant 记录，结构与后端 data_variant 表对齐。
+ */
+export interface ProductDataVariant {
+    /** 变体记录 id */
+    id: number;
+    /** 店铺 id */
+    shop_id: number;
+    /** 所属模块，商品场景固定为 product */
+    module: string;
+    /** 模块数据 id，商品场景对应 product.id */
+    module_data_id: number;
+    /** 关联 data_variant_rule.id */
+    data_variant_rule_id: number;
+    /** 命中策略后覆盖到商品上的字段 */
+    data: Record<string, any>;
+    created_at: string | null;
+    updated_at: string | null;
+    deleted_at: string | null;
+}
 /**
  * 商品基本信息接口
  */
@@ -214,6 +234,8 @@ export interface ProductData {
     bundle_group_count: number;
     /** 选项组数量 */
     option_group_count: number;
+    /** 智能定价变体列表，/product/query with dataVariants 返回 */
+    data_variants?: ProductDataVariant[];
     /** 服务时长 */
     service_times?: any;
 }

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

@@ -26,7 +26,7 @@ export declare class ProductList extends BaseModule implements Module {
      * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
      */
     getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<any>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, }?: ProductListLoadProductsParams, options?: {
+    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>;

package/dist/modules/ProductList/index.js

@@ -152,6 +152,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           extension_type,
           _ref$status,
           status,
+          strategy_context,
           options,
           userPlugin,
           customer_id,
@@ -162,7 +163,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _ref = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {}, _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule, extension_type = _ref.extension_type, _ref$status = _ref.status, status = _ref$status === void 0 ? 'published' : _ref$status;
+              _ref = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {}, _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule, extension_type = _ref.extension_type, _ref$status = _ref.status, status = _ref$status === void 0 ? 'published' : _ref$status, strategy_context = _ref.strategy_context;
               options = _args4.length > 1 ? _args4[1] : undefined;
               // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
               // if (!schedule_ids?.length) {
@@ -206,7 +207,8 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 is_eject: 1,
                 with_schedule: with_schedule,
                 schedule_datetime: schedule_datetime,
-                extension_type: extension_type
+                extension_type: extension_type,
+                strategy_context: strategy_context
               }, {
                 osServer: true,
                 callback: options === null || options === void 0 ? void 0 : options.callback,

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

@@ -12,6 +12,8 @@ export interface ProductListLoadProductsParams {
     with_schedule?: number;
     extension_type?: string[];
     status?: string;
+    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
+    strategy_context?: Record<string, any>;
 }
 export interface ProductListData {
     list: ProductData[];

package/dist/modules/Rules/index.d.ts

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, UnavailableReason } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
 import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 import { WindowPlugin } from '../../plugins';
@@ -24,7 +24,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: RulesFormSubject;
+        isFormSubject: boolean;
     }): {
         isAvailable: boolean;
         discountList: Discount[];
@@ -43,7 +43,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: RulesFormSubject;
+        isFormSubject: boolean;
         orderTotalAmount: number;
     }, options?: {
         isSelected?: boolean;

package/dist/modules/Rules/index.js

@@ -118,8 +118,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 非表单类型 holder 视为匹配
       if (((_discount$holder = discount.holder) === null || _discount$holder === void 0 ? void 0 : _discount$holder.holder_type) !== 'form') return true;
       // 主预约holder, 目前（20251124）默认只考虑单个holder的情况
-      // 旧版 holders[0].form_record_id 新版 holders[0]
-      var orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id || holders[0] : undefined;
+      var orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id : undefined;
       var productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
       // 商品不需要选holder，则不对比holder，直接返回true，
       if (!product.isNeedHolder) return true;
@@ -324,10 +323,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         holders = _ref2.holders,
         isFormSubject = _ref2.isFormSubject,
         orderTotalAmount = _ref2.orderTotalAmount;
-      var resolveIsFormSubject = function resolveIsFormSubject(product) {
-        return typeof isFormSubject === 'function' ? Boolean(isFormSubject(product)) : Boolean(isFormSubject);
-      };
-
       // 识别出来是不是在编辑的界面里又新增了商品
       // 这种情况下，如果有可用的优惠券，也会自动勾选上
       var isEditModeAddNewProduct = productList.find(function (n) {
@@ -890,7 +885,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
-            isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
+            isNeedHolder: isFormSubject && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
           var timeLimit = true;
@@ -1093,7 +1088,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
-            isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
+            isNeedHolder: isFormSubject && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
           // 如果 holder 不匹配，则不适用

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

@@ -22,7 +22,6 @@ export interface DiscountResult {
     productList: any[];
     discountList: any[];
 }
-export type RulesFormSubject = boolean | ((product: any) => boolean);
 export interface RulesModuleAPI {
     setRulesList: (rulesList: Rules[]) => Promise<void>;
     clear: () => Promise<void>;
@@ -32,7 +31,7 @@ export interface RulesModuleAPI {
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: RulesFormSubject;
+        isFormSubject: boolean;
         orderTotalAmount: number;
     }) => DiscountResult;
 }

package/dist/server/index.d.ts

@@ -47,6 +47,8 @@ declare class Server {
     private prefixRouterGet;
     router: Router;
     private productQuerySubscribers;
+    /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
+    private productQueryScheduleTimers;
     private orderQuerySubscribers;
     private bookingQuerySubscribers;
     private bookingRemoteQuerySubscribers;
@@ -210,6 +212,48 @@ declare class Server {
      * 根据 subscriberId 移除商品查询订阅者
      */
     removeProductQuerySubscriber(subscriberId?: string): void;
+    /**
+     * 构建商品 query 响应 data 段，附带智能定价 schedule_time_points 元数据。
+     */
+    private buildProductQueryResultPayload;
+    /**
+     * 是否启用商品 query 订阅的 schedule 时间点定时重算。
+     * strategy_context.enable_schedule_reload === false 时关闭。
+     */
+    private shouldScheduleProductQueryReload;
+    /**
+     * 清除指定 subscriber 的全部 schedule 定时器，防止重复 query 或 unsubscribe 后泄漏。
+     */
+    private clearSubscriberScheduleTimers;
+    /**
+     * 从 productQueryScheduleTimers 移除已触发的 timer 引用。
+     */
+    private removeScheduleTimerRef;
+    /**
+     * 计算 schedule 变价时间点到当前时刻的延迟（ms）。已过期返回 -1。
+     */
+    private computeScheduleTimePointDelayMs;
+    /**
+     * 定时重算前刷新 subscriber schedule 上下文：使用执行瞬间时间，禁止沿用首次 query 的 schedule_datetime。
+     */
+    private refreshSubscriberScheduleAtExecution;
+    /**
+     * 为 subscriber 注册智能定价 scheduleTimePoints 定时重算。
+     * 必须先 clearSubscriberScheduleTimers，再调用本方法。
+     */
+    private scheduleSubscriberTimePointReloads;
+    /**
+     * schedule 变价时间点定时器触发：刷新 schedule_datetime 后重算并 callback。
+     */
+    private onScheduleTimePointTimerFire;
+    /**
+     * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
+     */
+    private recomputeAndNotifySubscriber;
+    /**
+     * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
+     */
+    private syncProductQueryScheduleTimers;
     /**
      * 处理商品查询请求
      * 存储订阅者信息，便于数据变更时推送最新结果
@@ -431,9 +475,6 @@ declare class Server {
     private shouldLookupLocalPrintOrder;
     private getLocalPrintOrderLookup;
     private handleLocalPrintOrder;
-    private handleMachinecodeBatchMetadata;
-    private resolveMachinecodeBatchMetadataLookup;
-    private syncMachinecodeBatchMetadataToLocalOrder;
     private handleOrderCheckoutSubmit;
     private handleSyncCheckoutSubmit;
     private handlePendingSyncCheckoutOrder;
@@ -565,6 +606,12 @@ declare class Server {
      * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     private computeProductQueryResult;
+    /**
+     * 构建商品格式化上下文。
+     *
+     * 智能定价条件使用全量 menuList/scheduleList；Product Query 顶层参数只保留筛选商品集合所需字段。
+     */
+    private buildProductFormatterContext;
     /**
      * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
      * 由 ProductsModule 的 onProductsSyncCompleted 事件触发