@pisell/pisellos 2.3.39 → 2.3.41

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

@@ -394,7 +394,6 @@ export interface CommitOrderParams {
         type: 'virtual' | 'appointment_booking';
         platform?: string;
         extraData?: Record<string, any>;
-        business_code?: string;
     };
 }
 export interface OrderSubmitBooking {
@@ -469,6 +468,8 @@ export interface SubmitSalesOrderParams {
 export interface PaymentItemData {
     /** 当前支付项的唯一 ID */
     uuid: string;
+    /** 支付项稳定唯一号 */
+    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string;
     /** 支付类型代码 */
@@ -491,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;
@@ -524,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;
@@ -550,12 +569,6 @@ export interface SyncPaymentsToOrderParams {
     payments: OrderPaymentSource[];
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
-    /**
-     * Whether the checkout should be queued as the local `sync_sales` task.
-     * Defaults to true to preserve the WebPOS retry path. Set to false when
-     * the caller must wait for the cloud checkout response before proceeding.
-     */
-    checkoutSyncTaskEnabled?: boolean;
     smallTicketDataFlag?: number;
     businessCode?: string;
     channel?: string;
@@ -680,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: {
@@ -710,8 +731,6 @@ export interface OrderModuleAPI {
     setEnableTempOrderPersist: (enabled: boolean) => void;
     /** 是否允许 saveDraft 写入 IndexedDB 草稿。 */
     isTempOrderPersistEnabled: () => boolean;
-    /** 提交 tempOrder 变更并触发 `{moduleName}:changed` 事件 */
-    notifyTempOrderChanged: () => void;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;
@@ -739,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;

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

@@ -220,6 +220,9 @@ function normalizeOrderCollection(kind, items, options) {
     const persistentId = getOrderCollectionPersistentId(kind, item);
     let uid = getOrderCollectionUid(kind, item);
     if (!uid) {
+      if (kind === "payment" && !isBlankOrderCollectionIdentity(item == null ? void 0 : item.payment_number)) {
+        continue;
+      }
       uid = persistentId ? buildOrderCollectionFallbackUid(kind, persistentId) : allocateAnonymousUid(occupiedUids, createAnonymousUid);
       item = setOrderCollectionUid(kind, item, uid);
       result[index] = item;

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

@@ -15,7 +15,6 @@ export interface OrderProductsDepositSummary {
     deposit_policy_ids: number[];
     hasDeposit: boolean;
 }
-import type { WindowPlugin } from '../../plugins';
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -178,15 +177,6 @@ export declare const mergeRelationForms: (relationForms: {
     form_id: number;
     form_record_ids: number[];
 }[];
-export interface CartOrderHolder {
-    customer_id?: number;
-    form_id: number | string;
-    form_record: (number | string)[] | null;
-}
-/**
- * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
- */
-export declare function ensureCartItemOriginHolder(cartItem: CartItem, window?: WindowPlugin): void;
 export declare const getAllDiscountList: (cartItem: CartItem) => any;
 export { createUuidV4 };
 export declare function isTempOrder(data: any): data is OrderTempOrder;

package/lib/modules/Order/utils.js

@@ -36,9 +36,8 @@ __export(utils_exports, {
   composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
-  createEmptySummary: () => import_utils3.createEmptySummary,
+  createEmptySummary: () => import_utils2.createEmptySummary,
   createUuidV4: () => import_orderCollectionIdentity.createUuidV4,
-  ensureCartItemOriginHolder: () => ensureCartItemOriginHolder,
   ensureManualProductDiscountList: () => import_manualProductDiscount.ensureManualProductDiscountList,
   ensureProductSku: () => ensureProductSku,
   findManualProductDiscountItem: () => import_manualProductDiscount.findManualProductDiscountItem,
@@ -86,10 +85,9 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
-var import_utils = require("../Holder/utils");
-var import_utils2 = require("../../solution/ScanOrder/utils");
+var import_utils = require("../../solution/ScanOrder/utils");
 var import_orderCollectionIdentity = require("./utils/orderCollectionIdentity");
-var import_utils3 = require("../../solution/ScanOrder/utils");
+var import_utils2 = require("../../solution/ScanOrder/utils");
 var import_manualProductDiscount = require("./utils/manualProductDiscount");
 function composeLinePrice(params) {
   const { mainPrice, bundle, useOriginalBundle } = params;
@@ -446,7 +444,12 @@ function resolveEffectivePerUnitDiscount(product) {
     (sum, discount) => sum + Number((discount == null ? void 0 : discount.amount) || 0),
     0
   );
-  const hasPromoDiscountItem = discountList.some((item) => (item == null ? void 0 : item.type) === "promotion");
+  const hasPromoDiscountItem = discountList.some(
+    (item) => {
+      var _a, _b;
+      return (item == null ? void 0 : item.type) === "promotion" || (item == null ? void 0 : item.type) === "product" && ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.actionType) === "ITEM_REWARD";
+    }
+  );
   if (hasPromoDiscountItem)
     return fromList;
   const metadata = (product == null ? void 0 : product.metadata) || {};
@@ -543,7 +546,7 @@ function createDefaultOrderRulesHooks() {
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
         // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
-        _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils2.buildProductLineFingerprint)(
+        _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
           getProductSkuOptions(product),
           product.product_bundle
         )}`,
@@ -635,34 +638,6 @@ var mergeRelationForms = (relationForms) => {
     }, {})
   ).filter((item) => item.form_record_ids.length > 0);
 };
-function getCustomerIdFromStorage(window) {
-  var _a;
-  try {
-    const customer = JSON.parse(((_a = window == null ? void 0 : window.getLocalStorage) == null ? void 0 : _a.call(window, "customer")) || "{}");
-    const customerId = Number(customer == null ? void 0 : customer.id);
-    return Number.isFinite(customerId) && customerId > 0 ? customerId : void 0;
-  } catch {
-    return void 0;
-  }
-}
-function ensureCartItemOriginHolder(cartItem, window) {
-  var _a;
-  if ((_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.holder) {
-    return;
-  }
-  const holderConfig = (0, import_utils.getProductHolderConfig)(
-    (cartItem == null ? void 0 : cartItem._productInit) ?? (cartItem == null ? void 0 : cartItem._productOrigin)
-  );
-  const formRecordId = cartItem == null ? void 0 : cartItem.holder_id;
-  if (!(holderConfig == null ? void 0 : holderConfig.resource_id) || formRecordId == null) {
-    return;
-  }
-  cartItem._origin.holder = {
-    customer_id: getCustomerIdFromStorage(window),
-    form_id: holderConfig.resource_id,
-    form_record: [formRecordId]
-  };
-}
 var getAllDiscountList = (cartItem) => {
   var _a, _b, _c, _d;
   let discountList = ((_b = (_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
@@ -995,6 +970,9 @@ function buildSubmitPayload(params) {
     ...tempOrderRest,
     customer_id: tempOrder.customer_id ?? 1,
     customer_name: tempOrder.customer_name || "Walk-In",
+    country_calling_code: String(tempOrder.country_calling_code ?? ""),
+    phone: String(tempOrder.phone ?? ""),
+    email: String(tempOrder.email ?? ""),
     order_number: tempOrder.order_number ?? null,
     shop_order_number: tempOrder.shop_order_number ?? null,
     shop_full_order_number: tempOrder.shop_full_order_number ?? null,
@@ -1025,7 +1003,7 @@ function buildSubmitPayload(params) {
     // contacts: tempOrder.contacts || [],
     contacts_info: tempOrder.contacts_info && !Array.isArray(tempOrder.contacts_info) ? tempOrder.contacts_info : null,
     // holder: tempOrder.holder || null,
-    summary: summary || tempOrder.summary || (0, import_utils2.createEmptySummary)(),
+    summary: summary || tempOrder.summary || (0, import_utils.createEmptySummary)(),
     metadata: (() => {
       const {
         collect_pax: _collectPax,
@@ -1050,9 +1028,7 @@ function mapPaymentItemToOrderPayment(paymentItem) {
   const item = paymentItem;
   const customPaymentId = item.custom_payment_id ?? item.id;
   const metadata = item.metadata && typeof item.metadata === "object" ? { ...item.metadata } : {};
-  if (item.uuid && !metadata.unique_payment_number) {
-    metadata.unique_payment_number = String(item.uuid);
-  }
+  const paymentNumber = item.payment_number;
   const paymentMetadataKeys = [
     "rounding_rule",
     "shop_wallet_pass_id",
@@ -1069,6 +1045,7 @@ function mapPaymentItemToOrderPayment(paymentItem) {
   const createdAt = item.created_at ?? timestamp;
   return {
     ...item.order_payment_id !== void 0 ? { order_payment_id: item.order_payment_id } : {},
+    ...paymentNumber !== void 0 && paymentNumber !== null && paymentNumber !== "" ? { payment_number: String(paymentNumber) } : {},
     amount: String(item.amount ?? "0.00"),
     code: String(item.code || ""),
     custom_payment_id: Number(customPaymentId ?? 0),
@@ -1275,7 +1252,6 @@ function indexOrderProductsByUid(products) {
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
-  ensureCartItemOriginHolder,
   ensureManualProductDiscountList,
   ensureProductSku,
   findManualProductDiscountItem,

package/lib/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;
     /**
      * 记录信息日志
      */

package/lib/modules/Payment/index.js

@@ -31,6 +31,9 @@ var import_cash = require("./cash");
 var import_eftpos = require("./eftpos");
 var import_walletpass = require("./walletpass");
 var import_decimal = require("decimal.js");
+var import_payment_utils = require("../Order/payment-utils");
+var import_utils2 = require("../Order/utils");
+var import_payment_number = require("../../utils/payment-number");
 __reExport(Payment_exports, require("./types"), module.exports);
 function formatAmount(amount) {
   try {
@@ -112,15 +115,15 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.store = options.store;
     this.otherParams = options.otherParams || {};
     this.request = core.getPlugin("request");
-    const appPlugin = core.getPlugin("app");
+    this.appPlugin = core.getPlugin("app");
     this.window = core.getPlugin("window");
     if (!this.request) {
       throw new Error("支付模块需要 request 插件支持");
     }
-    if (!appPlugin) {
+    if (!this.appPlugin) {
       throw new Error("支付模块需要 app 插件支持");
     }
-    this.app = appPlugin.getApp();
+    this.app = this.appPlugin.getApp();
     this.dbManager = this.app.dbManager;
     this.logger = this.app.logger;
     this.registerNetworkHandlers();
@@ -136,6 +139,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   updateOtherParams(params) {
     this.otherParams = params || {};
   }
+  getPaymentNumberAppData(key) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    const getData = (_b = (_a = this.appPlugin) == null ? void 0 : _a.getData) == null ? void 0 : _b.call(_a);
+    if (typeof getData === "function")
+      return getData(key);
+    const coreData = (_g = (_e = (_d = (_c = this.app) == null ? void 0 : _c.models) == null ? void 0 : _d.getStore) == null ? void 0 : (_f = _e.call(_d)).getDataByModel) == null ? void 0 : _g.call(_f, "core", "core");
+    return coreData == null ? void 0 : coreData[key];
+  }
   /**
    * 记录信息日志
    */
@@ -521,15 +532,20 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         });
         throw new Error(warningMessage);
       }
-      let paymentUuid;
-      if ((_a = paymentItem.metadata) == null ? void 0 : _a.unique_payment_number) {
-        paymentUuid = paymentItem.metadata.unique_payment_number;
-      } else {
-        paymentUuid = (0, import_utils.getUniqueId)("payment_");
-      }
+      const paymentUuid = paymentItem.uuid || ((_a = paymentItem.metadata) == null ? void 0 : _a.unique_payment_number) || (0, import_utils.getUniqueId)("payment_");
       const currentTime = formatDateTime(/* @__PURE__ */ new Date());
+      const hasPaymentNumber = String(paymentItem.payment_number || "").trim() !== "";
+      const paymentNumberDevicePrefix = hasPaymentNumber ? "LOCAL" : await (0, import_payment_number.resolvePaymentNumberDevicePrefix)(
+        (key) => this.getPaymentNumberAppData(key)
+      );
+      const paymentNumber = (0, import_payment_utils.ensureOrderPaymentNumber)(
+        paymentItem,
+        paymentNumberDevicePrefix,
+        import_utils2.createUuidV4
+      ).payment_number;
       const newPaymentItem = {
         uuid: paymentUuid,
+        payment_number: paymentNumber,
         custom_payment_id: normalizeCustomPaymentId(paymentItem),
         name: paymentItem.name,
         code: paymentItem.code,
@@ -549,10 +565,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         updated_at: currentTime,
         // 更新时间
         metadata: {
-          ...paymentItem.metadata,
+          ...paymentItem.metadata
           // 保留传入的所有 metadata 字段
-          unique_payment_number: paymentUuid
-          // 设置唯一支付号为支付项的 uuid
         }
       };
       order.payment.push(newPaymentItem);
@@ -767,6 +781,12 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         if ("amount" in formattedParams && formattedParams.amount !== void 0) {
           formattedParams.amount = formatAmount(formattedParams.amount);
         }
+        if (formattedParams.metadata && typeof formattedParams.metadata === "object") {
+          formattedParams.metadata = {
+            ...paymentItem.metadata || {},
+            ...formattedParams.metadata
+          };
+        }
         Object.assign(paymentItem, formattedParams);
         this.recalculateOrderAmount(order);
         await this.dbManager.update("order", order);
@@ -824,6 +844,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       const paymentData = {
         payments: order.payment.map((payment) => ({
           uuid: payment.uuid,
+          payment_number: payment.payment_number,
           amount: payment.amount,
           code: payment.code,
           custom_payment_id: payment.custom_payment_id,
@@ -1067,7 +1088,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           roundedValue = this.standardRound(baseValue, true);
           break;
         case import_types.RoundingRule.StandardDown:
-        case "standard_down":
+        case "standard_rounding_midpoint_down":
           roundedValue = this.standardRound(baseValue, false);
           break;
         case import_types.RoundingRule.AlwaysUp: