@pisell/pisellos 2.2.167 → 2.2.169

package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -1,16 +1,17 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 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 dayjs from 'dayjs';
+import { resolveManualDiscountMessage } from "../../Order/utils/manualProductDiscount";
 function safeFormat(value, fmt) {
   if (value === undefined || value === null) return undefined;
   var d = dayjs(value);
@@ -52,16 +53,37 @@ function unflattenResourceMap(resources) {
   });
   return map;
 }
-function buildCapacityFromBooking(resources) {
-  if (!Array.isArray(resources)) return [];
-  return resources.filter(function (r) {
-    return (r === null || r === void 0 ? void 0 : r.relation_id) !== undefined && (r === null || r === void 0 ? void 0 : r.relation_id) !== null && r.capacity !== undefined;
-  }).map(function (r) {
-    return {
-      id: r.relation_id,
-      value: Number(r.capacity || 0)
-    };
-  });
+
+/**
+ * 从 booking.metadata.capacity 还原 `_extend.capacity`（与 info2 ticketBooking getCapacity 对齐）。
+ * 勿用 resources[].relation_id 反推人数维度 id。
+ */
+function resolveCapacityFromBooking(booking) {
+  var _booking$metadata;
+  var metaCap = (_booking$metadata = booking.metadata) === null || _booking$metadata === void 0 ? void 0 : _booking$metadata.capacity;
+  if (Array.isArray(metaCap) && metaCap.length > 0) {
+    return metaCap.map(function (item) {
+      var _item$value;
+      if (!item || _typeof(item) !== 'object') return null;
+      if (item.id === undefined || item.id === null) return null;
+      var row = {
+        id: item.id,
+        value: Number((_item$value = item.value) !== null && _item$value !== void 0 ? _item$value : 0)
+      };
+      if (item.name !== undefined) row.name = item.name;
+      return row;
+    }).filter(function (item) {
+      return item != null;
+    });
+  }
+  if (typeof metaCap === 'number' && Number.isFinite(metaCap)) {
+    return [{
+      id: 0,
+      value: metaCap,
+      name: ''
+    }];
+  }
+  return [];
 }
 function resolveDurationForExtend(booking) {
   var duration = booking.duration;
@@ -81,7 +103,7 @@ function resolveDurationForExtend(booking) {
  * 调用方须传入与该行关联的 booking（通常 bookings[].product_uid === product.metadata.unique_identification_number）。
  */
 export function buildCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata, _product$product_vari, _product$num, _ref, _ref2, _title, _booking$product, _booking$detail, _ref3, _product$note, _booking$detail2, _ref4, _extension_type, _booking$product2, _title2, _booking$product3, _price, _product$order_detail, _ref5, _booking$id;
+  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$product_vari, _product$num, _ref, _ref2, _title, _booking$product, _booking$detail, _ref3, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref4, _extension_type, _booking$product2, _title2, _booking$product3, _price, _product$order_detail, _ref5, _booking$id;
   var product = input.product,
     booking = input.booking,
     sourceProduct = input.sourceProduct;
@@ -93,8 +115,8 @@ export function buildCacheItemFromOrderLine(input) {
   var startTime = normalizeTimeString(booking.start_time);
   var endTime = normalizeTimeString(booking.end_time);
   var resource = unflattenResourceMap(booking.resources);
-  var capacity = buildCapacityFromBooking(booking.resources);
-  var holderId = (_booking$metadata$hol = (_booking$metadata = booking.metadata) === null || _booking$metadata === void 0 ? void 0 : _booking$metadata.holder_id) !== null && _booking$metadata$hol !== void 0 ? _booking$metadata$hol : booking.holder_id;
+  var capacity = resolveCapacityFromBooking(booking);
+  var holderId = (_booking$metadata$hol = (_booking$metadata2 = booking.metadata) === null || _booking$metadata2 === void 0 ? void 0 : _booking$metadata2.holder_id) !== null && _booking$metadata$hol !== void 0 ? _booking$metadata$hol : booking.holder_id;
   var other = {
     product_variant_id: (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : 0,
     option: Array.isArray(product.product_option_item) ? _toConsumableArray(product.product_option_item) : [],
@@ -119,8 +141,22 @@ export function buildCacheItemFromOrderLine(input) {
     capacity: capacity,
     holder_id: holderId,
     other: other,
-    like_status: booking.like_status || 'common'
+    like_status: booking.like_status || 'common',
+    discount_reason: resolveManualDiscountMessage(product.discount_list, (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.product_discount_reason) || undefined
   };
+  var manualDiscount = (product.discount_list || []).find(function (d) {
+    return (d === null || d === void 0 ? void 0 : d.type) === 'product';
+  });
+  if (manualDiscount && extend.origin_total === selling) {
+    var _manualDiscount$amoun;
+    var manualAmount = Number((_manualDiscount$amoun = manualDiscount.amount) !== null && _manualDiscount$amoun !== void 0 ? _manualDiscount$amoun : 0);
+    if (Number.isFinite(manualAmount) && manualAmount > 0) {
+      extend.origin_total = selling + manualAmount;
+    }
+  }
+  if (((_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.price_override) != null || manualDiscount) {
+    extend.priceOverride = selling;
+  }
   if (booking.holder !== undefined) {
     extend.holder = booking.holder;
   }

package/dist/modules/BookingContext/utils/cacheItemToBookingInput.d.ts

@@ -50,11 +50,21 @@ export interface BookingResourceInput {
     metadata?: Record<string, any>;
     children?: any[];
 }
+/** custom / package 人数维度快照，与 info2 `_extend.capacity` / `metadata.capacity` 对齐。 */
+export interface BookingCapacityMetadataItem {
+    id: string | number;
+    value: number;
+    name?: Record<string, any> | string;
+}
 export interface BookingMetadataInput {
     /** 由 OS createLinkedProductAndBooking 统一改写，这里不生成。 */
     unique_identification_number?: string;
     collect_pax?: number;
-    capacity?: number;
+    /**
+     * 资源容量快照：custom 多维度时为 `{ id, value, name? }[]`；
+     * 仅总和场景可为 number（capacity_snapshot 兼容）。
+     */
+    capacity?: number | BookingCapacityMetadataItem[];
     /** 协议要求始终提交（即使为 null）。 */
     holder_id: any;
     resource_select_type?: 'single' | 'multiple' | string;

package/dist/modules/BookingContext/utils/cacheItemToBookingInput.js

@@ -1,9 +1,9 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 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); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import dayjs from 'dayjs';
 import { isMultiDayProduct, isSessionProduct, getDays } from "./serviceTimes";
 import { getSumCapacity } from "./resources";
@@ -28,6 +28,26 @@ import { flexibleObj } from "./flexible";
  * 由 UI 在 `cart.confirmDetail` 之外通过辅助 API 处理。
  */
 
+/** custom / package 人数维度快照，与 info2 `_extend.capacity` / `metadata.capacity` 对齐。 */
+
+/** 将 UI `_extend.capacity[]` 规范化为 booking.metadata.capacity。 */
+function normalizeExtendCapacityForMetadata(capacity) {
+  if (!Array.isArray(capacity) || capacity.length === 0) return undefined;
+  var normalized = capacity.map(function (item) {
+    var _item$value;
+    if (!item || _typeof(item) !== 'object') return null;
+    if (item.id === undefined || item.id === null) return null;
+    var row = {
+      id: item.id,
+      value: Number((_item$value = item.value) !== null && _item$value !== void 0 ? _item$value : 0)
+    };
+    if (item.name !== undefined) row.name = item.name;
+    return row;
+  }).filter(function (item) {
+    return item != null;
+  });
+  return normalized.length > 0 ? normalized : undefined;
+}
 function safeFormat(value, fmt) {
   if (value === undefined || value === null) return undefined;
   var d = dayjs(value);
@@ -174,7 +194,11 @@ export function cacheItemToBookingInput(cacheItem, options) {
     metadata.holder_id = ext.holder_id;
   }
   if (ext.collect_pax !== undefined) metadata.collect_pax = ext.collect_pax;
-  if (ext.capacity_snapshot !== undefined) {
+  // 与 info2 formatMetaData 一致：优先写入完整人数维度数组，供编辑回显 / 详情回灌。
+  var extendCapacity = normalizeExtendCapacityForMetadata(ext.capacity);
+  if (extendCapacity) {
+    metadata.capacity = extendCapacity;
+  } else if (ext.capacity_snapshot !== undefined) {
     metadata.capacity = ext.capacity_snapshot;
   }
   var selectType = deriveResourceSelectType(cacheItem) || (options === null || options === void 0 || (_options$bookingConfi = options.bookingConfig) === null || _options$bookingConfi === void 0 ? void 0 : _options$bookingConfi.resource_select_type);

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

@@ -24,6 +24,12 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
      * @param operation 操作名称
      */
     private handleCustomerListError;
+    /**
+     * 查询客户列表但不写入 customerList / pagination 状态。
+     *
+     * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
+     */
+    queryCustomerList(params?: ShopGetCustomerListParams): Promise<ICustomerListResponse>;
     /**
      * 获取客户列表
      * @param params 查询参数

package/dist/modules/Customer/index.js

@@ -95,7 +95,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               } else {
                 this.store.currentPage = 1;
               }
-              if (typeof (options === null || options === void 0 || (_options$initialState5 = options.initialState) === null || _options$initialState5 === void 0 ? void 0 : _options$initialState5.pageSize) === 'number') {
+              if (typeof (options === null || options === void 0 || (_options$initialState5 = options.initialState) === null || _options$initialState5 === void 0 ? void 0 : _options$initialState5.pageSize) === 'number' && options.initialState.pageSize > 1) {
                 this.store.pageSize = options.initialState.pageSize;
               } else {
                 this.store.pageSize = DEFAULT_PAGE_SIZE;
@@ -236,6 +236,52 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
       }
       return handleCustomerListError;
     }()
+    /**
+     * 查询客户列表但不写入 customerList / pagination 状态。
+     *
+     * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
+     */
+    )
+  }, {
+    key: "queryCustomerList",
+    value: (function () {
+      var _queryCustomerList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var params,
+          _yield$this$fetchCust,
+          customerList,
+          total,
+          page,
+          pageSize,
+          _args4 = arguments;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              params = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
+              _context4.next = 3;
+              return this.fetchCustomerListData(params);
+            case 3:
+              _yield$this$fetchCust = _context4.sent;
+              customerList = _yield$this$fetchCust.customerList;
+              total = _yield$this$fetchCust.total;
+              page = _yield$this$fetchCust.page;
+              pageSize = _yield$this$fetchCust.pageSize;
+              return _context4.abrupt("return", {
+                list: customerList,
+                total: total,
+                page: page,
+                pageSize: pageSize
+              });
+            case 9:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function queryCustomerList() {
+        return _queryCustomerList.apply(this, arguments);
+      }
+      return queryCustomerList;
+    }()
     /**
      * 获取客户列表
      * @param params 查询参数
@@ -245,9 +291,9 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getCustomerList",
     value: (function () {
-      var _getCustomerList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _getCustomerList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var params,
-          _yield$this$fetchCust,
+          _yield$this$fetchCust2,
           customerList,
           total,
           page,
@@ -256,22 +302,22 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
           num,
           searchParams,
           response,
-          _args4 = arguments;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+          _args5 = arguments;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              params = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
-              _context4.prev = 1;
+              params = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {};
+              _context5.prev = 1;
               this.store.loading = true;
               this.store.error = null;
-              _context4.next = 6;
+              _context5.next = 6;
               return this.fetchCustomerListData(params);
             case 6:
-              _yield$this$fetchCust = _context4.sent;
-              customerList = _yield$this$fetchCust.customerList;
-              total = _yield$this$fetchCust.total;
-              page = _yield$this$fetchCust.page;
-              pageSize = _yield$this$fetchCust.pageSize;
+              _yield$this$fetchCust2 = _context5.sent;
+              customerList = _yield$this$fetchCust2.customerList;
+              total = _yield$this$fetchCust2.total;
+              page = _yield$this$fetchCust2.page;
+              pageSize = _yield$this$fetchCust2.pageSize;
               // 保存搜索条件（排除skip和num）
               skip = params.skip, num = params.num, searchParams = _objectWithoutProperties(params, _excluded2);
               this.store.searchParams = cloneDeep(searchParams);
@@ -300,27 +346,27 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 page: page,
                 pageSize: pageSize
               };
-              return _context4.abrupt("return", response);
+              return _context5.abrupt("return", response);
             case 23:
-              _context4.prev = 23;
-              _context4.t0 = _context4["catch"](1);
-              _context4.next = 27;
-              return this.handleCustomerListError(_context4.t0, 'fetch customer list');
+              _context5.prev = 23;
+              _context5.t0 = _context5["catch"](1);
+              _context5.next = 27;
+              return this.handleCustomerListError(_context5.t0, 'fetch customer list');
             case 27:
-              throw _context4.t0;
+              throw _context5.t0;
             case 28:
-              _context4.prev = 28;
+              _context5.prev = 28;
               this.store.loading = false;
               this.storeChange();
-              _context4.next = 33;
+              _context5.next = 33;
               return this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), this.store);
             case 33:
-              return _context4.finish(28);
+              return _context5.finish(28);
             case 34:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this, [[1, 23, 28, 34]]);
+        }, _callee5, this, [[1, 23, 28, 34]]);
       }));
       function getCustomerList() {
         return _getCustomerList.apply(this, arguments);
@@ -494,10 +540,10 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "changeCustomerPage",
     value: (function () {
-      var _changeCustomerPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(page, pageSize) {
+      var _changeCustomerPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(page, pageSize) {
         var targetPageSize, skip, num;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               targetPageSize = pageSize || this.store.pageSize; // 先更新分页状态
               this.setPaginationInfo(page, targetPageSize);
@@ -505,18 +551,18 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               // skip直接使用page，num使用pageSize
               skip = page;
               num = targetPageSize; // 自动调用获取客户列表，使用存储的搜索条件
-              _context5.next = 6;
+              _context6.next = 6;
               return this.getCustomerList(_objectSpread({
                 skip: skip,
                 num: num
               }, this.store.searchParams));
             case 6:
-              return _context5.abrupt("return", _context5.sent);
+              return _context6.abrupt("return", _context6.sent);
             case 7:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
       function changeCustomerPage(_x5, _x6) {
         return _changeCustomerPage.apply(this, arguments);
@@ -531,16 +577,16 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadMoreCustomers",
     value: (function () {
-      var _loadMoreCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var nextPage, _yield$this$fetchCust2, newCustomers, total, page, pageSize, updatedCustomerList, response;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _loadMoreCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        var nextPage, loadMoreParams, _yield$this$fetchCust3, newCustomers, total, page, pageSize, updatedCustomerList, response;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               if (!(!this.store.hasMore || this.store.loadingMore)) {
-                _context6.next = 2;
+                _context7.next = 2;
                 break;
               }
-              return _context6.abrupt("return", {
+              return _context7.abrupt("return", {
                 list: [],
                 total: this.store.total,
                 page: this.store.currentPage,
@@ -549,22 +595,21 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
             case 2:
               // 计算下一页
               nextPage = this.store.currentPage + 1;
-              _context6.prev = 3;
+              _context7.prev = 3;
               this.store.loadingMore = true;
               this.store.error = null;
-
-              // 使用公共方法获取数据，传入存储的搜索条件
-              _context6.next = 8;
-              return this.fetchCustomerListData(_objectSpread({
+              loadMoreParams = _objectSpread({
                 skip: nextPage,
                 num: this.store.pageSize
-              }, this.store.searchParams));
-            case 8:
-              _yield$this$fetchCust2 = _context6.sent;
-              newCustomers = _yield$this$fetchCust2.customerList;
-              total = _yield$this$fetchCust2.total;
-              page = _yield$this$fetchCust2.page;
-              pageSize = _yield$this$fetchCust2.pageSize;
+              }, this.store.searchParams); // 使用公共方法获取数据，传入存储的搜索条件
+              _context7.next = 9;
+              return this.fetchCustomerListData(loadMoreParams);
+            case 9:
+              _yield$this$fetchCust3 = _context7.sent;
+              newCustomers = _yield$this$fetchCust3.customerList;
+              total = _yield$this$fetchCust3.total;
+              page = _yield$this$fetchCust3.page;
+              pageSize = _yield$this$fetchCust3.pageSize;
               // 将新数据追加到现有列表（追加模式）
               updatedCustomerList = [].concat(_toConsumableArray(this.store.customerList), _toConsumableArray(cloneDeep(newCustomers))); // 更新状态
               this.store.customerList = updatedCustomerList;
@@ -573,14 +618,14 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               this.store.hasMore = page * pageSize < total;
 
               // 触发滚动加载特定事件
-              _context6.next = 20;
+              _context7.next = 21;
               return this.core.effects.emit("".concat(this.name, ":onScrollLoadMore"), {
                 newCustomers: newCustomers,
                 allCustomers: this.store.customerList,
                 currentPage: page,
                 hasMore: this.store.hasMore
               });
-            case 20:
+            case 21:
               // 触发分页变化事件
               this.triggerPaginationChange({
                 page: page,
@@ -595,27 +640,27 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 page: page,
                 pageSize: pageSize
               };
-              return _context6.abrupt("return", response);
-            case 25:
-              _context6.prev = 25;
-              _context6.t0 = _context6["catch"](3);
-              _context6.next = 29;
-              return this.handleCustomerListError(_context6.t0, 'load more customers');
-            case 29:
-              throw _context6.t0;
+              return _context7.abrupt("return", response);
+            case 26:
+              _context7.prev = 26;
+              _context7.t0 = _context7["catch"](3);
+              _context7.next = 30;
+              return this.handleCustomerListError(_context7.t0, 'load more customers');
             case 30:
-              _context6.prev = 30;
+              throw _context7.t0;
+            case 31:
+              _context7.prev = 31;
               this.store.loadingMore = false;
               this.storeChange();
-              _context6.next = 35;
+              _context7.next = 36;
               return this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), this.store);
-            case 35:
-              return _context6.finish(30);
             case 36:
+              return _context7.finish(31);
+            case 37:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this, [[3, 25, 30, 36]]);
+        }, _callee7, this, [[3, 26, 31, 37]]);
       }));
       function loadMoreCustomers() {
         return _loadMoreCustomers.apply(this, arguments);
@@ -631,15 +676,15 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "resetAndLoadCustomers",
     value: (function () {
-      var _resetAndLoadCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      var _resetAndLoadCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var params,
           resetParams,
           response,
-          _args7 = arguments;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+          _args8 = arguments;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              params = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {};
+              params = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {};
               // 重置状态
               this.store.customerList = [];
               this.store.currentPage = 1;
@@ -651,23 +696,23 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 skip: 1,
                 num: params.num || this.store.pageSize
               }); // 调用普通的获取列表方法
-              _context7.next = 8;
+              _context8.next = 8;
               return this.getCustomerList(resetParams);
             case 8:
-              response = _context7.sent;
-              _context7.next = 11;
+              response = _context8.sent;
+              _context8.next = 11;
               return this.core.effects.emit("".concat(this.name, ":onScrollLoadComplete"), {
                 customers: this.store.customerList,
                 total: this.store.total,
                 hasMore: this.store.hasMore
               });
             case 11:
-              return _context7.abrupt("return", response);
+              return _context8.abrupt("return", response);
             case 12:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
       function resetAndLoadCustomers() {
         return _resetAndLoadCustomers.apply(this, arguments);

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

@@ -110,6 +110,8 @@ export interface CustomerState {
 export interface CustomerModuleAPI {
     /** 获取客户列表 */
     getCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
+    /** 查询客户列表但不更新列表分页状态 */
+    queryCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
     /** 设置客户列表 */
     setCustomerList: (customers: ShopCustomer[], total?: number) => void;
     /** 设置当前选择的客户 */

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

@@ -135,6 +135,7 @@ export interface Discount {
     appliedProductDetails: ApplicableProductDetails[];
     isDisabledForProductUsed?: boolean;
     amount?: number;
+    customer_id?: number | string | null;
     extension_data?: ExtensionData[];
     total_order_behavior_count?: number;
     today_order_behavior_count?: number;

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

@@ -3,10 +3,9 @@ import { BaseModule } from '../BaseModule';
 import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CheckoutOrderParams, CancelOrderParams, ChangeBookingStatusParams } from './types';
 import { CartItem } from '../Cart/types';
 import { type SubmitPayloadEnhancer } from './utils';
-import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions } from './types';
+import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, OrderScanCodeResult, ReplaceTempOrderOptions } from './types';
 import type { ICustomer } from '../AccountList/types';
 import type { Discount } from '../Discount/types';
-import { UnavailableReason } from '../Rules/types';
 export declare class OrderModule extends BaseModule implements Module, OrderModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -48,12 +47,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         apply?: boolean;
     }): Promise<Discount[]>;
     getDiscountList(): Discount[];
-    scanCode(code: string, customerId?: number): Promise<{
-        isAvailable: boolean;
-        discountList: Discount[];
-        type: 'server' | 'clientCalc';
-        unavailableReason?: UnavailableReason;
-    }>;
+    scanCode(code: string, customerId?: number): Promise<OrderScanCodeResult>;
     applyDiscount(): void;
     initTempOrder(params: {
         cacheId?: string;
@@ -109,10 +103,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderBuzzer(buzzer: string): string;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
+    private buildTempOrderCustomer;
     /**
      * 更新当前 tempOrder 的客户协议字段。
      *
-     * PaymentModal 只需要修改订单里的客户字段；如果外部还有客户模块需要同步，
+     * PaymentModal 只需要修改订单里的客户事实；如果外部还有客户模块需要同步，
      * 应由调用方通过回调处理，不能把外部 UI 状态写进 tempOrder。
      */
     updateTempOrderCustomer(customer: UpdateTempOrderCustomerInput): OrderSnapshot['customer'];
@@ -190,7 +185,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;