@pisell/pisellos 2.3.29 → 2.3.31

package/lib/modules/Order/utils.js

@@ -1020,9 +1020,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",
@@ -1039,6 +1037,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),

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,

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

@@ -87,12 +87,30 @@ export interface PaymentMethod {
     /** 其他配置信息 */
     [key: string]: any;
 }
+/** 支付项扩展元数据 */
+export interface PaymentItemMetadata {
+    /** 钱箱 ID */
+    shop_wallet_pass_id?: string;
+    /** 三方支付交易流水号 */
+    unique_payment_number?: string;
+    /** 刷卡机设备快照；PaymentModule 不解析内部字段 */
+    card_reader_snapshot?: Record<string, unknown>;
+    /** rounding 规则 */
+    rounding_rule?: any;
+    /** 实付金额（现金支付时的实际给出金额） */
+    actual_paid_amount?: number;
+    /** 找零金额（现金支付时的找零金额） */
+    change_given_amount?: number;
+    [key: string]: unknown;
+}
 /**
  * 支付项
  */
 export interface PaymentItem {
     /** 当前支付项的唯一 ID */
     uuid: string;
+    /** 支付项稳定唯一号 */
+    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string;
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -110,18 +128,7 @@ export interface PaymentItem {
     /** Wallet Pass 本次使用值 */
     wallet_pass_use_value?: string | number | null;
     /** 拓展参数字段 */
-    metadata?: {
-        /** 钱箱 ID */
-        shop_wallet_pass_id?: string;
-        /** 唯一支付号 */
-        unique_payment_number?: string;
-        /** rouding规则 */
-        rounding_rule?: any;
-        /** 实付金额（现金支付时的实际给出金额） */
-        actual_paid_amount?: number;
-        /** 找零金额（现金支付时的找零金额） */
-        change_given_amount?: number;
-    };
+    metadata?: PaymentItemMetadata;
     /** rouding金额 */
     rounding_amount?: string;
     /** 三方支付手续费 */
@@ -228,6 +235,10 @@ export interface UpdateOrderParams {
  * 支付项输入类型（允许 amount 为数字）
  */
 export interface PaymentItemInput {
+    /** 调用方已有的支付项运行态 UUID；存在时复用为 payment_number 的唯一号段 */
+    uuid?: string;
+    /** 支付项稳定唯一号 */
+    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string | number;
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -256,18 +267,7 @@ export interface PaymentItemInput {
     /** 订单支付类型 */
     order_payment_type?: 'normal' | 'deposit';
     /** 扩展参数字段 */
-    metadata?: {
-        /** 钱箱 ID */
-        shop_wallet_pass_id?: string;
-        /** 唯一支付号 */
-        unique_payment_number?: string;
-        /** rounding规则 */
-        rounding_rule?: any;
-        /** 实付金额（现金支付时的实际给出金额） */
-        actual_paid_amount?: number;
-        /** 找零金额（现金支付时的找零金额） */
-        change_given_amount?: number;
-    };
+    metadata?: PaymentItemMetadata;
     /** 支付项创建时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
     created_at?: string;
     /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
@@ -302,6 +302,8 @@ export interface PaymentUpdateFields {
     voucher_id?: string;
     /** 该支付项是否已经同步给后端服务器（只有网络请求成功后才为true） */
     isSynced?: boolean;
+    /** 支付项扩展元数据；更新时与原 metadata 浅合并 */
+    metadata?: PaymentItemMetadata;
     /** 同步错误信息（业务错误时记录错误信息，用于区分"未同步"和"同步失败"） */
     syncError?: {
         error: string;

package/lib/server/index.d.ts

@@ -57,6 +57,7 @@ declare class Server {
     private readonly BOOKING_REMOTE_CACHE_MAX_ENTRIES;
     private salesSearchSubscribers;
     private deviceTaskActionsRegistered;
+    private localPaymentUpdateQueues;
     private floorPlanQuerySubscribers;
     private moduleRegistry;
     constructor(core: PisellCore);
@@ -453,6 +454,18 @@ declare class Server {
      */
     private handleUpdateLocalOrder;
     private handleOrderSalesCheckout;
+    private handleOrderSalesDraft;
+    private createLocalPaymentOperationId;
+    private buildLocalPaymentOrderLogContext;
+    private isValidLocalPaymentDecimal;
+    private getInvalidLocalPaymentSurchargeFields;
+    private buildLocalPaymentSurchargeUpdate;
+    private handleGetLocalPayment;
+    private handleUpdateLocalPayment;
+    private runLocalPaymentUpdateInQueue;
+    private processLocalPaymentUpdate;
+    private processSuccessfulLocalPayment;
+    private sanitizeLocalRecoveryOrder;
     private handleOrderCheckout;
     private getDeviceTaskPlugin;
     private getIdGeneratorPlugin;
@@ -480,6 +493,7 @@ declare class Server {
     private syncMachinecodeRedeemStatusToLocalOrder;
     private handleOrderCheckoutSubmit;
     private handleSyncCheckoutSubmit;
+    private handleOrderDraftSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
     private shouldBuildSmallTicketData;