@pisell/pisellos 2.3.53 → 2.3.54

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

@@ -0,0 +1,123 @@
+import { ProductData } from '../Product/types';
+/**
+ * 商品 holder 配置
+ */
+export interface IHolderConfig {
+    required?: number;
+    resource_id: number;
+    status?: string;
+    [key: string]: any;
+}
+/**
+ * 表单记录
+ */
+export interface IFormRecord {
+    form_id: number;
+    form_record_id: number;
+    main_field: string;
+    customer_cover?: string;
+    created_at?: string;
+    customer_id?: number;
+    [key: string]: any;
+}
+/**
+ * 表单配置/定义
+ */
+export interface IFormInfo {
+    form_id: number;
+    name: string;
+    fields?: Record<string, any>[];
+    [key: string]: any;
+}
+/**
+ * 单个 form_id 下的数据结构
+ */
+export interface IFormItemData {
+    records: IFormRecord[];
+    form: IFormInfo | Record<string, any>;
+}
+/**
+ * form_id 为 key 的 map 结构，如 948: { records: [], form: {} }
+ */
+export type HolderFormMap = Record<string, IFormItemData>;
+/**
+ * Holder 模块 reactive store，仅 holderMap 会触发 changed 事件
+ */
+export interface HolderState {
+    holderMap: HolderFormMap;
+}
+export interface IFetchFormInfoParams {
+    url?: string;
+    query: {
+        form_id: string | number;
+    };
+    useCache?: boolean;
+}
+export interface IFetchFormRecordsParams {
+    url?: string;
+    query: {
+        customer_id?: number;
+        form_id: string | number;
+        shop_id: string | number;
+        num?: number;
+        skip?: number;
+        [key: string]: any;
+    };
+    useCache?: boolean;
+}
+export interface IAddFormRecordParams {
+    url?: string;
+    body: {
+        form_id: number;
+        shop_id: number | string;
+        customer_id?: number;
+        [key: string]: any;
+    };
+}
+/**
+ * UI 层自行调用添加接口后，将返回记录写入 holderMap
+ */
+export interface IAppendFormRecordParams {
+    /** 接口返回的 data，或完整响应 { data: {...} } */
+    record: IFormRecord | Record<string, any>;
+    /** 可选，未传则从 record.form_id 读取 */
+    form_id?: number | string;
+}
+export interface IEnsureFormDataParams {
+    form_id: number | string;
+    shop_id: number | string;
+    customer_id?: number;
+    useCache?: boolean;
+    forceRefresh?: boolean;
+    formInfoUrl?: string;
+    recordsUrl?: string;
+    skip?: number;
+    num?: number;
+}
+export interface IEnsureFormByProductParams {
+    product: ProductData | Record<string, any>;
+    customer_id?: number;
+    shop_id?: number | string;
+    useCache?: boolean;
+}
+export interface IRefreshAllFormRecordsParams {
+    customer_id?: number;
+    useCache?: boolean;
+    recordsUrl?: string;
+    num?: number;
+    skip?: number;
+}
+export interface HolderModuleAPI {
+    getHolderFormMap: () => HolderFormMap;
+    getHolderFormData: (formId: number | string) => IFormItemData | undefined;
+    setFormData: (formId: number | string, data: Partial<IFormItemData>) => void;
+    fetchFormInfo: (params: IFetchFormInfoParams) => Promise<IFormInfo | IFormInfo[]>;
+    fetchRecords: (params: IFetchFormRecordsParams) => Promise<IFormRecord[]>;
+    ensureFormData: (params: IEnsureFormDataParams) => Promise<IFormItemData>;
+    ensureFormByProduct: (params: IEnsureFormByProductParams) => Promise<IFormItemData | null>;
+    addFormRecord: (params: IAddFormRecordParams) => Promise<IFormRecord>;
+    appendFormRecord: (params: IAppendFormRecordParams) => IFormRecord;
+    removeFormRecord: (formId: number | string, formRecordId: number) => void;
+    clearFormData: (formId?: number | string) => void;
+    refreshAllFormRecords: (params?: IRefreshAllFormRecordsParams) => Promise<HolderFormMap>;
+}

