@pisell/pisellos 2.2.264 → 2.2.266

package/lib/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/lib/modules/Order/payment-utils.js

@@ -0,0 +1,224 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Order/payment-utils.ts
+var payment_utils_exports = {};
+__export(payment_utils_exports, {
+  ensureOrderPaymentNumber: () => ensureOrderPaymentNumber,
+  getOrderPaymentIdentityKeys: () => getOrderPaymentIdentityKeys,
+  hasOrderPaymentIdentityOverlap: () => hasOrderPaymentIdentityOverlap,
+  isIdentifiedPendingOrderPayment: () => isIdentifiedPendingOrderPayment,
+  isPendingOrderPayment: () => isPendingOrderPayment,
+  mergeOrderPaymentListsByIdentity: () => mergeOrderPaymentListsByIdentity,
+  mergeOrderPaymentRecord: () => mergeOrderPaymentRecord,
+  mergeOrderPaymentSnapshot: () => mergeOrderPaymentSnapshot,
+  mergeOrderPaymentTransactions: () => mergeOrderPaymentTransactions,
+  resolveOrderPaymentIdentity: () => resolveOrderPaymentIdentity
+});
+module.exports = __toCommonJS(payment_utils_exports);
+var PAYMENT_IDENTITY_TYPES = [
+  "payment_number",
+  "order_payment_id",
+  "unique_payment_number"
+];
+function normalizePaymentIdentityValue(value) {
+  if (value === void 0 || value === null || value === "")
+    return null;
+  return String(value);
+}
+function getPaymentIdentityValue(payment, type) {
+  var _a;
+  if (type === "unique_payment_number") {
+    return (_a = payment == null ? void 0 : payment.metadata) == null ? void 0 : _a.unique_payment_number;
+  }
+  return payment == null ? void 0 : payment[type];
+}
+function getOrderPaymentIdentityKeys(payment) {
+  const record = payment;
+  if (!record)
+    return [];
+  return PAYMENT_IDENTITY_TYPES.flatMap((type) => {
+    const value = normalizePaymentIdentityValue(getPaymentIdentityValue(record, type));
+    return value === null ? [] : [`${type}:${value}`];
+  });
+}
+function isPendingOrderPayment(payment) {
+  const record = payment;
+  return String((record == null ? void 0 : record.status) || "").toLowerCase() === "payment_pending";
+}
+function isIdentifiedPendingOrderPayment(payment) {
+  return isPendingOrderPayment(payment) && getOrderPaymentIdentityKeys(payment).length > 0;
+}
+function hasOrderPaymentIdentityOverlap(left, right) {
+  const leftKeys = new Set(getOrderPaymentIdentityKeys(left));
+  if (leftKeys.size === 0)
+    return false;
+  return getOrderPaymentIdentityKeys(right).some((key) => leftKeys.has(key));
+}
+function resolveOrderPaymentIdentity(payments, identity, mode = "payment_number") {
+  const target = String(identity);
+  const identityTypes = mode === "payment_number" ? ["payment_number"] : PAYMENT_IDENTITY_TYPES;
+  const matchesByIndex = /* @__PURE__ */ new Map();
+  for (const type of identityTypes) {
+    (payments || []).forEach((payment, index) => {
+      const value = normalizePaymentIdentityValue(getPaymentIdentityValue(payment, type));
+      if (value === target && !matchesByIndex.has(index)) {
+        matchesByIndex.set(index, { index, payment, matchedBy: type });
+      }
+    });
+  }
+  const matches = [...matchesByIndex.values()];
+  if (matches.length > 1) {
+    throw new Error(`支付项身份存在歧义: ${target}`);
+  }
+  return matches[0] || null;
+}
+function ensureOrderPaymentNumber(payment, devicePrefix, createPaymentNumber) {
+  const existing = normalizePaymentIdentityValue(payment.payment_number);
+  if (existing)
+    return { ...payment, payment_number: existing };
+  const uuid = normalizePaymentIdentityValue(payment.uuid) || createPaymentNumber();
+  const prefix = normalizePaymentIdentityValue(devicePrefix) || "LOCAL";
+  return { ...payment, payment_number: `${prefix}_${uuid}` };
+}
+function mergeOrderPaymentTransactions(current, incoming) {
+  const records = /* @__PURE__ */ new Map();
+  const append = (value) => {
+    if (!Array.isArray(value))
+      return;
+    value.forEach((item) => {
+      const number = item && typeof item === "object" ? String(item.number || "") : "";
+      const status = item && typeof item === "object" ? item.status : void 0;
+      if (!number || status !== "success" && status !== "fail")
+        return;
+      const previous = records.get(number);
+      if ((previous == null ? void 0 : previous.status) === "success" && status === "fail")
+        return;
+      records.set(number, { number, status });
+    });
+  };
+  append(current);
+  append(incoming);
+  return [...records.values()];
+}
+function mergeOrderPaymentRecord(payment, updates) {
+  const currentMetadata = payment.metadata || {};
+  const incomingMetadata = updates.metadata || {};
+  const transactions = mergeOrderPaymentTransactions(
+    currentMetadata.transactions,
+    incomingMetadata.transactions
+  );
+  const currentPaid = payment.status === "paid";
+  const nextStatus = currentPaid && updates.status !== "paid" ? "paid" : updates.status ?? payment.status;
+  return {
+    ...payment,
+    ...updates,
+    status: nextStatus,
+    updated_at: updates.updated_at ?? payment.updated_at,
+    metadata: {
+      ...currentMetadata,
+      ...incomingMetadata,
+      ...transactions.length > 0 || Array.isArray(incomingMetadata.transactions) ? { transactions } : {}
+    }
+  };
+}
+function mergeOrderPaymentSnapshot(current, incoming) {
+  const currentMetadata = current.metadata || {};
+  const incomingMetadata = incoming.metadata || {};
+  const currentUniquePaymentNumber = normalizePaymentIdentityValue(
+    currentMetadata.unique_payment_number
+  );
+  const incomingUniquePaymentNumber = normalizePaymentIdentityValue(
+    incomingMetadata.unique_payment_number
+  );
+  const incomingOrderPaymentId = normalizePaymentIdentityValue(
+    incoming.order_payment_id
+  );
+  const incomingFallbackPrefix = incomingOrderPaymentId ? `os-fallback:payment:order-payment:${incomingOrderPaymentId}` : null;
+  const incomingUsesDerivedUniquePaymentNumber = Boolean(
+    incomingUniquePaymentNumber && incomingFallbackPrefix && (incomingUniquePaymentNumber === incomingFallbackPrefix || incomingUniquePaymentNumber.startsWith(`${incomingFallbackPrefix}:conflict:`))
+  );
+  const transactions = mergeOrderPaymentTransactions(
+    currentMetadata.transactions,
+    incomingMetadata.transactions
+  );
+  return {
+    ...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: {
+      ...currentMetadata,
+      ...incomingMetadata,
+      ...incomingUsesDerivedUniquePaymentNumber && currentUniquePaymentNumber ? { unique_payment_number: currentUniquePaymentNumber } : {},
+      ...transactions.length > 0 ? { transactions } : {}
+    }
+  };
+}
+function compactOrderPaymentList(payments) {
+  const result = [];
+  for (const payment of payments) {
+    const matchingIndexes = result.flatMap((existing, index) => hasOrderPaymentIdentityOverlap(existing, payment) ? [index] : []);
+    if (matchingIndexes.length === 0) {
+      result.push(mergeOrderPaymentSnapshot({}, payment));
+      continue;
+    }
+    const firstIndex = matchingIndexes[0];
+    let merged = result[firstIndex];
+    for (const index of matchingIndexes.slice(1)) {
+      merged = mergeOrderPaymentSnapshot(merged, result[index]);
+    }
+    result[firstIndex] = mergeOrderPaymentSnapshot(merged, payment);
+    for (const index of matchingIndexes.slice(1).sort((a, b) => b - a)) {
+      result.splice(index, 1);
+    }
+  }
+  return result;
+}
+function mergeOrderPaymentListsByIdentity(existing, incoming, options = {}) {
+  const existingList = compactOrderPaymentList([...existing || []]);
+  const incomingList = compactOrderPaymentList([...incoming || []]);
+  if (options.preserveUnmatchedExisting) {
+    return compactOrderPaymentList([...existingList, ...incomingList]);
+  }
+  const mergedIncoming = incomingList.map((incomingPayment) => {
+    const matchingExisting = existingList.filter((existingPayment) => hasOrderPaymentIdentityOverlap(existingPayment, incomingPayment));
+    return matchingExisting.reduce(
+      (merged, existingPayment) => mergeOrderPaymentSnapshot(existingPayment, merged),
+      incomingPayment
+    );
+  });
+  const preservedExisting = options.preserveUnmatchedExistingWhen ? existingList.filter((existingPayment) => {
+    var _a;
+    return !incomingList.some((incomingPayment) => hasOrderPaymentIdentityOverlap(existingPayment, incomingPayment)) && ((_a = options.preserveUnmatchedExistingWhen) == null ? void 0 : _a.call(options, existingPayment));
+  }) : [];
+  return compactOrderPaymentList([...mergedIncoming, ...preservedExisting]);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ensureOrderPaymentNumber,
+  getOrderPaymentIdentityKeys,
+  hasOrderPaymentIdentityOverlap,
+  isIdentifiedPendingOrderPayment,
+  isPendingOrderPayment,
+  mergeOrderPaymentListsByIdentity,
+  mergeOrderPaymentRecord,
+  mergeOrderPaymentSnapshot,
+  mergeOrderPaymentTransactions,
+  resolveOrderPaymentIdentity
+});

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

