@pisell/pisellos 2.2.277 → 2.2.279

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;
   });
@@ -878,7 +910,7 @@ function formatSubmitBundleItems(bundle) {
  * 本函数不再改造价格字段形状，仅做字段/metadata 裁剪。
  */
 function normalizeSubmitProduct(product) {
-  var _rawMetadata$product_, _submitProduct$produc, _submitProduct$paymen;
+  var _ref29, _submitProduct$bundle, _rawMetadata$product_, _submitProduct$produc, _submitProduct$paymen;
   var _ref28 = product,
     _runtimeUid = _ref28.unique_identification_number,
     submitProduct = _objectWithoutProperties(_ref28, _excluded2);
@@ -893,6 +925,10 @@ function normalizeSubmitProduct(product) {
   delete productRest["product_".concat('option', "_item")];
   var rawMetadata = submitProduct.metadata || {};
   var bookingUid = rawMetadata.booking_uid;
+  // 兼容历史 BigSale 编辑链路：bundle_edit 曾被写入 metadata，
+  // 出站时需提升到商品顶层；套餐未编辑时也必须显式提交 0。
+  var hasProductBundle = Array.isArray(submitProduct.product_bundle) && submitProduct.product_bundle.length > 0;
+  var bundleEdit = (_ref29 = (_submitProduct$bundle = submitProduct.bundle_edit) !== null && _submitProduct$bundle !== void 0 ? _submitProduct$bundle : rawMetadata.bundle_edit) !== null && _ref29 !== void 0 ? _ref29 : hasProductBundle ? 0 : undefined;
   var cleanMetadata = {};
   if (rawMetadata.unique_identification_number) {
     cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
@@ -917,8 +953,10 @@ 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({}, productRest), bookingUid ? {
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, productRest), bookingUid ? {
     booking_uid: bookingUid
+  } : {}), bundleEdit !== undefined ? {
+    bundle_edit: bundleEdit
   } : {}), {}, {
     product_quantity: toBundleNumber(num !== null && num !== void 0 ? num : submitProduct.product_quantity, 1),
     product_sku: productSku,
@@ -1048,7 +1086,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  var _tempOrder$customer_i, _tempOrder$country_ca, _tempOrder$phone, _tempOrder$email, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref30, _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, _enhancedPayload$summ;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -1061,26 +1099,26 @@ export function buildSubmitPayload(params) {
     enhance = params.enhance;
   var scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   var bookingUuid = createUuidV4();
-  var _ref29 = tempOrder,
-    _extend = _ref29._extend,
-    _relationId = _ref29.relation_id,
-    _tableFormId = _ref29.table_form_id,
-    _resourceId = _ref29.resource_id,
-    _summary = _ref29.summary,
-    _lastOrderInfo = _ref29.lastOrderInfo,
-    _paidAmount = _ref29.paid_amount,
-    _shopId = _ref29.shop_id,
-    _shopNote = _ref29.shop_note,
-    _shopServiceType = _ref29.shop_service_type,
-    _startTime = _ref29.start_time,
-    _customer = _ref29.customer,
-    _discountList = _ref29.discount_list,
-    _rootTaxFee = _ref29.tax_fee,
-    _totalAmount = _ref29.total_amount,
-    _totalRefundAmount = _ref29.total_refund_amount,
-    _createDate = _ref29.create_date,
-    _holderId = _ref29.holder_id,
-    tempOrderRest = _objectWithoutProperties(_ref29, _excluded4);
+  var _ref30 = tempOrder,
+    _extend = _ref30._extend,
+    _relationId = _ref30.relation_id,
+    _tableFormId = _ref30.table_form_id,
+    _resourceId = _ref30.resource_id,
+    _summary = _ref30.summary,
+    _lastOrderInfo = _ref30.lastOrderInfo,
+    _paidAmount = _ref30.paid_amount,
+    _shopId = _ref30.shop_id,
+    _shopNote = _ref30.shop_note,
+    _shopServiceType = _ref30.shop_service_type,
+    _startTime = _ref30.start_time,
+    _customer = _ref30.customer,
+    _discountList = _ref30.discount_list,
+    _rootTaxFee = _ref30.tax_fee,
+    _totalAmount = _ref30.total_amount,
+    _totalRefundAmount = _ref30.total_refund_amount,
+    _createDate = _ref30.create_date,
+    _holderId = _ref30.holder_id,
+    tempOrderRest = _objectWithoutProperties(_ref30, _excluded4);
   var submitType = type !== null && type !== void 0 ? type : tempOrder.type;
   if (!submitType) {
     var _tempOrder$bookings;
@@ -1105,7 +1143,7 @@ export function buildSubmitPayload(params) {
     type: submitType,
     business_code: businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code,
     sales_channel: tempOrder.sales_channel || 'my_pisel',
-    order_sales_channel: (_ref30 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref30 !== void 0 ? _ref30 : 'online_store',
+    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',
     payment_status: tempOrder.payment_status || 'payment_processing',
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
@@ -1131,10 +1169,10 @@ export function buildSubmitPayload(params) {
     // holder: tempOrder.holder || null,
     summary: summary || tempOrder.summary || createEmptySummary(),
     metadata: function () {
-      var _ref31 = tempOrder.metadata || {},
-        _collectPax = _ref31.collect_pax,
-        _tableOccupancyDuration = _ref31.table_occupancy_duration,
-        rest = _objectWithoutProperties(_ref31, _excluded5);
+      var _ref32 = tempOrder.metadata || {},
+        _collectPax = _ref32.collect_pax,
+        _tableOccupancyDuration = _ref32.table_occupancy_duration,
+        rest = _objectWithoutProperties(_ref32, _excluded5);
       return _objectSpread({}, rest);
     }(),
     products: (tempOrder.products || []).map(function (product) {
@@ -1342,8 +1380,8 @@ export function getRuntimeProductOrigin(tempOrder, product) {
     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 _ref33, _item$product_id, _ref34, _product$product_id;
+    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;
@@ -1363,7 +1401,6 @@ export function productRequiresFormSubject(tempOrder, product) {
 }
 export function resolveIsFormSubject(tempOrder, product) {
   var _tempOrder$holder;
-  debugger;
   // 旧版预约维度的 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);

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

@@ -41,6 +41,10 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    /**
+     * 获取标准化后的宿主平台标识，供支付子能力做平台边界判断。
+     */
+    getPlatform(): string;
     private getPaymentNumberAppData;
     /**
      * 记录信息日志

package/dist/modules/Payment/index.js

@@ -231,6 +231,16 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     value: function updateOtherParams(params) {
       this.otherParams = params || {};
     }
+
+    /**
+     * 获取标准化后的宿主平台标识，供支付子能力做平台边界判断。
+     */
+  }, {
+    key: "getPlatform",
+    value: function getPlatform() {
+      var _this$otherParams;
+      return String(((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.platform) || '').trim().toLowerCase();
+    }
   }, {
     key: "getPaymentNumberAppData",
     value: function getPaymentNumberAppData(key) {
@@ -247,10 +257,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "logInfo",
     value: function logInfo(title, metadata) {
-      var _this$otherParams;
-      if ((_this$otherParams = this.otherParams) !== null && _this$otherParams !== void 0 && _this$otherParams.fatherModule) {
-        var _this$otherParams2;
-        var fatherModule = this.core.getModule((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.fatherModule);
+      var _this$otherParams2;
+      if ((_this$otherParams2 = this.otherParams) !== null && _this$otherParams2 !== void 0 && _this$otherParams2.fatherModule) {
+        var _this$otherParams3;
+        var fatherModule = this.core.getModule((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.fatherModule);
         if (fatherModule) {
           fatherModule.logInfo("".concat(title), metadata);
           return;

package/dist/modules/Payment/walletpass.js

@@ -5,15 +5,15 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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; }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -104,6 +104,26 @@ function mergeWalletAssets() {
   });
   return merged;
 }
+
+/**
+ * 聚合接口不保证 recalculate_list 顺序；派生抵扣额依赖选择顺序，
+ * 因此已选资产必须先恢复为 selectedIds 的顺序再进入策略计算。
+ */
+function orderWalletAssetsByIds(assets, orderedIds) {
+  var assetByKey = new Map(assets.map(function (asset) {
+    return [getWalletAssetKey(asset), asset];
+  }));
+  var orderedKeys = new Set(orderedIds.map(function (id) {
+    return String(id);
+  }));
+  return [].concat(_toConsumableArray(orderedIds.map(function (id) {
+    return assetByKey.get(String(id));
+  }).filter(function (asset) {
+    return asset !== undefined;
+  })), _toConsumableArray(assets.filter(function (asset) {
+    return !orderedKeys.has(getWalletAssetKey(asset));
+  })));
+}
 function createInitialWalletAssetsState() {
   return {
     status: 'idle',
@@ -668,7 +688,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     value: (function () {
       var _aggregateRecalculateWalletAssetsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(businessData, selectedIds) {
         var _this$paymentModule$w7, _this$paymentModule$w8;
-        var walletParams, customerId, requestParams, response, responseData, hasAggregateLists, recalculateList, customerWalletPassList, allList, walletPassEvaluator, evaluated, returnedSelectedKeys, authoritativeSelectedIds;
+        var walletParams, customerId, requestParams, response, responseData, hasAggregateLists, recalculateList, customerWalletPassList, orderedRecalculateList, allList, walletPassEvaluator, evaluated, returnedSelectedKeys, authoritativeSelectedIds;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -704,7 +724,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
             case 11:
               recalculateList = Array.isArray(responseData === null || responseData === void 0 ? void 0 : responseData.recalculate_list) ? responseData.recalculate_list : [];
               customerWalletPassList = Array.isArray(responseData === null || responseData === void 0 ? void 0 : responseData.customer_wallet_pass_list) ? responseData.customer_wallet_pass_list : [];
-              allList = mergeWalletAssets(recalculateList, customerWalletPassList);
+              orderedRecalculateList = orderWalletAssetsByIds(recalculateList, selectedIds);
+              allList = mergeWalletAssets(orderedRecalculateList, customerWalletPassList);
               walletPassEvaluator = (_this$paymentModule$w7 = this.paymentModule.window) === null || _this$paymentModule$w7 === void 0 || (_this$paymentModule$w8 = _this$paymentModule$w7.getWalletPassEvaluator) === null || _this$paymentModule$w8 === void 0 ? void 0 : _this$paymentModule$w8.call(_this$paymentModule$w7);
               evaluated = walletPassEvaluator !== null && walletPassEvaluator !== void 0 && walletPassEvaluator.getRecommendedVouchers ? walletPassEvaluator.getRecommendedVouchers({
                 orderTotalAmount: walletParams.order_wait_pay_amount,
@@ -748,7 +769,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 products: walletParams.products || [],
                 authoritativeSelectedIds: authoritativeSelectedIds
               });
-            case 24:
+            case 25:
             case "end":
               return _context4.stop();
           }
@@ -830,7 +851,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "getUserIdentificationCodeListAsync",
     value: function () {
       var _getUserIdentificationCodeListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
-        var _newParams$products, _newParams$prepare_pa, _this$walletParams4, newParams, response, sortedData;
+        var _newParams$products, _newParams$prepare_pa, _this$walletParams4, newParams, platform, response, sortedData;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -843,6 +864,20 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               this.paymentModule.logInfo('[WalletPass] 商品列表为空，跳过获取用户识别码列表');
               return _context6.abrupt("return", []);
             case 5:
+              platform = this.paymentModule.getPlatform();
+              if (!(platform === 'pc' || platform === 'h5')) {
+                _context6.next = 11;
+                break;
+              }
+              this.userIdentificationCodes = [];
+              this.emitEvent(WalletPassHooks.OnUserIdentificationCodesUpdated, {
+                userIdentificationCodes: []
+              });
+              this.paymentModule.logInfo('[WalletPass] 用户端平台跳过获取用户识别码列表', {
+                platform: platform
+              });
+              return _context6.abrupt("return", []);
+            case 11:
               if (typeof newParams.payment_order_id === 'string' && newParams.payment_order_id.startsWith('LOCAL_')) {
                 newParams.payment_order_id = undefined;
               }
@@ -853,9 +888,9 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
                 payment_order_id: (_this$walletParams4 = this.walletParams) === null || _this$walletParams4 === void 0 ? void 0 : _this$walletParams4.payment_order_id
               });
-              _context6.next = 9;
+              _context6.next = 15;
               return this.paymentModule.request.post('/machinecode/prepare/deduction', newParams);
-            case 9:
+            case 15:
               response = _context6.sent;
               // 对获取到的数据进行排序，将错误码为 500100、500200、500300 的项目排到最后
               sortedData = sortUserIdentificationCodeList((response === null || response === void 0 ? void 0 : response.data) || []);
@@ -876,19 +911,19 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 })
               });
               return _context6.abrupt("return", this.userIdentificationCodes);
-            case 17:
-              _context6.prev = 17;
+            case 23:
+              _context6.prev = 23;
               _context6.t0 = _context6["catch"](0);
               this.paymentModule.logError('[WalletPass] 获取用户识别码列表失败', _context6.t0, {
                 customer_id: params.customer_id,
                 available: params.available
               });
               return _context6.abrupt("return", []);
-            case 21:
+            case 27:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[0, 17]]);
+        }, _callee6, this, [[0, 23]]);
       }));
       function getUserIdentificationCodeListAsync(_x7) {
         return _getUserIdentificationCodeListAsync.apply(this, arguments);

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,53 @@ 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
-              }, {
+              });
+              _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 +248,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.
      */

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

@@ -0,0 +1,24 @@
+import { BaseModule } from '../BaseModule';
+import type { Module, ModuleOptions, PisellCore } from '../../types';
+import type { ResourcePlannerAssignmentResult, ResourcePlannerAssignableSlotResult, ResourcePlannerContextInput, ResourcePlannerProjection, ResourcePlannerQuery, ResourcePlannerSelectionPatch, ResourcePlannerSnapshot, ResourcePlannerValidationResult } from './types';
+export * from './types';
+export * from './planner';
+export declare enum ResourcePlannerHooks {
+    onContextChanged = "resourcePlanner:onContextChanged",
+    onSelectionChanged = "resourcePlanner:onSelectionChanged",
+    onProjectionChanged = "resourcePlanner:onProjectionChanged"
+}
+export declare class ResourcePlannerModule extends BaseModule implements Module {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private store;
+    initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    setContext(input: ResourcePlannerContextInput): ResourcePlannerSnapshot;
+    mergeContext(input: ResourcePlannerContextInput): ResourcePlannerSnapshot;
+    setSelectionPatch(patch: ResourcePlannerSelectionPatch): ResourcePlannerSnapshot;
+    queryAvailability(query?: ResourcePlannerQuery): ResourcePlannerProjection;
+    autoAssign(query?: ResourcePlannerQuery): ResourcePlannerAssignmentResult;
+    resolveAssignableSlots(query?: ResourcePlannerQuery): ResourcePlannerAssignableSlotResult;
+    validateSelection(): ResourcePlannerValidationResult;
+    getSnapshot(): ResourcePlannerSnapshot;
+}