@pisell/pisellos 2.3.37 → 2.3.39

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

@@ -394,6 +394,7 @@ export interface CommitOrderParams {
         type: 'virtual' | 'appointment_booking';
         platform?: string;
         extraData?: Record<string, any>;
+        business_code?: string;
     };
 }
 export interface OrderSubmitBooking {
@@ -468,8 +469,6 @@ export interface SubmitSalesOrderParams {
 export interface PaymentItemData {
     /** 当前支付项的唯一 ID */
     uuid: string;
-    /** 支付项稳定唯一号 */
-    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string;
     /** 支付类型代码 */
@@ -492,22 +491,13 @@ 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;
@@ -534,15 +524,6 @@ 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;
@@ -569,6 +550,12 @@ 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;
@@ -693,14 +680,6 @@ 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: {
@@ -731,6 +710,8 @@ export interface OrderModuleAPI {
     setEnableTempOrderPersist: (enabled: boolean) => void;
     /** 是否允许 saveDraft 写入 IndexedDB 草稿。 */
     isTempOrderPersistEnabled: () => boolean;
+    /** 提交 tempOrder 变更并触发 `{moduleName}:changed` 事件 */
+    notifyTempOrderChanged: () => void;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;
@@ -758,15 +739,11 @@ export interface OrderModuleAPI {
     getOrderPayments: () => OrderPaymentData[];
     setOrderPayments: (payments: OrderPaymentSource[]) => OrderPaymentData[];
     addOrderPayment: (payment: OrderPaymentSource) => OrderPaymentData[];
-    addOrderPaymentAsync: (payment: OrderPaymentSource) => Promise<OrderPaymentData[]>;
-    updateOrderPayment: (paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>, options?: OrderPaymentUpdateOptions) => Promise<OrderPaymentUpdateResult>;
+    updateOrderPayment: (paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>) => OrderPaymentData[];
     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/utils/orderCollectionIdentity.js

@@ -209,11 +209,6 @@ 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;
@@ -221,7 +216,7 @@ export function normalizeOrderCollection(kind, items, options) {
       if (!persistentId) stats.anonymousRowCount += 1;
     }
     if (occupiedUids.has(uid)) {
-      var _item2, _item3, _item4, _item5;
+      var _item, _item2, _item3, _item4;
       var replacementUid = persistentId ? allocatePersistentConflictUid(kind, persistentId, occupiedUids) : allocateAnonymousUid(occupiedUids, createAnonymousUid);
       result[index] = setOrderCollectionUid(kind, item, replacementUid);
       uidRemaps.push({
@@ -230,7 +225,7 @@ export function normalizeOrderCollection(kind, items, options) {
         to: replacementUid,
         persistentId: persistentId,
         scope: 'linked-owner',
-        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
+        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
       });
       uid = replacementUid;
       stats.uidConflictCount += 1;

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

@@ -15,6 +15,7 @@ export interface OrderProductsDepositSummary {
     deposit_policy_ids: number[];
     hasDeposit: boolean;
 }
+import type { WindowPlugin } from '../../plugins';
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -177,6 +178,15 @@ 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/dist/modules/Order/utils.js

@@ -20,6 +20,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
 import dayjs from "dayjs";
 import Decimal from 'decimal.js';
+import { getProductHolderConfig } from "../Holder/utils";
 import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
 import { createUuidV4 } from "./utils/orderCollectionIdentity";
 /**
@@ -743,10 +744,41 @@ export var mergeRelationForms = function mergeRelationForms(relationForms) {
     return item.form_record_ids.length > 0;
   }); // 过滤掉没有有效记录的表单
 };
+function getCustomerIdFromStorage(window) {
+  try {
+    var _window$getLocalStora;
+    var customer = JSON.parse((window === null || window === void 0 || (_window$getLocalStora = window.getLocalStorage) === null || _window$getLocalStora === void 0 ? void 0 : _window$getLocalStora.call(window, 'customer')) || '{}');
+    var customerId = Number(customer === null || customer === void 0 ? void 0 : customer.id);
+    return Number.isFinite(customerId) && customerId > 0 ? customerId : undefined;
+  } catch (_unused) {
+    return undefined;
+  }
+}
+
+/**
+ * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
+ */
+export function ensureCartItemOriginHolder(cartItem, window) {
+  var _cartItem$_origin, _cartItem$_productIni;
+  if (cartItem !== null && cartItem !== void 0 && (_cartItem$_origin = cartItem._origin) !== null && _cartItem$_origin !== void 0 && _cartItem$_origin.holder) {
+    return;
+  }
+  var holderConfig = getProductHolderConfig((_cartItem$_productIni = cartItem === null || cartItem === void 0 ? void 0 : cartItem._productInit) !== null && _cartItem$_productIni !== void 0 ? _cartItem$_productIni : cartItem === null || cartItem === void 0 ? void 0 : cartItem._productOrigin);
+  var formRecordId = cartItem === null || cartItem === void 0 ? void 0 : cartItem.holder_id;
+  if (!(holderConfig !== null && holderConfig !== void 0 && holderConfig.resource_id) || formRecordId == null) {
+    return;
+  }
+  cartItem._origin.holder = {
+    customer_id: getCustomerIdFromStorage(window),
+    form_id: holderConfig.resource_id,
+    form_record: [formRecordId]
+  };
+}
+;
 export var getAllDiscountList = function getAllDiscountList(cartItem) {
-  var _cartItem$_origin, _cartItem$_origin2;
-  var discountList = (cartItem === null || cartItem === void 0 || (_cartItem$_origin = cartItem._origin) === null || _cartItem$_origin === void 0 || (_cartItem$_origin = _cartItem$_origin.product) === null || _cartItem$_origin === void 0 ? void 0 : _cartItem$_origin.discount_list) || [];
-  ((cartItem === null || cartItem === void 0 || (_cartItem$_origin2 = cartItem._origin) === null || _cartItem$_origin2 === void 0 || (_cartItem$_origin2 = _cartItem$_origin2.product) === null || _cartItem$_origin2 === void 0 ? void 0 : _cartItem$_origin2.product_bundle) || []).forEach(function (item) {
+  var _cartItem$_origin2, _cartItem$_origin3;
+  var discountList = (cartItem === null || cartItem === void 0 || (_cartItem$_origin2 = cartItem._origin) === null || _cartItem$_origin2 === void 0 || (_cartItem$_origin2 = _cartItem$_origin2.product) === null || _cartItem$_origin2 === void 0 ? void 0 : _cartItem$_origin2.discount_list) || [];
+  ((cartItem === null || cartItem === void 0 || (_cartItem$_origin3 = cartItem._origin) === null || _cartItem$_origin3 === void 0 || (_cartItem$_origin3 = _cartItem$_origin3.product) === null || _cartItem$_origin3 === void 0 ? void 0 : _cartItem$_origin3.product_bundle) || []).forEach(function (item) {
     discountList = [].concat(_toConsumableArray(discountList), _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
     item.discount_list = undefined;
   });
@@ -1047,7 +1079,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  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$customer_i, _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,9 +1125,6 @@ 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,
@@ -1155,7 +1184,9 @@ 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) : {};
-  var paymentNumber = item.payment_number;
+  if (item.uuid && !metadata.unique_payment_number) {
+    metadata.unique_payment_number = String(item.uuid);
+  }
   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];
@@ -1166,10 +1197,8 @@ 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(_objectSpread({}, item.order_payment_id !== undefined ? {
+  return _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,7 +20,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     protected defaultVersion: string;
     request: RequestPlugin;
     private app;
-    private appPlugin;
     private store;
     window: WindowPlugin;
     private dbManager;
@@ -41,7 +40,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
      */
     updateOtherParams(params: Record<string, any>): void;
-    private getPaymentNumberAppData;
     /**
      * 记录信息日志
      */

package/dist/modules/Payment/index.js

@@ -27,9 +27,6 @@ import { CashPaymentImpl } from "./cash";
 import { EftposPaymentImpl } from "./eftpos";
 import { WalletPassPaymentImpl } from "./walletpass";
 import { Decimal } from 'decimal.js';
-import { ensureOrderPaymentNumber } from "../Order/payment-utils";
-import { createUuidV4 } from "../Order/utils";
-import { resolvePaymentNumberDevicePrefix } from "../../utils/payment-number";
 export * from "./types";
 export { generateRequestUniqueId };
 
@@ -105,7 +102,6 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "app", void 0);
     // App instance
-    _defineProperty(_assertThisInitialized(_this), "appPlugin", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
     // WindowPlugin 实例
@@ -172,6 +168,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
+        var appPlugin;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -181,7 +178,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               // 获取依赖的插件
               this.request = core.getPlugin('request');
-              this.appPlugin = core.getPlugin('app');
+              appPlugin = core.getPlugin('app');
               this.window = core.getPlugin('window');
               if (this.request) {
                 _context.next = 8;
@@ -189,13 +186,13 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('支付模块需要 request 插件支持');
             case 8:
-              if (this.appPlugin) {
+              if (appPlugin) {
                 _context.next = 10;
                 break;
               }
               throw new Error('支付模块需要 app 插件支持');
             case 10:
-              this.app = this.appPlugin.getApp();
+              this.app = appPlugin.getApp();
               this.dbManager = this.app.dbManager;
               this.logger = this.app.logger;
 
@@ -231,15 +228,6 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     value: function updateOtherParams(params) {
       this.otherParams = params || {};
     }
-  }, {
-    key: "getPaymentNumberAppData",
-    value: function getPaymentNumberAppData(key) {
-      var _this$appPlugin, _this$appPlugin$getDa, _this$app, _this$app$getStore, _this$app$getStore$ca, _this$app$getStore$ca2;
-      var getData = (_this$appPlugin = this.appPlugin) === null || _this$appPlugin === void 0 || (_this$appPlugin$getDa = _this$appPlugin.getData) === null || _this$appPlugin$getDa === void 0 ? void 0 : _this$appPlugin$getDa.call(_this$appPlugin);
-      if (typeof getData === 'function') return getData(key);
-      var coreData = (_this$app = this.app) === null || _this$app === void 0 || (_this$app = _this$app.models) === null || _this$app === void 0 || (_this$app$getStore = _this$app.getStore) === null || _this$app$getStore === void 0 || (_this$app$getStore$ca = (_this$app$getStore$ca2 = _this$app$getStore.call(_this$app)).getDataByModel) === null || _this$app$getStore$ca === void 0 ? void 0 : _this$app$getStore$ca.call(_this$app$getStore$ca2, 'core', 'core');
-      return coreData === null || coreData === void 0 ? void 0 : coreData[key];
-    }
 
     /**
      * 记录信息日志
@@ -896,8 +884,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(orderUuid, paymentItem) {
-        var _this5 = this;
-        var _paymentItem$metadata, _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, currentTime, hasPaymentNumber, paymentNumberDevicePrefix, paymentNumber, newPaymentItem;
+        var _paymentItem$metadata, _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, currentTime, newPaymentItem;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
@@ -953,29 +940,14 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               });
               throw new Error(warningMessage);
             case 17:
-              paymentUuid = paymentItem.uuid || ((_paymentItem$metadata = paymentItem.metadata) === null || _paymentItem$metadata === void 0 ? void 0 : _paymentItem$metadata.unique_payment_number) || getUniqueId('payment_');
-              currentTime = formatDateTime(new Date());
-              hasPaymentNumber = String(paymentItem.payment_number || '').trim() !== '';
-              if (!hasPaymentNumber) {
-                _context12.next = 24;
-                break;
+              if ((_paymentItem$metadata = paymentItem.metadata) !== null && _paymentItem$metadata !== void 0 && _paymentItem$metadata.unique_payment_number) {
+                paymentUuid = paymentItem.metadata.unique_payment_number;
+              } else {
+                paymentUuid = getUniqueId('payment_');
               }
-              _context12.t0 = 'LOCAL';
-              _context12.next = 27;
-              break;
-            case 24:
-              _context12.next = 26;
-              return resolvePaymentNumberDevicePrefix(function (key) {
-                return _this5.getPaymentNumberAppData(key);
-              });
-            case 26:
-              _context12.t0 = _context12.sent;
-            case 27:
-              paymentNumberDevicePrefix = _context12.t0;
-              paymentNumber = ensureOrderPaymentNumber(paymentItem, paymentNumberDevicePrefix, createUuidV4).payment_number;
+              currentTime = formatDateTime(new Date());
               newPaymentItem = {
                 uuid: paymentUuid,
-                payment_number: paymentNumber,
                 custom_payment_id: normalizeCustomPaymentId(paymentItem),
                 name: paymentItem.name,
                 code: paymentItem.code,
@@ -994,7 +966,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 // 创建时间
                 updated_at: currentTime,
                 // 更新时间
-                metadata: _objectSpread({}, paymentItem.metadata)
+                metadata: _objectSpread(_objectSpread({}, paymentItem.metadata), {}, {
+                  // 保留传入的所有 metadata 字段
+                  unique_payment_number: paymentUuid // 设置唯一支付号为支付项的 uuid
+                })
               };
               order.payment.push(newPaymentItem);
               this.recalculateOrderAmount(order);
@@ -1002,9 +977,9 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 orderUuid: orderUuid,
                 order: order
               });
-              _context12.next = 35;
+              _context12.next = 25;
               return this.dbManager.update('order', order, true);
-            case 35:
+            case 25:
               this.logInfo('更新订单支付项完成', {
                 orderUuid: orderUuid
               });
@@ -1025,22 +1000,22 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 actualPaidAmount: (_newPaymentItem$metad2 = newPaymentItem.metadata) === null || _newPaymentItem$metad2 === void 0 ? void 0 : _newPaymentItem$metad2.actual_paid_amount,
                 changeGivenAmount: (_newPaymentItem$metad3 = newPaymentItem.metadata) === null || _newPaymentItem$metad3 === void 0 ? void 0 : _newPaymentItem$metad3.change_given_amount
               });
-              _context12.next = 45;
+              _context12.next = 35;
               break;
-            case 40:
-              _context12.prev = 40;
-              _context12.t1 = _context12["catch"](1);
-              console.error('[PaymentModule] 添加支付项失败', _context12.t1);
-              this.logError('addPaymentItemAsync failed', _context12.t1, {
+            case 30:
+              _context12.prev = 30;
+              _context12.t0 = _context12["catch"](1);
+              console.error('[PaymentModule] 添加支付项失败', _context12.t0);
+              this.logError('addPaymentItemAsync failed', _context12.t0, {
                 orderUuid: orderUuid,
                 paymentItem: paymentItem
               });
-              throw _context12.t1;
-            case 45:
+              throw _context12.t0;
+            case 35:
             case "end":
               return _context12.stop();
           }
-        }, _callee12, this, [[1, 40]]);
+        }, _callee12, this, [[1, 30]]);
       }));
       function addPaymentItemAsync(_x13, _x14) {
         return _addPaymentItemAsync.apply(this, arguments);
@@ -1160,17 +1135,17 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateVoucherPaymentItemsAsync",
     value: (function () {
       var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(orderUuid, voucherPaymentItems) {
-        var _this6 = this;
+        var _this5 = this;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
               return _context15.abrupt("return", this.runVoucherUpdateLocked(orderUuid, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-                var _this6$normalizeVouch, normalizedVoucherItems, originalCount, normalizedCount, order, existingVoucherItems, _iterator2, _step2, voucherItem, orderAfterDelete, existingActiveVoucherKeys, _iterator3, _step3, _voucherItem, orderPaymentType, key, updatedOrder;
+                var _this5$normalizeVouch, normalizedVoucherItems, originalCount, normalizedCount, order, existingVoucherItems, _iterator2, _step2, voucherItem, orderAfterDelete, existingActiveVoucherKeys, _iterator3, _step3, _voucherItem, orderPaymentType, key, updatedOrder;
                 return _regeneratorRuntime().wrap(function _callee14$(_context14) {
                   while (1) switch (_context14.prev = _context14.next) {
                     case 0:
-                      _this6$normalizeVouch = _this6.normalizeVoucherPaymentItems(voucherPaymentItems), normalizedVoucherItems = _this6$normalizeVouch.items, originalCount = _this6$normalizeVouch.originalCount, normalizedCount = _this6$normalizeVouch.normalizedCount;
-                      _this6.logInfo('Starting updateVoucherPaymentItemsAsync', {
+                      _this5$normalizeVouch = _this5.normalizeVoucherPaymentItems(voucherPaymentItems), normalizedVoucherItems = _this5$normalizeVouch.items, originalCount = _this5$normalizeVouch.originalCount, normalizedCount = _this5$normalizeVouch.normalizedCount;
+                      _this5.logInfo('Starting updateVoucherPaymentItemsAsync', {
                         orderUuid: orderUuid,
                         originalVoucherCount: originalCount,
                         normalizedVoucherCount: normalizedCount,
@@ -1192,7 +1167,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       _context14.prev = 3;
                       _context14.next = 6;
-                      return _this6.getPaymentOrderByUuidAsync(orderUuid);
+                      return _this5.getPaymentOrderByUuidAsync(orderUuid);
                     case 6:
                       order = _context14.sent;
                       if (order) {
@@ -1232,7 +1207,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                       voucherItem = _step2.value;
                       console.log("[PaymentModule] \u5220\u9664\u73B0\u6709\u4EE3\u91D1\u5238\u652F\u4ED8\u9879: ".concat(voucherItem.uuid));
                       _context14.next = 19;
-                      return _this6.deletePaymentAsync(orderUuid, voucherItem.uuid);
+                      return _this5.deletePaymentAsync(orderUuid, voucherItem.uuid);
                     case 19:
                       _context14.next = 14;
                       break;
@@ -1249,7 +1224,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                       return _context14.finish(26);
                     case 29:
                       _context14.next = 31;
-                      return _this6.getPaymentOrderByUuidAsync(orderUuid);
+                      return _this5.getPaymentOrderByUuidAsync(orderUuid);
                     case 31:
                       orderAfterDelete = _context14.sent;
                       if (orderAfterDelete) {
@@ -1296,7 +1271,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                         order_payment_type: orderPaymentType
                       }));
                       _context14.next = 49;
-                      return _this6.addPaymentItemAsync(orderUuid, _voucherItem);
+                      return _this5.addPaymentItemAsync(orderUuid, _voucherItem);
                     case 49:
                       existingActiveVoucherKeys.add(key);
                     case 50:
@@ -1315,17 +1290,17 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                       return _context14.finish(57);
                     case 60:
                       _context14.next = 62;
-                      return _this6.getPaymentOrderByUuidAsync(orderUuid);
+                      return _this5.getPaymentOrderByUuidAsync(orderUuid);
                     case 62:
                       updatedOrder = _context14.sent;
                       _context14.next = 65;
-                      return _this6.core.effects.emit("".concat(_this6.name, ":onPaymentAdded"), {
+                      return _this5.core.effects.emit("".concat(_this5.name, ":onPaymentAdded"), {
                         orderUuid: orderUuid,
                         order: updatedOrder,
                         payment: null // 批量操作不提供单个支付项
                       });
                     case 65:
-                      _this6.logInfo('updateVoucherPaymentItemsAsync completed successfully', {
+                      _this5.logInfo('updateVoucherPaymentItemsAsync completed successfully', {
                         orderUuid: orderUuid,
                         removedVoucherCount: existingVoucherItems.length,
                         addedVoucherCount: normalizedVoucherItems.length,
@@ -1337,7 +1312,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                       _context14.prev = 68;
                       _context14.t2 = _context14["catch"](3);
                       console.error('[PaymentModule] 批量更新代金券支付项失败:', _context14.t2);
-                      _this6.logError('updateVoucherPaymentItemsAsync failed', _context14.t2, {
+                      _this5.logError('updateVoucherPaymentItemsAsync failed', _context14.t2, {
                         orderUuid: orderUuid,
                         voucherPaymentItems: voucherPaymentItems
                       });
@@ -1386,7 +1361,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 return payment.uuid === paymentUuid;
               });
               if (!paymentItem) {
-                _context16.next = 19;
+                _context16.next = 18;
                 break;
               }
               // 如果更新参数中包含 amount，先格式化
@@ -1394,43 +1369,40 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               if ('amount' in formattedParams && formattedParams.amount !== undefined) {
                 formattedParams.amount = formatAmount(formattedParams.amount);
               }
-              if (formattedParams.metadata && _typeof(formattedParams.metadata) === 'object') {
-                formattedParams.metadata = _objectSpread(_objectSpread({}, paymentItem.metadata || {}), formattedParams.metadata);
-              }
               Object.assign(paymentItem, formattedParams);
 
               // 重新计算待付金额
               this.recalculateOrderAmount(order);
 
               // 更新到 IndexDB
-              _context16.next = 15;
+              _context16.next = 14;
               return this.dbManager.update('order', order);
-            case 15:
-              _context16.next = 17;
+            case 14:
+              _context16.next = 16;
               return this.core.effects.emit("".concat(this.name, ":onPaymentUpdated"), {
                 order: order,
                 paymentItem: paymentItem
               });
-            case 17:
-              _context16.next = 19;
+            case 16:
+              _context16.next = 18;
               return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'payment_update',
                 order: order,
                 paymentItem: paymentItem
               });
-            case 19:
-              _context16.next = 25;
+            case 18:
+              _context16.next = 24;
               break;
-            case 21:
-              _context16.prev = 21;
+            case 20:
+              _context16.prev = 20;
               _context16.t0 = _context16["catch"](0);
               console.error('[PaymentModule] 更新支付项失败', _context16.t0);
               throw _context16.t0;
-            case 25:
+            case 24:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, this, [[0, 21]]);
+        }, _callee16, this, [[0, 20]]);
       }));
       function updatePaymentAsync(_x19, _x20, _x21) {
         return _updatePaymentAsync.apply(this, arguments);
@@ -1546,7 +1518,6 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 payments: order.payment.map(function (payment) {
                   return {
                     uuid: payment.uuid,
-                    payment_number: payment.payment_number,
                     amount: payment.amount,
                     code: payment.code,
                     custom_payment_id: payment.custom_payment_id,