@@ -198,6 +198,7 @@ export interface OrderProduct extends OrderProductIdentity {
     product_bundle: any[];
     booking_uid?: string;
     product_title?: OrderLocalizedText;
+    product_cover?: string;
     metadata: Record<string, any>;
     note?: string;
 }
@@ -308,6 +309,7 @@ export interface OrderState {
     lastOrderInfo?: Record<string, any>;
     syncState?: OrderSyncState;
     discountList: any[];
+    availableWalletIds?: number[];
     discount: DiscountModule | null;
     rules: RulesModule | null;
 }
@@ -340,6 +342,19 @@ export interface UpdateOrderProductParams {
      * });
      */
     allow_booking_reprice?: boolean;
+    /**
+     * Change time 重报价后，允许当前预约商品行重新应用已选编辑态折扣卡。
+     *
+     * @example
+     * await order.updateOrderProduct({
+     *   product_id: 1,
+     *   product_variant_id: 0,
+     *   updates: { discount_list: [] },
+     *   booking: { duration: 2 },
+     *   allow_booking_discount_reapply: true,
+     * });
+     */
+    allow_booking_discount_reapply?: boolean;
 }
 /** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
 export interface UpdateOrderProductQuantityParams extends OrderProductIdentity {
@@ -453,6 +468,8 @@ export interface SubmitSalesOrderParams {
 export interface PaymentItemData {
     /** 当前支付项的唯一 ID */
     uuid: string;
