@pisell/pisellos 2.2.267 → 2.2.269

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

@@ -0,0 +1,26 @@
+export type OrderPaymentTransactionStatus = 'success' | 'fail';
+export interface OrderPaymentTransaction {
+    number: string;
+    status: OrderPaymentTransactionStatus;
+}
+export type OrderPaymentIdentityType = 'order_payment_id' | 'payment_number' | 'unique_payment_number';
+export interface OrderPaymentIdentityMatch<T> {
+    index: number;
+    payment: T;
+    matchedBy: OrderPaymentIdentityType;
+}
+export declare function getOrderPaymentIdentityKeys(payment: unknown): string[];
+export declare function isPendingOrderPayment(payment: unknown): boolean;
+export declare function isIdentifiedPendingOrderPayment(payment: unknown): boolean;
+export declare function hasOrderPaymentIdentityOverlap(left: unknown, right: unknown): boolean;
+export declare function resolveOrderPaymentIdentity<T extends Record<string, any>>(payments: T[] | null | undefined, identity: string | number, mode?: 'payment_number' | 'compat'): OrderPaymentIdentityMatch<T> | null;
+export declare function ensureOrderPaymentNumber<T extends Record<string, any>>(payment: T, devicePrefix: string, createPaymentNumber: () => string): T & {
+    payment_number: string;
+};
+export declare function mergeOrderPaymentTransactions(current: unknown, incoming: unknown): OrderPaymentTransaction[];
+export declare function mergeOrderPaymentRecord<T extends Record<string, any>>(payment: T, updates: Record<string, any>): T;
+export declare function mergeOrderPaymentSnapshot<T extends Record<string, any>>(current: T, incoming: T): T;
+export declare function mergeOrderPaymentListsByIdentity<T extends Record<string, any>>(existing: T[] | null | undefined, incoming: T[] | null | undefined, options?: {
+    preserveUnmatchedExisting?: boolean;
+    preserveUnmatchedExistingWhen?: (payment: T) => boolean;
+}): T[];

package/dist/modules/Order/payment-utils.js