package/dist/modules/Holder/types.js

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,13 @@
+import { ProductData } from '../Product/types';
+import { IFormItemData, IHolderConfig } from './types';
+export declare function getProductHolderConfig(product?: ProductData | Record<string, any> | null): IHolderConfig | null;
+export declare function getFormIdFromHolderConfig(config: IHolderConfig): number;
+export declare function normalizeFormId(formId: number | string): number;
+export declare function createEmptyFormItemData(): {
+    records: any[];
+    form: Record<string, any>;
+};
+export declare function resolveFormMetaFromHolderItem(mapKey: string, item: IFormItemData): {
+    form_id: string | number;
+    shop_id: number | string;
+} | null;

package/dist/modules/Holder/utils.js

@@ -0,0 +1,34 @@
+export function getProductHolderConfig(product) {
+  var _product$holder_confi, _product$origin;
+  if (!product) return null;
+  var config = (_product$holder_confi = product === null || product === void 0 ? void 0 : product.holder_config) !== null && _product$holder_confi !== void 0 ? _product$holder_confi : product === null || product === void 0 || (_product$origin = product.origin) === null || _product$origin === void 0 ? void 0 : _product$origin.holder_config;
+  if (config !== null && config !== void 0 && config.status && (config === null || config === void 0 ? void 0 : config.status) !== 'enable') return null;
+  if (!(config !== null && config !== void 0 && config.resource_id)) return null;
+  return config;
+}
+export function getFormIdFromHolderConfig(config) {
+  return Number(config === null || config === void 0 ? void 0 : config.resource_id);
+}
+export function normalizeFormId(formId) {
+  return Number(formId);
+}
+export function createEmptyFormItemData() {
+  return {
+    records: [],
+    form: {}
+  };
+}
+export function resolveFormMetaFromHolderItem(mapKey, item) {
+  var _ref, _ref2, _nestedForm$id, _nestedForm$shop_id;
+  var formInfo = item.form || {};
+  var nestedForm = formInfo.form || {};
+  var form_id = normalizeFormId((_ref = (_ref2 = (_nestedForm$id = nestedForm.id) !== null && _nestedForm$id !== void 0 ? _nestedForm$id : formInfo.form_id) !== null && _ref2 !== void 0 ? _ref2 : formInfo.id) !== null && _ref !== void 0 ? _ref : mapKey);
+  var shop_id = (_nestedForm$shop_id = nestedForm.shop_id) !== null && _nestedForm$shop_id !== void 0 ? _nestedForm$shop_id : formInfo.shop_id;
+  if (shop_id === undefined || shop_id === null || shop_id === '') {
+    return null;
+  }
+  return {
+    form_id: form_id,
+    shop_id: shop_id
+  };
+}

package/dist/modules/OpenData/index.js

@@ -105,12 +105,12 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
     key: "fetchOpenData",
     value: function () {
       var _fetchOpenData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var _this$appPlugin$getDa, _this$appPlugin;
+        var _this$appPlugin, _this$appPlugin$getDa;
         var getData, shopId, tenantId, headers, response, data;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              getData = (_this$appPlugin$getDa = (_this$appPlugin = this.appPlugin).getData) === null || _this$appPlugin$getDa === void 0 ? void 0 : _this$appPlugin$getDa.call(_this$appPlugin);
+              getData = (_this$appPlugin = this.appPlugin) === null || _this$appPlugin === void 0 || (_this$appPlugin$getDa = _this$appPlugin.getData) === null || _this$appPlugin$getDa === void 0 ? void 0 : _this$appPlugin$getDa.call(_this$appPlugin);
               shopId = getData === null || getData === void 0 ? void 0 : getData('shop_id');
               if (shopId) {
                 _context2.next = 4;

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CheckoutOrderParams, CancelOrderParams, ChangeBookingStatusParams } from './types';
+import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CancelOrderParams, ChangeBookingStatusParams, CheckoutOrderParams } from './types';
 import { CartItem } from '../Cart/types';
 import { type SubmitPayloadEnhancer } from './utils';
 import type { OrderAmountSnapshot, AddProductBookingInput, AddProductToOrderOptions, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions } from './types';