+    /** 支付项稳定唯一号 */
+    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string;
     /** 支付类型代码 */
@@ -475,13 +492,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;
@@ -508,6 +534,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;
@@ -658,6 +693,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: {
@@ -715,11 +758,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;
@@ -761,6 +808,7 @@ export interface OrderModuleAPI {
         apply?: boolean;
     }) => Promise<Discount[]>;
     getDiscountList: () => Discount[];
+    getAvailableWalletIds: () => number[];
     applyDiscount: () => void;
     /**
      * 注入促销评估器。

package/lib/modules/Order/utils/orderCollectionIdentity.d.ts

@@ -0,0 +1,53 @@
+export type OrderCollectionKind = 'product' | 'booking' | 'payment';
+export interface OrderCollectionIdentityStats {
+    backfilledUidCount: number;
+    collapsedDuplicateCount: number;
+    uidConflictCount: number;
+    anonymousRowCount: number;
+}
+export interface OrderCollectionUidRemap {
+    kind: OrderCollectionKind;
+    from: string;
+    to: string;
+    persistentId: string | null;
+    /** 默认全局迁移；UID 冲突时只能迁移能由另一侧 UID 明确定位的引用。 */
+    scope?: 'global' | 'linked-owner';
+    referenceOwnerUid?: string | null;
+}
+export interface NormalizeOrderCollectionResult<T> {
+    items: T[];
+    stats: OrderCollectionIdentityStats;
+    uidRemaps: OrderCollectionUidRemap[];
+}
+export interface NormalizeOrderCollectionsResult<T> {
+    order: T;
+    stats: Record<OrderCollectionKind, OrderCollectionIdentityStats>;
+    uidRemaps: OrderCollectionUidRemap[];
+}
+export declare function createUuidV4(): string;
+export declare function isBlankOrderCollectionIdentity(value: unknown): boolean;
+export declare function getOrderCollectionPersistentId(kind: OrderCollectionKind, item: unknown): string | null;
+export declare function getOrderCollectionUid(kind: OrderCollectionKind, item: unknown): string | null;
+export declare function buildOrderCollectionFallbackUid(kind: OrderCollectionKind, persistentId: string | number): string;
+export declare function getOrderCollectionReferenceUid(kind: OrderCollectionKind, item: unknown): string | null;
+export declare function setOrderCollectionUid<T>(kind: OrderCollectionKind, item: T, uid: string): T;
+/**
+ * 持久化行 ID 是服务端事实主键；只有至少一侧尚未持久化时，才允许用 runtime UID 对齐。
+ */
+export declare function isSameOrderCollectionItem(kind: OrderCollectionKind, left: unknown, right: unknown): boolean;
+export declare function mergeOrderCollectionItems<T>(kind: OrderCollectionKind, currentItem: T, incomingItem: T, options?: {
+    ensureUid?: boolean;
+    createAnonymousUid?: () => string;
+}): T;
+/**
+ * 规范化单一数组：强身份重复时保留首次位置、用最后一条业务字段覆盖，并统一补 UID。
+ */
+export declare function normalizeOrderCollection<T>(kind: OrderCollectionKind, items: T[] | null | undefined, options?: {
+    ensureUid?: boolean;
+    createAnonymousUid?: () => string;
+}): NormalizeOrderCollectionResult<T>;
+export declare function applyOrderCollectionUidRemaps<T extends Record<string, any>>(sourceOrder: T, uidRemaps: OrderCollectionUidRemap[]): T;
+export declare function normalizeOrderCollections<T extends Record<string, any>>(sourceOrder: T, options?: {
+    ensureUid?: boolean;
+    createAnonymousUid?: () => string;
+}): NormalizeOrderCollectionsResult<T>;