@pisell/pisellos 2.2.168 → 2.2.170

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 { buildManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, shouldBuildManualProductDiscount } from "../../../modules/Order/utils/manualProductDiscount";
 function toNumber(value) {
   var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var parsedValue = Number(value);
@@ -74,7 +75,7 @@ function findVariantById(origin, variantId) {
  * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
  */
 export function transformBaseProductToOrderProduct(params) {
-  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _payload$option, _payload$bundle, _payload$unique_ident, _payload$quantity, _ref25, _ref26, _payload$tax_fee, _ref27, _ref28, _payload$is_charge_ta;
+  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _payload$option, _payload$bundle, _payload$unique_ident, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref25, _ref26, _origin$base_price, _ref27, _ref28, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref29, _ref30, _payload$tax_fee, _ref31, _ref32, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
@@ -92,6 +93,34 @@ export function transformBaseProductToOrderProduct(params) {
   var productOptionItem = normalizeOptionItems((_ref24 = (_payload$option = payload.option) !== null && _payload$option !== void 0 ? _payload$option : payload.options) !== null && _ref24 !== void 0 ? _ref24 : payload.product_option_item);
   var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle, hasPriceOverride);
   var uniqueIdentificationNumber = (_payload$unique_ident = payload.unique_identification_number) !== null && _payload$unique_ident !== void 0 ? _payload$unique_ident : payload.unique;
+  var resolvedQuantity = toSafePositiveInt((_payload$quantity = payload.quantity) !== null && _payload$quantity !== void 0 ? _payload$quantity : payload.num, 1);
+  var originTotal = resolveManualDiscountOriginTotal({
+    originTotal: payload.origin_total,
+    extendOriginTotal: (_payload$_extend2 = payload._extend) === null || _payload$_extend2 === void 0 ? void 0 : _payload$_extend2.origin_total,
+    originExtendOriginTotal: origin === null || origin === void 0 || (_extend = origin._extend) === null || _extend === void 0 ? void 0 : _extend.origin_total,
+    sourceExtendOriginTotal: sourceProduct === null || sourceProduct === void 0 || (_extend2 = sourceProduct._extend) === null || _extend2 === void 0 ? void 0 : _extend2.origin_total,
+    catalogUnitPrice: (_ref25 = (_ref26 = (_origin$base_price = origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _origin$base_price !== void 0 ? _origin$base_price : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref26 !== void 0 ? _ref26 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price) !== null && _ref25 !== void 0 ? _ref25 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price,
+    quantity: resolvedQuantity
+  });
+  var sellingTotal = Number((_ref27 = (_ref28 = (_payload$line_total2 = payload.line_total) !== null && _payload$line_total2 !== void 0 ? _payload$line_total2 : payload.total) !== null && _ref28 !== void 0 ? _ref28 : (_payload$_extend3 = payload._extend) === null || _payload$_extend3 === void 0 ? void 0 : _payload$_extend3.total) !== null && _ref27 !== void 0 ? _ref27 : lineCompositeTotal);
+  var discountReason = resolveManualDiscountReasonFromSources({
+    discountReason: payload.discount_reason,
+    extendDiscountReason: (_payload$_extend4 = payload._extend) === null || _payload$_extend4 === void 0 ? void 0 : _payload$_extend4.discount_reason,
+    originExtendDiscountReason: origin === null || origin === void 0 || (_extend3 = origin._extend) === null || _extend3 === void 0 ? void 0 : _extend3.discount_reason
+  });
+  var lineOriginalPrice = hasPriceOverride && Number.isFinite(originTotal) ? toPriceString(originTotal) : lineCompositeTotal;
+  var manualDiscountList = shouldBuildManualProductDiscount({
+    hasPriceOverride: hasPriceOverride,
+    originTotal: originTotal,
+    sellingTotal: sellingTotal
+  }) ? mergeManualProductDiscountIntoList(payload.discount_list, buildManualProductDiscountItem({
+    originTotal: Number.isFinite(originTotal) ? originTotal : Number(lineOriginalPrice),
+    sellingTotal: Number.isFinite(sellingTotal) ? sellingTotal : Number(lineCompositeTotal),
+    quantity: resolvedQuantity,
+    message: discountReason,
+    discountway: (_payload$_extend5 = payload._extend) === null || _payload$_extend5 === void 0 ? void 0 : _payload$_extend5.discountway,
+    discount_per: (_payload$_extend6 = payload._extend) === null || _payload$_extend6 === void 0 ? void 0 : _payload$_extend6.discount_per
+  })) : payload.discount_list || [];
   var metadata = _objectSpread(_objectSpread({
     unique: payload.unique,
     session: payload.session,
@@ -107,7 +136,8 @@ export function transformBaseProductToOrderProduct(params) {
     main_product_selling_price: sourceProductPrice,
     main_product_original_price: sourceProductPrice
   }, hasPriceOverride ? {
-    price_override: String(payload.price_override)
+    price_override: String(payload.price_override),
+    is_manual_discount: 1
   } : {}), payload.bundle_edit !== undefined ? {
     bundle_edit: payload.bundle_edit
   } : {});
@@ -118,14 +148,15 @@ export function transformBaseProductToOrderProduct(params) {
     product_id: productId,
     product_variant_id: productVariantId,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : undefined,
-    num: toSafePositiveInt((_payload$quantity = payload.quantity) !== null && _payload$quantity !== void 0 ? _payload$quantity : payload.num, 1),
+    num: resolvedQuantity,
     product_option_item: productOptionItem,
     product_bundle: productBundle,
+    discount_list: manualDiscountList,
     // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价
     selling_price: lineCompositeTotal,
-    original_price: lineCompositeTotal,
-    tax_fee: toPriceString((_ref25 = (_ref26 = (_payload$tax_fee = payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.tax_fee) !== null && _ref26 !== void 0 ? _ref26 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref25 !== void 0 ? _ref25 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
-    is_charge_tax: toNumber((_ref27 = (_ref28 = (_payload$is_charge_ta = payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref28 !== void 0 ? _ref28 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref27 !== void 0 ? _ref27 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.is_charge_tax, 0),
+    original_price: lineOriginalPrice,
+    tax_fee: toPriceString((_ref29 = (_ref30 = (_payload$tax_fee = payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.tax_fee) !== null && _ref30 !== void 0 ? _ref30 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref29 !== void 0 ? _ref29 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
+    is_charge_tax: toNumber((_ref31 = (_ref32 = (_payload$is_charge_ta = payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref32 !== void 0 ? _ref32 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref31 !== void 0 ? _ref31 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.is_charge_tax, 0),
     metadata: metadata,
     note: payload.note != null ? String(payload.note) : '',
     _origin: _objectSpread(_objectSpread({}, sourceProduct || {}), {}, {

package/dist/solution/BaseSales/utils.js

@@ -6,6 +6,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 Decimal from 'decimal.js';
 import { composeLinePrice, createUuidV4, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { ensureManualProductDiscountList } from "../../modules/Order/utils/manualProductDiscount";
 
 /**
  * 构建金额全为 0 的空 summary。
@@ -231,8 +232,16 @@ export function normalizeOrderProduct(product) {
   });
   var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
     num: product.num,
-    metadata: metadata
+    metadata: metadata,
+    lineOriginalPrice: product.original_price
   }, composedOriginalPrice);
+  var discountList = ensureManualProductDiscountList({
+    discountList: product.discount_list,
+    metadata: metadata,
+    originalPrice: finalOriginalPrice,
+    sellingPrice: composedSellingPrice,
+    quantity: getSafeProductNum(product.num)
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
@@ -243,7 +252,7 @@ export function normalizeOrderProduct(product) {
     original_price: finalOriginalPrice,
     tax_fee: product.tax_fee || '0.00',
     is_charge_tax: (_product$is_charge_ta = product.is_charge_tax) !== null && _product$is_charge_ta !== void 0 ? _product$is_charge_ta : 0,
-    discount_list: product.discount_list || [],
+    discount_list: discountList,
     product_bundle: normalizedBundle,
     metadata: metadata,
     note: product.note != null ? String(product.note) : ''

package/dist/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 6 | 3 | 5 | 4;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.js

@@ -311,7 +311,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               return _context5.abrupt("return", normalizedLocalCustomer);
             case 5:
               _context5.next = 7;
-              return this.store.customer.getCustomerList({
+              return this.store.customer.queryCustomerList({
                 ids: [customerId],
                 skip: 1,
                 num: 1
@@ -520,9 +520,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case 0:
               params = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {};
               options = _args8.length > 1 ? _args8[1] : undefined;
-              schedule_date = params.schedule_date, customer_id = params.customer_id, menu_list_ids = params.menu_list_ids, schedule_datetime = params.schedule_datetime; // 与 products 格式化器对齐日历日（YYYY-MM-DD）；勿写入 schedule_datetime 全串，
-              // 否则 requiresDetail 会把带时分秒的 date 传给弹窗，handleOpenProductModal 无法打开。
-              bookingDate = schedule_date || (schedule_datetime ? String(schedule_datetime).slice(0, 10) : '');
+              schedule_date = params.schedule_date, customer_id = params.customer_id, menu_list_ids = params.menu_list_ids, schedule_datetime = params.schedule_datetime; // 优先写入 schedule_datetime（含时分），供加购 presetStartTime 与 TimeBar 对齐；
+              // requiresDetail 弹窗仍通过 formatBookingDateForUI 只取日历日 YYYY-MM-DD。
+              bookingDate = schedule_datetime || schedule_date || '';
               if (bookingDate) {
                 this.setBookingDate(bookingDate);
               }

package/dist/solution/BookingTicket/utils/addProductDecision.js

@@ -200,7 +200,7 @@ export function buildRequiresDetailPayload(item, ctx) {
       number: Boolean(item === null || item === void 0 ? void 0 : item.open_sold_weight)
     },
     isOnlySession: isOnlySession,
-    isEject: isEject,
+    isEject: isEject ? 1 : 0,
     customerId: ctx === null || ctx === void 0 ? void 0 : ctx.customerId,
     date: formatBookingDateForUI(ctx === null || ctx === void 0 ? void 0 : ctx.date),
     productData: item
@@ -339,6 +339,8 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
     origin_total: extend === null || extend === void 0 ? void 0 : extend.origin_total,
     price_override: extend === null || extend === void 0 ? void 0 : extend.priceOverride,
     bundle_edit: extend === null || extend === void 0 ? void 0 : extend.bundle_edit,
+    discount_reason: extend === null || extend === void 0 ? void 0 : extend.discount_reason,
+    discount_list: cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.discount_list,
     _extend: extend
   };
 }

package/dist/solution/ScanOrder/utils.js

@@ -14,6 +14,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import dayjs from 'dayjs';
 import Decimal from 'decimal.js';
 import { composeLinePrice, createUuidV4, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { ensureManualProductDiscountList } from "../../modules/Order/utils/manualProductDiscount";
 
 /**
  * 构建金额全为 0 的空 summary。
@@ -605,8 +606,16 @@ export function normalizeOrderProduct(product) {
   });
   var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
     num: product.num,
-    metadata: metadata
+    metadata: metadata,
+    lineOriginalPrice: product.original_price
   }, composedOriginalPrice);
+  var discountList = ensureManualProductDiscountList({
+    discountList: product.discount_list,
+    metadata: metadata,
+    originalPrice: finalOriginalPrice,
+    sellingPrice: composedSellingPrice,
+    quantity: getSafeProductNum(product.num)
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
@@ -617,7 +626,7 @@ export function normalizeOrderProduct(product) {
     original_price: finalOriginalPrice,
     tax_fee: product.tax_fee || '0.00',
     is_charge_tax: (_product$is_charge_ta = product.is_charge_tax) !== null && _product$is_charge_ta !== void 0 ? _product$is_charge_ta : 0,
-    discount_list: product.discount_list || [],
+    discount_list: discountList,
     product_bundle: normalizedBundle,
     metadata: metadata,
     note: product.note != null ? String(product.note) : ''

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

@@ -33,6 +33,7 @@ __export(buildCacheItemFromOrderLine_exports, {
 });
 module.exports = __toCommonJS(buildCacheItemFromOrderLine_exports);
 var import_dayjs = __toESM(require("dayjs"));
+var import_manualProductDiscount = require("../../Order/utils/manualProductDiscount");
 function safeFormat(value, fmt) {
   if (value === void 0 || value === null)
     return void 0;
@@ -79,10 +80,28 @@ function unflattenResourceMap(resources) {
   });
   return map;
 }
-function buildCapacityFromBooking(resources) {
-  if (!Array.isArray(resources))
-    return [];
-  return resources.filter((r) => (r == null ? void 0 : r.relation_id) !== void 0 && (r == null ? void 0 : r.relation_id) !== null && r.capacity !== void 0).map((r) => ({ id: r.relation_id, value: Number(r.capacity || 0) }));
+function resolveCapacityFromBooking(booking) {
+  var _a;
+  const metaCap = (_a = booking.metadata) == null ? void 0 : _a.capacity;
+  if (Array.isArray(metaCap) && metaCap.length > 0) {
+    return metaCap.map((item) => {
+      if (!item || typeof item !== "object")
+        return null;
+      if (item.id === void 0 || item.id === null)
+        return null;
+      const row = {
+        id: item.id,
+        value: Number(item.value ?? 0)
+      };
+      if (item.name !== void 0)
+        row.name = item.name;
+      return row;
+    }).filter((item) => item != null);
+  }
+  if (typeof metaCap === "number" && Number.isFinite(metaCap)) {
+    return [{ id: 0, value: metaCap, name: "" }];
+  }
+  return [];
 }
 function resolveDurationForExtend(booking) {
   const duration = booking.duration;
@@ -95,7 +114,7 @@ function resolveDurationForExtend(booking) {
   return duration;
 }
 function buildCacheItemFromOrderLine(input) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const { product, booking, sourceProduct } = input;
   const resolvedId = product.product_id ?? (sourceProduct == null ? void 0 : sourceProduct.id);
   const selling = Number(product.selling_price ?? 0);
@@ -105,7 +124,7 @@ function buildCacheItemFromOrderLine(input) {
   const startTime = normalizeTimeString(booking.start_time);
   const endTime = normalizeTimeString(booking.end_time);
   const resource = unflattenResourceMap(booking.resources);
-  const capacity = buildCapacityFromBooking(booking.resources);
+  const capacity = resolveCapacityFromBooking(booking);
   const holderId = ((_a = booking.metadata) == null ? void 0 : _a.holder_id) ?? booking.holder_id;
   const other = {
     product_variant_id: product.product_variant_id ?? 0,
@@ -131,8 +150,22 @@ function buildCacheItemFromOrderLine(input) {
     capacity,
     holder_id: holderId,
     other,
-    like_status: booking.like_status || "common"
+    like_status: booking.like_status || "common",
+    discount_reason: (0, import_manualProductDiscount.resolveManualDiscountMessage)(
+      product.discount_list,
+      (_e = product.metadata) == null ? void 0 : _e.product_discount_reason
+    ) || void 0
   };
+  const manualDiscount = (product.discount_list || []).find((d) => (d == null ? void 0 : d.type) === "product");
+  if (manualDiscount && extend.origin_total === selling) {
+    const manualAmount = Number(manualDiscount.amount ?? 0);
+    if (Number.isFinite(manualAmount) && manualAmount > 0) {
+      extend.origin_total = selling + manualAmount;
+    }
+  }
+  if (((_f = product.metadata) == null ? void 0 : _f.price_override) != null || manualDiscount) {
+    extend.priceOverride = selling;
+  }
   if (booking.holder !== void 0) {
     extend.holder = booking.holder;
   }
@@ -143,8 +176,8 @@ function buildCacheItemFromOrderLine(input) {
     ...sourceProduct || {},
     id: resolvedId,
     product_id: resolvedId,
-    extension_type: (sourceProduct == null ? void 0 : sourceProduct.extension_type) ?? ((_e = booking == null ? void 0 : booking.product) == null ? void 0 : _e.extension_type) ?? (sourceProduct == null ? void 0 : sourceProduct.extension_type),
-    title: (sourceProduct == null ? void 0 : sourceProduct.title) ?? ((_f = booking == null ? void 0 : booking.product) == null ? void 0 : _f.title),
+    extension_type: (sourceProduct == null ? void 0 : sourceProduct.extension_type) ?? ((_g = booking == null ? void 0 : booking.product) == null ? void 0 : _g.extension_type) ?? (sourceProduct == null ? void 0 : sourceProduct.extension_type),
+    title: (sourceProduct == null ? void 0 : sourceProduct.title) ?? ((_h = booking == null ? void 0 : booking.product) == null ? void 0 : _h.title),
     price: (sourceProduct == null ? void 0 : sourceProduct.price) ?? selling,
     selling_price: product.selling_price,
     original_price: product.original_price,

package/lib/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/lib/modules/BookingContext/utils/cacheItemToBookingInput.js

@@ -36,6 +36,24 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_serviceTimes = require("./serviceTimes");
 var import_resources = require("./resources");
 var import_flexible = require("./flexible");
+function normalizeExtendCapacityForMetadata(capacity) {
+  if (!Array.isArray(capacity) || capacity.length === 0)
+    return void 0;
+  const normalized = capacity.map((item) => {
+    if (!item || typeof item !== "object")
+      return null;
+    if (item.id === void 0 || item.id === null)
+      return null;
+    const row = {
+      id: item.id,
+      value: Number(item.value ?? 0)
+    };
+    if (item.name !== void 0)
+      row.name = item.name;
+    return row;
+  }).filter((item) => item != null);
+  return normalized.length > 0 ? normalized : void 0;
+}
 function safeFormat(value, fmt) {
   if (value === void 0 || value === null)
     return void 0;
@@ -158,7 +176,10 @@ function cacheItemToBookingInput(cacheItem, options) {
   }
   if (ext.collect_pax !== void 0)
     metadata.collect_pax = ext.collect_pax;
-  if (ext.capacity_snapshot !== void 0) {
+  const extendCapacity = normalizeExtendCapacityForMetadata(ext.capacity);
+  if (extendCapacity) {
+    metadata.capacity = extendCapacity;
+  } else if (ext.capacity_snapshot !== void 0) {
     metadata.capacity = ext.capacity_snapshot;
   }
   const selectType = deriveResourceSelectType(cacheItem) || ((_b = options == null ? void 0 : options.bookingConfig) == null ? void 0 : _b.resource_select_type);

package/lib/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/lib/modules/Customer/index.js

@@ -75,7 +75,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     } else {
       this.store.currentPage = 1;
     }
-    if (typeof ((_e = options == null ? void 0 : options.initialState) == null ? void 0 : _e.pageSize) === "number") {
+    if (typeof ((_e = options == null ? void 0 : options.initialState) == null ? void 0 : _e.pageSize) === "number" && options.initialState.pageSize > 1) {
       this.store.pageSize = options.initialState.pageSize;
     } else {
       this.store.pageSize = import_constants.DEFAULT_PAGE_SIZE;
@@ -152,6 +152,20 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       this.store.error
     );
   }
+  /**
+   * 查询客户列表但不写入 customerList / pagination 状态。
+   *
+   * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
+   */
+  async queryCustomerList(params = {}) {
+    const { customerList, total, page, pageSize } = await this.fetchCustomerListData(params);
+    return {
+      list: customerList,
+      total,
+      page,
+      pageSize
+    };
+  }
   /**
    * 获取客户列表
    * @param params 查询参数
@@ -352,12 +366,13 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     try {
       this.store.loadingMore = true;
       this.store.error = null;
-      const { customerList: newCustomers, total, page, pageSize } = await this.fetchCustomerListData({
+      const loadMoreParams = {
         skip: nextPage,
         num: this.store.pageSize,
         ...this.store.searchParams
         // 使用存储的搜索条件
-      });
+      };
+      const { customerList: newCustomers, total, page, pageSize } = await this.fetchCustomerListData(loadMoreParams);
       const updatedCustomerList = [...this.store.customerList, ...(0, import_lodash_es.cloneDeep)(newCustomers)];
       this.store.customerList = updatedCustomerList;
       this.store.currentPage = page;

package/lib/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/lib/modules/Order/index.d.ts

@@ -103,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'];
@@ -184,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: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -38,6 +38,7 @@ var import_utils = require("./utils");
 var import_utils2 = require("../Product/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils3 = require("../../solution/ScanOrder/utils");
+var import_manualProductDiscount = require("./utils/manualProductDiscount");
 var import_Discount = require("../Discount");
 var import_Rules = require("../Rules");
 var import_types2 = require("../Rules/types");
@@ -272,7 +273,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       orderTotalAmount: Number(((_d = this.store.summary) == null ? void 0 : _d.total_amount) || 0)
     });
     if (result == null ? void 0 : result.productList) {
-      tempOrder.products = result.productList;
+      tempOrder.products = (result.productList || []).map((product) => ({
+        ...product,
+        discount_list: (0, import_manualProductDiscount.syncManualProductDiscountProductNum)(
+          product.discount_list,
+          product.num
+        )
+      }));
     }
     if (result == null ? void 0 : result.discountList) {
       OrderModule.populateSavedAmounts(
@@ -878,10 +885,29 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.persistTempOrder();
     return tempOrder.contacts_info;
   }
+  buildTempOrderCustomer(params) {
+    if (!params.customerId)
+      return null;
+    const source = params.source ? (0, import_lodash_es.cloneDeep)(params.source) : {};
+    const name = source.name ?? source.display_name ?? source.customerName ?? source.customer_name ?? params.customerName;
+    const customerName = source.customer_name ?? source.customerName ?? source.display_name ?? source.name ?? params.customerName;
+    return {
+      ...source,
+      id: source.id ?? params.customerId,
+      customer_id: source.customer_id ?? params.customerId,
+      name: String(name || ""),
+      customer_name: String(customerName || ""),
+      country_calling_code: String(
+        source.country_calling_code ?? source.countryCallingCode ?? params.countryCallingCode
+      ),
+      phone: String(source.phone ?? params.phone),
+      email: String(source.email ?? params.email)
+    };
+  }
   /**
    * 更新当前 tempOrder 的客户协议字段。
    *
-   * PaymentModal 只需要修改订单里的客户字段；如果外部还有客户模块需要同步，
+   * PaymentModal 只需要修改订单里的客户事实；如果外部还有客户模块需要同步，
    * 应由调用方通过回调处理，不能把外部 UI 状态写进 tempOrder。
    */
   updateTempOrderCustomer(customer) {
@@ -895,6 +921,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
     tempOrder.phone = String(customer.phone || "");
     tempOrder.email = String(customer.email || "");
+    tempOrder.customer = this.buildTempOrderCustomer({
+      source: customer,
+      customerId: tempOrder.customer_id,
+      customerName: tempOrder.customer_name,
+      countryCallingCode: tempOrder.country_calling_code,
+      phone: tempOrder.phone,
+      email: tempOrder.email
+    });
     this.persistTempOrder();
     return {
       customerId: tempOrder.customer_id,
@@ -914,6 +948,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.country_calling_code = String(patch.country_calling_code || "");
     tempOrder.phone = String(patch.phone || "");
     tempOrder.email = String(patch.email || "");
+    tempOrder.customer = this.buildTempOrderCustomer({
+      source: snapshot || null,
+      customerId: tempOrder.customer_id,
+      customerName: tempOrder.customer_name,
+      countryCallingCode: tempOrder.country_calling_code,
+      phone: tempOrder.phone,
+      email: tempOrder.email
+    });
     if (snapshot !== void 0) {
       const extend = this.ensureExtend(tempOrder);
       if (snapshot === null)
@@ -945,11 +987,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   clearOrderCustomer() {
     const tempOrder = this.ensureTempOrder();
-    tempOrder.customer_id = 0;
+    tempOrder.customer_id = null;
     tempOrder.customer_name = "";
     tempOrder.country_calling_code = "";
     tempOrder.phone = "";
     tempOrder.email = "";
+    tempOrder.customer = null;
     if (tempOrder._extend)
       delete tempOrder._extend.customerSnapshot;
     this.persistTempOrder();