@@ -147,6 +147,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     isTempOrderPersistEnabled(): boolean;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化；草稿保存请使用 IndexedDB saveDraft。 */
     persistTempOrder(): void;
+    notifyTempOrderChanged(): void;
     private createDefaultTempOrderInstance;
     private createExternalSaleNumber;
     private ensureExternalSaleNumber;
@@ -496,6 +497,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         is_deposit: number;
         relation_products: any[];
         relation_forms: any[];
+        business_code: string | undefined;
     };
     checkBeforeSubmitOrder(params: {
         cartItems: CartItem[];

package/dist/modules/Order/index.js

@@ -32,7 +32,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
 import { OrderHooks } from "./types";
-import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields, resolveIsFormSubject } from "./utils";
+import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields, resolveIsFormSubject } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { ensureOrderPaymentNumber, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "./payment-utils";
@@ -309,8 +309,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
-        var _otherParams$rules, _otherParams$order, _otherParams$hooks;
-        var app, otherParams;
+        var _appPlugin$getApp, _otherParams$rules, _otherParams$order, _otherParams$hooks;
+        var appPlugin, app, otherParams;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -326,15 +326,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.store.availableWalletIds = [];
               }
               this.request = this.core.getPlugin('request');
-              this.appPlugin = this.core.getPlugin('app');
-              if (this.appPlugin) {
-                _context.next = 9;
-                break;
+              appPlugin = this.core.getPlugin('app');
+              if (!appPlugin) {
+                console.error('Order 模块需要 app 插件支持');
               }
-              throw new Error('Order 模块需要 app 插件支持');
-            case 9:
-              app = this.appPlugin.getApp();
-              this.logger = app.logger;
+              app = appPlugin === null || appPlugin === void 0 || (_appPlugin$getApp = appPlugin.getApp) === null || _appPlugin$getApp === void 0 ? void 0 : _appPlugin$getApp.call(appPlugin);
+              this.logger = app === null || app === void 0 ? void 0 : app.logger;
               this.window = this.core.getPlugin('window');
               otherParams = options.otherParams || {};
               this.cacheId = otherParams.cacheId;
@@ -345,7 +342,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.otherParams = otherParams;
               this.registerDiscountModules(options);
               this.logInfo('OrderModule initialized successfully');
-            case 21:
+            case 20:
             case "end":
               return _context.stop();
           }
@@ -1276,6 +1273,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function persistTempOrder() {
       // no-op: OrderModule 的刷新恢复不再依赖 localStorage。
     }
+  }, {
+    key: "notifyTempOrderChanged",
+    value: function notifyTempOrderChanged() {
+      if (!this.store.tempOrder) return;
+      this.store.tempOrder = _objectSpread(_objectSpread({}, this.store.tempOrder), {}, {
+        products: _toConsumableArray(this.store.tempOrder.products),
+        bookings: this.store.tempOrder.bookings ? _toConsumableArray(this.store.tempOrder.bookings) : []
+      });
+      this.persistTempOrder();
+    }
 
     // ─── TempOrder: 创建 & 获取 ───
   }, {
@@ -5334,7 +5341,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
         var _this31 = this,
           _params$confirmPendin;
-        var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitResult;
+        var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitParams, submitResult;
         return _regeneratorRuntime().wrap(function _callee36$(_context39) {
           while (1) switch (_context39.prev = _context39.next) {
             case 0:
@@ -5387,8 +5394,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 25:
               this.store.syncState = 'submitting';
               paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, effectivePayments);
-              _context39.next = 29;
-              return this.submitTempOrder({
+              submitParams = {
                 payments: effectivePayments,
                 paymentStatus: paymentStatus,
                 smallTicketDataFlag: params.smallTicketDataFlag,
@@ -5401,13 +5407,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   });
                   return nextPayload;
                 }
-              });
-            case 29:
-              submitResult = _context39.sent;
+              };
+              if (!(params.checkoutSyncTaskEnabled === false)) {
+                _context39.next = 34;
+                break;
+              }
+              _context39.next = 31;
+              return this.submitTempOrderAsync(submitParams);
+            case 31:
+              _context39.t1 = _context39.sent;
+              _context39.next = 37;
+              break;
+            case 34:
+              _context39.next = 36;
+              return this.submitTempOrder(submitParams);
+            case 36:
+              _context39.t1 = _context39.sent;
+            case 37:
+              submitResult = _context39.t1;
               return _context39.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
                 submitResult: submitResult
               }));