@@ -0,0 +1,225 @@
+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 _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 _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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+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 _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; }
+var PAYMENT_IDENTITY_TYPES = ['payment_number', 'order_payment_id', 'unique_payment_number'];
+function normalizePaymentIdentityValue(value) {
+  if (value === undefined || value === null || value === '') return null;
+  return String(value);
+}
+function getPaymentIdentityValue(payment, type) {
+  if (type === 'unique_payment_number') {
+    var _payment$metadata;
+    return payment === null || payment === void 0 || (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.unique_payment_number;
+  }
+  return payment === null || payment === void 0 ? void 0 : payment[type];
+}
+export function getOrderPaymentIdentityKeys(payment) {
+  var record = payment;
+  if (!record) return [];
+  return PAYMENT_IDENTITY_TYPES.flatMap(function (type) {
+    var value = normalizePaymentIdentityValue(getPaymentIdentityValue(record, type));
+    return value === null ? [] : ["".concat(type, ":").concat(value)];
+  });
+}
+export function isPendingOrderPayment(payment) {
+  var record = payment;
+  return String((record === null || record === void 0 ? void 0 : record.status) || '').toLowerCase() === 'payment_pending';
+}
+export function isIdentifiedPendingOrderPayment(payment) {
+  return isPendingOrderPayment(payment) && getOrderPaymentIdentityKeys(payment).length > 0;
+}
+export function hasOrderPaymentIdentityOverlap(left, right) {
+  var leftKeys = new Set(getOrderPaymentIdentityKeys(left));
+  if (leftKeys.size === 0) return false;
+  return getOrderPaymentIdentityKeys(right).some(function (key) {
+    return leftKeys.has(key);
+  });
+}
+export function resolveOrderPaymentIdentity(payments, identity) {
+  var mode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'payment_number';
+  var target = String(identity);
+  var identityTypes = mode === 'payment_number' ? ['payment_number'] : PAYMENT_IDENTITY_TYPES;
+  var matchesByIndex = new Map();
+  var _iterator = _createForOfIteratorHelper(identityTypes),
+    _step;
+  try {
+    var _loop = function _loop() {
+      var type = _step.value;
+      (payments || []).forEach(function (payment, index) {
+        var value = normalizePaymentIdentityValue(getPaymentIdentityValue(payment, type));
+        if (value === target && !matchesByIndex.has(index)) {
+          matchesByIndex.set(index, {
+            index: index,
+            payment: payment,
+            matchedBy: type
+          });
+        }
+      });
+    };
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      _loop();
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  var matches = _toConsumableArray(matchesByIndex.values());
+  if (matches.length > 1) {
+    throw new Error("\u652F\u4ED8\u9879\u8EAB\u4EFD\u5B58\u5728\u6B67\u4E49: ".concat(target));
+  }
+  return matches[0] || null;
+}
+export function ensureOrderPaymentNumber(payment, devicePrefix, createPaymentNumber) {
+  var existing = normalizePaymentIdentityValue(payment.payment_number);
+  if (existing) return _objectSpread(_objectSpread({}, payment), {}, {
+    payment_number: existing
+  });
+  var uuid = normalizePaymentIdentityValue(payment.uuid) || createPaymentNumber();
+  var prefix = normalizePaymentIdentityValue(devicePrefix) || 'LOCAL';
+  // TODO: 使用 ID Generator 替换当前 UUID 段生成器。
+  return _objectSpread(_objectSpread({}, payment), {}, {
+    payment_number: "".concat(prefix, "_").concat(uuid)
+  });
+}
+export function mergeOrderPaymentTransactions(current, incoming) {
+  var records = new Map();
+  var append = function append(value) {
+    if (!Array.isArray(value)) return;
+    value.forEach(function (item) {
+      var number = item && _typeof(item) === 'object' ? String(item.number || '') : '';
+      var status = item && _typeof(item) === 'object' ? item.status : undefined;
+      if (!number || status !== 'success' && status !== 'fail') return;
+      var previous = records.get(number);
+      if ((previous === null || previous === void 0 ? void 0 : previous.status) === 'success' && status === 'fail') return;
+      records.set(number, {
+        number: number,
+        status: status
+      });
+    });
+  };
+  append(current);
+  append(incoming);
+  return _toConsumableArray(records.values());
+}
+export function mergeOrderPaymentRecord(payment, updates) {
+  var _updates$status, _updates$updated_at;
+  var currentMetadata = payment.metadata || {};
+  var incomingMetadata = updates.metadata || {};
+  var transactions = mergeOrderPaymentTransactions(currentMetadata.transactions, incomingMetadata.transactions);
+  var currentPaid = payment.status === 'paid';
+  var nextStatus = currentPaid && updates.status !== 'paid' ? 'paid' : (_updates$status = updates.status) !== null && _updates$status !== void 0 ? _updates$status : payment.status;
+  return _objectSpread(_objectSpread(_objectSpread({}, payment), updates), {}, {
+    status: nextStatus,
+    updated_at: (_updates$updated_at = updates.updated_at) !== null && _updates$updated_at !== void 0 ? _updates$updated_at : payment.updated_at,
+    metadata: _objectSpread(_objectSpread(_objectSpread({}, currentMetadata), incomingMetadata), transactions.length > 0 || Array.isArray(incomingMetadata.transactions) ? {
+      transactions: transactions
+    } : {})
+  });
+}
+export function mergeOrderPaymentSnapshot(current, incoming) {
+  var currentMetadata = current.metadata || {};
+  var incomingMetadata = incoming.metadata || {};
+  var currentUniquePaymentNumber = normalizePaymentIdentityValue(currentMetadata.unique_payment_number);
+  var incomingUniquePaymentNumber = normalizePaymentIdentityValue(incomingMetadata.unique_payment_number);
+  var incomingOrderPaymentId = normalizePaymentIdentityValue(incoming.order_payment_id);
+  var incomingFallbackPrefix = incomingOrderPaymentId ? "os-fallback:payment:order-payment:".concat(incomingOrderPaymentId) : null;
+  var incomingUsesDerivedUniquePaymentNumber = Boolean(incomingUniquePaymentNumber && incomingFallbackPrefix && (incomingUniquePaymentNumber === incomingFallbackPrefix || incomingUniquePaymentNumber.startsWith("".concat(incomingFallbackPrefix, ":conflict:"))));
+  var transactions = mergeOrderPaymentTransactions(currentMetadata.transactions, incomingMetadata.transactions);
+  return _objectSpread(_objectSpread(_objectSpread({}, current), incoming), {}, {
+    order_payment_id: normalizePaymentIdentityValue(incoming.order_payment_id) !== null ? incoming.order_payment_id : current.order_payment_id,
+    payment_number: incoming.payment_number || current.payment_number,
+    metadata: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, currentMetadata), incomingMetadata), incomingUsesDerivedUniquePaymentNumber && currentUniquePaymentNumber ? {
+      unique_payment_number: currentUniquePaymentNumber
+    } : {}), transactions.length > 0 ? {
+      transactions: transactions
+    } : {})
+  });
+}
+function compactOrderPaymentList(payments) {
+  var result = [];
+  var _iterator2 = _createForOfIteratorHelper(payments),
+    _step2;
+  try {
+    var _loop2 = function _loop2() {
+      var payment = _step2.value;
+      var matchingIndexes = result.flatMap(function (existing, index) {
+        return hasOrderPaymentIdentityOverlap(existing, payment) ? [index] : [];
+      });
+      if (matchingIndexes.length === 0) {
+        result.push(mergeOrderPaymentSnapshot({}, payment));
+        return 1; // continue
+      }
+      var firstIndex = matchingIndexes[0];
+      var merged = result[firstIndex];
+      var _iterator3 = _createForOfIteratorHelper(matchingIndexes.slice(1)),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var index = _step3.value;
+          merged = mergeOrderPaymentSnapshot(merged, result[index]);
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+      result[firstIndex] = mergeOrderPaymentSnapshot(merged, payment);
+      var _iterator4 = _createForOfIteratorHelper(matchingIndexes.slice(1).sort(function (a, b) {
+          return b - a;
+        })),
+        _step4;
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var _index = _step4.value;
+          result.splice(_index, 1);
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
+    };
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      if (_loop2()) continue;
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return result;
+}
+export function mergeOrderPaymentListsByIdentity(existing, incoming) {
+  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  var existingList = compactOrderPaymentList(_toConsumableArray(existing || []));
+  var incomingList = compactOrderPaymentList(_toConsumableArray(incoming || []));
+  if (options.preserveUnmatchedExisting) {
+    return compactOrderPaymentList([].concat(_toConsumableArray(existingList), _toConsumableArray(incomingList)));
+  }
+  var mergedIncoming = incomingList.map(function (incomingPayment) {
+    var matchingExisting = existingList.filter(function (existingPayment) {
+      return hasOrderPaymentIdentityOverlap(existingPayment, incomingPayment);
+    });
+    return matchingExisting.reduce(function (merged, existingPayment) {
+      return mergeOrderPaymentSnapshot(existingPayment, merged);
+    }, incomingPayment);
+  });
+  var preservedExisting = options.preserveUnmatchedExistingWhen ? existingList.filter(function (existingPayment) {
+    var _options$preserveUnma;
+    return !incomingList.some(function (incomingPayment) {
+      return hasOrderPaymentIdentityOverlap(existingPayment, incomingPayment);
+    }) && ((_options$preserveUnma = options.preserveUnmatchedExistingWhen) === null || _options$preserveUnma === void 0 ? void 0 : _options$preserveUnma.call(options, existingPayment));
+  }) : [];
+  return compactOrderPaymentList([].concat(_toConsumableArray(mergedIncoming), _toConsumableArray(preservedExisting)));
+}

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

@@ -165,6 +165,8 @@ export interface OrderCustomerChangePayload {
 }
 export interface OrderScanCodeResult {
     isAvailable: boolean;
+    /** 卡券已加入当前订单折扣列表，但不一定能立即应用。 */
+    isAccepted?: boolean;
     discountList: Discount[];
     scannedDiscountList: Discount[];
     type: 'server' | 'clientCalc';
@@ -319,6 +321,24 @@ export interface ReplaceTempOrderOptions {
     saveDraft?: boolean;
 }
 export type AddProductBookingInput = Record<string, any>;
+/**
+ * 添加商品行时的顺序控制。
+ * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，
+ * 避免步进器修改数量改变该组展示位置。
+ */
+export interface AddProductToOrderOptions {
+    insertAfterProductUid?: string;
+}
+/**
+ * 删除商品后的可选位置保持策略。
+ * 预约合并行减量时仍删除最新真实行，再把剩余代表行移动到被删除代表行原位置。
+ */
+export interface RemoveProductsFromOrderOptions {
+    preserveDisplayPosition?: {
+        remainingProductUid: string;
+        anchorProductUid: string;
+    };
+}
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
 export interface UpdateOrderProductParams {
     product_id: number | null;
@@ -468,6 +488,8 @@ export interface SubmitSalesOrderParams {
 export interface PaymentItemData {
     /** 当前支付项的唯一 ID */
     uuid: string;
+    /** 支付项稳定唯一号 */
+    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string;
     /** 支付类型代码 */
@@ -490,13 +512,22 @@ export interface PaymentItemData {
 export interface OrderPaymentMetadata {
     rounding_rule?: Record<string, any>;
     unique_payment_number?: string;
+    /** 刷卡机设备快照；OS 不解析内部字段，仅透传并持久化 */
+    card_reader_snapshot?: Record<string, unknown>;
     shop_wallet_pass_id?: number | string;
     actual_paid_amount?: number | string;
     change_given_amount?: number | string;
+    transactions?: OrderPaymentTransaction[];
     [key: string]: any;
 }
+export interface OrderPaymentTransaction {
+    number: string;
+    status: 'success' | 'fail';
+}
 export interface OrderPaymentData {
     order_payment_id?: number | string;
+    /** 支付项稳定唯一号；历史支付项允许缺失 */
+    payment_number?: string;
     amount: string;
     code: string;
     custom_payment_id: number;
@@ -523,6 +554,15 @@ export interface OrderPaymentData {
     created_at?: string;
     updated_at?: string;
 }
+export interface OrderPaymentUpdateOptions {
+    matchBy?: 'payment_number' | 'compat' | 'legacy';
+}
+export interface OrderPaymentUpdateResult {
+    updated: boolean;
+    payment: OrderPaymentData | null;
+    payments: OrderPaymentData[];
+    summary: OrderSummary | null;
+}
 export type OrderPaymentSource = PaymentItem | OrderPaymentData | Record<string, any>;
 export interface MapOrderPaymentsOptions {
     includeVoided?: boolean;
@@ -673,6 +713,14 @@ export interface OrderModuleAPI {
         channel?: string;
         type?: string;
     }) => OrderSubmitPayload;
+    saveTempOrderAsDraft: <T = any>(params?: {
+        cacheId?: string;
+        platform?: string;
+        businessCode?: string;
+        channel?: string;
+        type?: string;
+        enhancePayload?: SubmitPayloadEnhancer;
+    }) => Promise<T>;
     applyLocalPrintOrderNumbers: (order?: Record<string, any> | null) => Promise<OrderTempOrder>;
     getTempOrderNote: () => string;
     updateTempOrderNote: {
@@ -685,15 +733,15 @@ export interface OrderModuleAPI {
     updateTempOrderCustomer: (customer: UpdateTempOrderCustomerInput) => OrderSnapshot['customer'];
     updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
-    addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput) => Promise<OrderProduct[]>;
+    addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions) => Promise<OrderProduct[]>;
     updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
     /** 批量更新购物车行，末尾仅触发一次促销重算与 summary 刷新 */
     updateOrderProducts: (paramsList: UpdateOrderProductParams[]) => Promise<OrderProduct[]>;
     updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
-    removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
+    removeProductFromOrder: (identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** 批量删除购物车行，末尾仅触发一次促销重算与 summary 刷新 */
-    removeProductsFromOrder: (identities: OrderProductIdentity[]) => Promise<OrderProduct[]>;
+    removeProductsFromOrder: (identities: OrderProductIdentity[], options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** @deprecated no-op；OrderModule 不再负责 tempOrder localStorage 持久化。 */
     persistTempOrder: () => void;
     /**
@@ -730,11 +778,15 @@ export interface OrderModuleAPI {
     getOrderPayments: () => OrderPaymentData[];
     setOrderPayments: (payments: OrderPaymentSource[]) => OrderPaymentData[];
     addOrderPayment: (payment: OrderPaymentSource) => OrderPaymentData[];
-    updateOrderPayment: (paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>) => OrderPaymentData[];
+    addOrderPaymentAsync: (payment: OrderPaymentSource) => Promise<OrderPaymentData[]>;
+    updateOrderPayment: (paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>, options?: OrderPaymentUpdateOptions) => Promise<OrderPaymentUpdateResult>;
     deleteOrderPayment: (paymentIdentity: string | number) => OrderPaymentData[];
     updateVoucherOrderPayments: (payments: OrderPaymentSource[], options?: {
         status?: 'paid' | 'payment_pending';
     }) => OrderPaymentData[];
+    updateVoucherOrderPaymentsAsync: (payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }) => Promise<OrderPaymentData[]>;
     confirmPendingVoucherPayments: (options?: {
         persist?: boolean;
         recalculateSummary?: boolean;

package/dist/modules/Order/types.js

@@ -63,6 +63,17 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * 清空时整个 payload 为 null。
  */
 
+/**
+ * 添加商品行时的顺序控制。
+ * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，
+ * 避免步进器修改数量改变该组展示位置。
+ */
+
+/**
+ * 删除商品后的可选位置保持策略。
+ * 预约合并行减量时仍删除最新真实行，再把剩余代表行移动到被删除代表行原位置。
+ */
+
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
 
 /** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */

package/dist/modules/Order/utils/orderCollectionIdentity.js

@@ -209,6 +209,11 @@ export function normalizeOrderCollection(kind, items, options) {
     var persistentId = getOrderCollectionPersistentId(kind, item);
     var uid = getOrderCollectionUid(kind, item);
     if (!uid) {
+      var _item;
+      if (kind === 'payment' && !isBlankOrderCollectionIdentity((_item = item) === null || _item === void 0 ? void 0 : _item.payment_number)) {
+        // payment_number 已提供稳定身份，不占用真实交易流水字段作为内部 UID。
+        continue;
+      }
       uid = persistentId ? buildOrderCollectionFallbackUid(kind, persistentId) : allocateAnonymousUid(occupiedUids, createAnonymousUid);
       item = setOrderCollectionUid(kind, item, uid);
       result[index] = item;
@@ -216,7 +221,7 @@ export function normalizeOrderCollection(kind, items, options) {
       if (!persistentId) stats.anonymousRowCount += 1;
     }
     if (occupiedUids.has(uid)) {
-      var _item, _item2, _item3, _item4;
+      var _item2, _item3, _item4, _item5;
       var replacementUid = persistentId ? allocatePersistentConflictUid(kind, persistentId, occupiedUids) : allocateAnonymousUid(occupiedUids, createAnonymousUid);
       result[index] = setOrderCollectionUid(kind, item, replacementUid);
       uidRemaps.push({
@@ -225,7 +230,7 @@ export function normalizeOrderCollection(kind, items, options) {
         to: replacementUid,
         persistentId: persistentId,
         scope: 'linked-owner',
-        referenceOwnerUid: kind === 'product' ? String(((_item = item) === null || _item === void 0 ? void 0 : _item.booking_uid) || ((_item2 = item) === null || _item2 === void 0 || (_item2 = _item2.metadata) === null || _item2 === void 0 ? void 0 : _item2.booking_uid) || '') || null : kind === 'booking' ? String(((_item3 = item) === null || _item3 === void 0 ? void 0 : _item3.product_uid) || ((_item4 = item) === null || _item4 === void 0 || (_item4 = _item4.metadata) === null || _item4 === void 0 ? void 0 : _item4.product_uid) || '') || null : null
+        referenceOwnerUid: kind === 'product' ? String(((_item2 = item) === null || _item2 === void 0 ? void 0 : _item2.booking_uid) || ((_item3 = item) === null || _item3 === void 0 || (_item3 = _item3.metadata) === null || _item3 === void 0 ? void 0 : _item3.booking_uid) || '') || null : kind === 'booking' ? String(((_item4 = item) === null || _item4 === void 0 ? void 0 : _item4.product_uid) || ((_item5 = item) === null || _item5 === void 0 || (_item5 = _item5.metadata) === null || _item5 === void 0 ? void 0 : _item5.product_uid) || '') || null : null
       });
       uid = replacementUid;
       stats.uidConflictCount += 1;

package/dist/modules/Order/utils.js

@@ -533,7 +533,8 @@ export function resolveEffectivePerUnitDiscount(product) {
     return sum + Number((discount === null || discount === void 0 ? void 0 : discount.amount) || 0);
   }, 0);
   var hasPromoDiscountItem = discountList.some(function (item) {
-    return (item === null || item === void 0 ? void 0 : item.type) === 'promotion';
+    var _item$metadata, _item$metadata2;
+    return (item === null || item === void 0 ? void 0 : item.type) === 'promotion' || (item === null || item === void 0 ? void 0 : item.type) === 'product' && (item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.source) === 'promotion' && (item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.actionType) === 'ITEM_REWARD';
   });
   if (hasPromoDiscountItem) return fromList;
   var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
@@ -1047,7 +1048,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  var _tempOrder$customer_i, _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_, _ref30, _tempOrder$is_price_i, _tempOrder$is_deposit, _enhancedPayload$summ;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -1093,6 +1094,9 @@ export function buildSubmitPayload(params) {
   var payload = _objectSpread(_objectSpread({}, tempOrderRest), {}, {
     customer_id: (_tempOrder$customer_i = tempOrder.customer_id) !== null && _tempOrder$customer_i !== void 0 ? _tempOrder$customer_i : 1,
     customer_name: tempOrder.customer_name || 'Walk-In',
+    country_calling_code: String((_tempOrder$country_ca = tempOrder.country_calling_code) !== null && _tempOrder$country_ca !== void 0 ? _tempOrder$country_ca : ''),
+    phone: String((_tempOrder$phone = tempOrder.phone) !== null && _tempOrder$phone !== void 0 ? _tempOrder$phone : ''),
+    email: String((_tempOrder$email = tempOrder.email) !== null && _tempOrder$email !== void 0 ? _tempOrder$email : ''),
     order_number: (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : null,
     shop_order_number: (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : null,
     shop_full_order_number: (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : null,
@@ -1152,9 +1156,7 @@ export function mapPaymentItemToOrderPayment(paymentItem) {
   var item = paymentItem;
   var customPaymentId = (_item$custom_payment_ = item.custom_payment_id) !== null && _item$custom_payment_ !== void 0 ? _item$custom_payment_ : item.id;
   var metadata = item.metadata && _typeof(item.metadata) === 'object' ? _objectSpread({}, item.metadata) : {};
-  if (item.uuid && !metadata.unique_payment_number) {
-    metadata.unique_payment_number = String(item.uuid);
-  }
+  var paymentNumber = item.payment_number;
   var paymentMetadataKeys = ['rounding_rule', 'shop_wallet_pass_id', 'actual_paid_amount', 'change_given_amount'];
   for (var _i3 = 0, _paymentMetadataKeys = paymentMetadataKeys; _i3 < _paymentMetadataKeys.length; _i3++) {
     var key = _paymentMetadataKeys[_i3];
@@ -1165,8 +1167,10 @@ export function mapPaymentItemToOrderPayment(paymentItem) {
   var timestamp = dayjs().format('YYYY-MM-DD HH:mm:ss');
   var paymentTime = (_item$payment_time = item.payment_time) !== null && _item$payment_time !== void 0 ? _item$payment_time : timestamp;
   var createdAt = (_item$created_at = item.created_at) !== null && _item$created_at !== void 0 ? _item$created_at : timestamp;
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, item.order_payment_id !== undefined ? {
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, item.order_payment_id !== undefined ? {
     order_payment_id: item.order_payment_id
+  } : {}), paymentNumber !== undefined && paymentNumber !== null && paymentNumber !== '' ? {
+    payment_number: String(paymentNumber)
   } : {}), {}, {
     amount: String((_item$amount = item.amount) !== null && _item$amount !== void 0 ? _item$amount : '0.00'),
     code: String(item.code || ''),

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

@@ -20,6 +20,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     protected defaultVersion: string;
     request: RequestPlugin;
     private app;
+    private appPlugin;
     private store;
     window: WindowPlugin;
     private dbManager;
@@ -40,6 +41,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    private getPaymentNumberAppData;
     /**
      * 记录信息日志
      */