-            case 31:
+            case 39:
             case "end":
               return _context39.stop();
           }
@@ -5421,6 +5442,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrder",
     value: function createOrder(params) {
+      var _this32 = this;
       var order = _objectSpread({
         type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
@@ -5432,11 +5454,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         schedule_date: '',
         is_deposit: 0,
         relation_products: [],
-        relation_forms: []
+        relation_forms: [],
+        business_code: params === null || params === void 0 ? void 0 : params.business_code
       }, (params === null || params === void 0 ? void 0 : params.extraData) || {});
       var is_deposit = 0; // 是否存在定金，0 不存在，1 存在
       if (params.cartItems.length > 0) {
         params.cartItems.forEach(function (item) {
+          var _params$extraData;
           if (!item._origin.duration) {
             var _generateDuration = generateDuration(item),
               duration = _generateDuration.duration,
@@ -5448,6 +5472,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           var discountList = getAllDiscountList(item);
           item._origin.product.discount_list = discountList;
 
+          // 为预约补齐 holder 信息
+          if (params !== null && params !== void 0 && (_params$extraData = params.extraData) !== null && _params$extraData !== void 0 && _params$extraData.is_add_holder_info) {
+            ensureCartItemOriginHolder(item, _this32.window);
+          }
+
           // 购物车是否为普通商品
           if (isNormalProduct(item._origin)) {
             var _order$relation_forms;
@@ -6105,7 +6134,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this32 = this;
+      var _this33 = this;
       var runtimeRaw = this.withoutSyntheticDraftOrderIdForRuntime(raw);
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), runtimeRaw || {});
       // ES 列表详情使用 id 表示订单主键；OS 详情态统一依赖 order_id 驱动操作按钮。
@@ -6129,12 +6158,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this32.normalizeHydratedOrderProduct(p, {
+        return _this33.normalizeHydratedOrderProduct(p, {
           makeEditMark: options === null || options === void 0 ? void 0 : options.makeEditMark
         });
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
-        var booking = _this32.normalizeHydratedBookingHolder(b || {});
+        var booking = _this33.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -6321,7 +6350,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product, options) {
-      var _this33 = this;
+      var _this34 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -6329,7 +6358,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var productSku = ensureProductSku(row);
       row.product_sku = _objectSpread(_objectSpread({}, productSku), {}, {
         option: normalizeProductSkuOptions(productSku.option.map(function (optionItem) {
-          return _this33.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this34.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];

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

@@ -414,6 +414,7 @@ export interface CommitOrderParams {
         type: 'virtual' | 'appointment_booking';
         platform?: string;
         extraData?: Record<string, any>;
+        business_code?: string;
     };
 }
 export interface OrderSubmitBooking {
@@ -589,6 +590,12 @@ export interface SyncPaymentsToOrderParams {
     payments: OrderPaymentSource[];
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
+    /**
+     * Whether the checkout should be queued as the local `sync_sales` task.
+     * Defaults to true to preserve the WebPOS retry path. Set to false when
+     * the caller must wait for the cloud checkout response before proceeding.
+     */
+    checkoutSyncTaskEnabled?: boolean;
     smallTicketDataFlag?: number;
     businessCode?: string;
     channel?: string;
@@ -751,6 +758,8 @@ export interface OrderModuleAPI {
     setEnableTempOrderPersist: (enabled: boolean) => void;
     /** 是否允许 saveDraft 写入 IndexedDB 草稿。 */
     isTempOrderPersistEnabled: () => boolean;
+    /** 提交 tempOrder 变更并触发 `{moduleName}:changed` 事件 */
+    notifyTempOrderChanged: () => void;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;

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

@@ -15,6 +15,7 @@ export interface OrderProductsDepositSummary {
     deposit_policy_ids: number[];
     hasDeposit: boolean;
 }
+import type { WindowPlugin } from '../../plugins';
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -177,6 +178,15 @@ export declare const mergeRelationForms: (relationForms: {
     form_id: number;
     form_record_ids: number[];
 }[];
+export interface CartOrderHolder {
+    customer_id?: number;
+    form_id: number | string;
+    form_record: (number | string)[] | null;
+}
+/**
+ * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
+ */
+export declare function ensureCartItemOriginHolder(cartItem: CartItem, window?: WindowPlugin): void;
 export declare const getAllDiscountList: (cartItem: CartItem) => any;
 export { createUuidV4 };
 export declare function isTempOrder(data: any): data is OrderTempOrder;

package/dist/modules/Order/utils.js

@@ -20,6 +20,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import dayjs from "dayjs";
 import Decimal from 'decimal.js';
+import { getProductHolderConfig } from "../Holder/utils";
 import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
 import { createUuidV4 } from "./utils/orderCollectionIdentity";
 /**
@@ -744,10 +745,41 @@ export var mergeRelationForms = function mergeRelationForms(relationForms) {
     return item.form_record_ids.length > 0;
   }); // 过滤掉没有有效记录的表单
 };
+function getCustomerIdFromStorage(window) {
+  try {
+    var _window$getLocalStora;
+    var customer = JSON.parse((window === null || window === void 0 || (_window$getLocalStora = window.getLocalStorage) === null || _window$getLocalStora === void 0 ? void 0 : _window$getLocalStora.call(window, 'customer')) || '{}');
+    var customerId = Number(customer === null || customer === void 0 ? void 0 : customer.id);
+    return Number.isFinite(customerId) && customerId > 0 ? customerId : undefined;
+  } catch (_unused) {
+    return undefined;
+  }
+}
+
+/**
+ * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
+ */
+export function ensureCartItemOriginHolder(cartItem, window) {
+  var _cartItem$_origin, _cartItem$_productIni;
+  if (cartItem !== null && cartItem !== void 0 && (_cartItem$_origin = cartItem._origin) !== null && _cartItem$_origin !== void 0 && _cartItem$_origin.holder) {
+    return;
+  }
+  var holderConfig = getProductHolderConfig((_cartItem$_productIni = cartItem === null || cartItem === void 0 ? void 0 : cartItem._productInit) !== null && _cartItem$_productIni !== void 0 ? _cartItem$_productIni : cartItem === null || cartItem === void 0 ? void 0 : cartItem._productOrigin);
+  var formRecordId = cartItem === null || cartItem === void 0 ? void 0 : cartItem.holder_id;
+  if (!(holderConfig !== null && holderConfig !== void 0 && holderConfig.resource_id) || formRecordId == null) {
+    return;
+  }
+  cartItem._origin.holder = {
+    customer_id: getCustomerIdFromStorage(window),
+    form_id: holderConfig.resource_id,
+    form_record: [formRecordId]
+  };
+}
+;
 export var getAllDiscountList = function getAllDiscountList(cartItem) {
-  var _cartItem$_origin, _cartItem$_origin2;
-  var discountList = (cartItem === null || cartItem === void 0 || (_cartItem$_origin = cartItem._origin) === null || _cartItem$_origin === void 0 || (_cartItem$_origin = _cartItem$_origin.product) === null || _cartItem$_origin === void 0 ? void 0 : _cartItem$_origin.discount_list) || [];
-  ((cartItem === null || cartItem === void 0 || (_cartItem$_origin2 = cartItem._origin) === null || _cartItem$_origin2 === void 0 || (_cartItem$_origin2 = _cartItem$_origin2.product) === null || _cartItem$_origin2 === void 0 ? void 0 : _cartItem$_origin2.product_bundle) || []).forEach(function (item) {
+  var _cartItem$_origin2, _cartItem$_origin3;
+  var discountList = (cartItem === null || cartItem === void 0 || (_cartItem$_origin2 = cartItem._origin) === null || _cartItem$_origin2 === void 0 || (_cartItem$_origin2 = _cartItem$_origin2.product) === null || _cartItem$_origin2 === void 0 ? void 0 : _cartItem$_origin2.discount_list) || [];
+  ((cartItem === null || cartItem === void 0 || (_cartItem$_origin3 = cartItem._origin) === null || _cartItem$_origin3 === void 0 || (_cartItem$_origin3 = _cartItem$_origin3.product) === null || _cartItem$_origin3 === void 0 ? void 0 : _cartItem$_origin3.product_bundle) || []).forEach(function (item) {
     discountList = [].concat(_toConsumableArray(discountList), _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
     item.discount_list = undefined;
   });

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

@@ -193,6 +193,7 @@ export interface ProductData {
         status?: string;
         required?: number | string | boolean;
         resource_id?: number | string | null;
+        [key: string]: any;
     };
     /** 组合商品id，动态附加 */
     product_variant_id?: number;

package/dist/modules/ProductList/index.js

@@ -157,6 +157,10 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           userPlugin,
           customer_id,
           _userPlugin$get,
+          channelMap,
+          rawApplicationCode,
+          mappedApplicationCode,
+          queryPayload,
           productsData,
           sortedList,
           _args4 = arguments;
@@ -185,37 +189,52 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 console.error(error);
               }
               // 如果没传schedule_date，则从
-              _context4.next = 7;
-              return this.request.post("/product/query", {
+              channelMap = {
+                online_store: 'online-store',
+                scan_to_order: 'online-store',
+                'scan-to-order': 'online-store',
+                scan_to_order_2: 'mobile_order',
+                scan_to_order_3: 'scantoorder3'
+              };
+              rawApplicationCode = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel;
+              mappedApplicationCode = typeof rawApplicationCode === 'string' ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
+              queryPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 open_quotation: 1,
                 open_bundle: 0,
                 exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item'],
-                with: ['category', 'collection', 'resourceRelation'],
+                with: ['category', 'collection', 'resourceRelation', 'bundleGroup.bundleItem', 'optionGroup.optionItem', 'variantGroup.variantItem', 'dataVariants'],
                 status: status,
                 num: 500,
                 skip: 1,
-                customer_id: customer_id,
-                category_ids: category_ids,
-                ids: product_ids,
-                collection: collection,
-                front_end_cache_id: cacheId,
-                menu_list_ids: menu_list_ids,
+                customer_id: customer_id
+              }, Array.isArray(category_ids) && category_ids.length ? {
+                category_ids: category_ids
+              } : {}), Array.isArray(product_ids) && product_ids.length ? {
+                ids: product_ids
+              } : {}), Array.isArray(collection) && collection.length ? {
+                collection: collection
+              } : {}), {}, {
+                front_end_cache_id: cacheId
+              }, Array.isArray(menu_list_ids) && menu_list_ids.length ? {
+                menu_list_ids: menu_list_ids
+              } : {}), {}, {
                 with_count: with_count,
                 // client_schedule_ids: schedule_ids,
                 schedule_date: schedule_date,
-                application_code: (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel,
+                application_code: mappedApplicationCode,
                 is_eject: 1,
                 with_schedule: with_schedule,
                 schedule_datetime: schedule_datetime,
-                extension_type: extension_type,
-                strategy_context: strategy_context
-              }, {
+                extension_type: extension_type
+              });
+              _context4.next = 11;
+              return this.request.post("/product/query", queryPayload, {
                 osServer: true,
                 callback: options === null || options === void 0 ? void 0 : options.callback,
                 subscriberId: options === null || options === void 0 ? void 0 : options.subscriberId,
                 customToast: function customToast() {}
               });
-            case 7:
+            case 11:
               productsData = _context4.sent;
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
@@ -228,7 +247,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               // }
               this.addProduct(sortedList);
               return _context4.abrupt("return", sortedList);
-            case 11:
+            case 15:
             case "end":
               return _context4.stop();
           }

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

@@ -21,7 +21,7 @@ export declare class QuotationModule extends BaseModule implements Module {
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
      *
-     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/dist/modules/Quotation/index.js

@@ -90,7 +90,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               res = _context2.sent;
               list = (res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [];
               list.sort(function (a, b) {
-                return a.sort - b.sort;
+                return b.sort - a.sort;
               });
               this.store.list = list;
             case 9:
@@ -151,7 +151,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
      *
-     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */