@pisell/pisellos 2.2.264 → 2.2.265

package/lib/modules/BookingContext/utils/cacheItemToBookingInput.js

@@ -88,6 +88,24 @@ function resolveDurationMinutes(value) {
   const n = Number(value);
   return Number.isNaN(n) ? void 0 : n;
 }
+function normalizeChildResource(child, parentFormId) {
+  const item = {
+    form_id: (child == null ? void 0 : child.form_id) ?? parentFormId,
+    relation_type: (child == null ? void 0 : child.relation_type) || "form",
+    relation_id: (child == null ? void 0 : child.relation_id) ?? (child == null ? void 0 : child.id),
+    capacity: child == null ? void 0 : child.capacity,
+    like_status: (child == null ? void 0 : child.like_status) || "common"
+  };
+  if ((child == null ? void 0 : child.metadata) !== void 0) {
+    item.metadata = { ...child.metadata };
+  }
+  if (Array.isArray(child == null ? void 0 : child.children)) {
+    item.children = child.children.map(
+      (nestedChild) => normalizeChildResource(nestedChild, item.form_id)
+    );
+  }
+  return item;
+}
 function flattenResources(cacheItem) {
   var _a;
   const resourceMap = ((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.resource) || {};
@@ -107,8 +125,11 @@ function flattenResources(cacheItem) {
       if ((r == null ? void 0 : r.metadata) !== void 0) {
         item.metadata = { ...r.metadata };
       }
-      if ((r == null ? void 0 : r.children) !== void 0)
-        item.children = r.children;
+      if (Array.isArray(r == null ? void 0 : r.children)) {
+        item.children = r.children.map(
+          (child) => normalizeChildResource(child, item.form_id)
+        );
+      }
       result.push(item);
     });
   });

package/lib/modules/Discount/index.d.ts

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Discount, DiscountModuleAPI, DiscountWithReason } from './types';
+import { Discount, DiscountModuleAPI, DiscountWithReason, DiscountPrepareConfigResult } from './types';
 export declare class DiscountModule extends BaseModule implements Module, DiscountModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -16,15 +16,18 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     getDiscountList(): Discount[];
     setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
     getOriginalDiscountList(): Discount[];
+    private normalizePositiveNumberIds;
     loadPrepareConfig(params: {
         action?: 'create' | 'edit';
         with_good_pass: 0 | 1;
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
+        with_available_wallet_flag?: 0 | 1;
+        with_available_wallet_pass_flag?: 0 | 1;
         request_timezone: string;
         order_id?: number | string;
-    }): Promise<Discount[]>;
+    }): Promise<DiscountPrepareConfigResult>;
     batchSearch(code: string, options?: {
         customerId?: number;
         orderId?: number;

package/lib/modules/Discount/index.js

@@ -91,23 +91,43 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   getOriginalDiscountList() {
     return this.store.originalDiscountList || [];
   }
+  normalizePositiveNumberIds(values) {
+    const ids = values.map((value) => Number(value)).filter((value) => Number.isFinite(value) && value > 0);
+    return Array.from(new Set(ids));
+  }
   async loadPrepareConfig(params) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     if (typeof params.order_id === "string" && params.order_id.startsWith("LOCAL_")) {
       params.order_id = void 0;
     }
     const prepareConfig = await this.request.post(
       `/order/prepare/config`,
-      params
+      {
+        ...params,
+        with_available_wallet_flag: params.with_available_wallet_flag ?? 1,
+        with_available_wallet_pass_flag: params.with_available_wallet_pass_flag ?? 1
+      }
     );
     const rawDiscountList = [
       ...((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || [],
       ...((_b = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _b.discount_card_list) || []
     ];
+    const availableWalletList = [
+      ...((_c = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _c.avaiable_wallet_list) || [],
+      ...((_d = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _d.available_wallet_list) || []
+    ];
+    const availableWalletPassList = ((_e = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _e.available_wallet_pass_list) || [];
+    const availableWalletIds = this.normalizePositiveNumberIds([
+      ...availableWalletList.map((item) => item == null ? void 0 : item.wallet_id),
+      ...availableWalletPassList.map((item) => item == null ? void 0 : item.product_id)
+    ]);
     const goodPassList = this.filterEnabledDiscountList(
       rawDiscountList
     ) || [];
-    return goodPassList;
+    return {
+      discountList: goodPassList,
+      availableWalletIds
+    };
   }
   async batchSearch(code, options) {
     const { customerId, orderId } = options || {};

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

@@ -68,6 +68,10 @@ export interface DiscountWithReason {
     discountList: Discount[];
     unavailableReasonKey: DiscountFilterRejectKey | null;
 }
+export interface DiscountPrepareConfigResult {
+    discountList: Discount[];
+    availableWalletIds: number[];
+}
 interface ExtensionData {
     id: number;
     shop_id: number;

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

@@ -3,7 +3,7 @@ import { BaseModule } from '../BaseModule';
 import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CheckoutOrderParams, CancelOrderParams, ChangeBookingStatusParams } from './types';
 import { CartItem } from '../Cart/types';
 import { type SubmitPayloadEnhancer } from './utils';
-import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from './types';
+import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from './types';
 import type { ICustomer } from '../AccountList/types';
 import type { Discount } from '../Discount/types';
 import { UnavailableReason } from '../Rules/types';
@@ -14,6 +14,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private request;
     private logger;
     private window;
+    private appPlugin;
     private cacheId;
     private salesSummaryModuleName;
     private rulesHooksOverride?;
@@ -75,6 +76,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         apply?: boolean;
     }): Promise<Discount[]>;
     getDiscountList(): Discount[];
+    getAvailableWalletIds(): number[];
+    private syncScannedDiscountsToOriginalDiscountList;
     private ensureEditDiscountConfigForProductChange;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
@@ -84,7 +87,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         unavailableReasonKey?: string | null;
         scannedDiscountList?: Discount[];
     }>;
-    applyDiscount(): void;
+    applyDiscount(options?: {
+        reapplyBookingDiscountProductUids?: string[];
+    }): void;
     /**
      * 注入促销评估器。
      *
@@ -152,6 +157,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private extractOrderIdFromSubmitResult;
     private calculatePaymentEffectiveAmount;
     private calculatePaymentTotal;
+    private calculateOrderPaidPaymentTotal;
     private getDepositAmount;
     private normalizeDepositAmount;
     private getLastOrderDepositSnapshot;
@@ -171,6 +177,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     };
     private calculateDepositPaidAmount;
     private resolveNextOrderPaymentType;
+    private getPaymentNumberAppData;
+    private getPaymentNumberDevicePrefixSync;
+    private getPaymentNumberDevicePrefixAsync;
     private normalizePaymentSource;
     private updateTempOrderPaymentStatus;
     private shouldKeepPaymentStatusAfterAmountRecalc;
@@ -180,6 +189,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaidPaymentSummary;
     private calculatePaymentServiceFee;
     private calculatePaymentGapAmount;
+    private calculatePaymentOrderAmount;
     private calculatePaymentRoundingAmount;
     private formatSummaryMetadataMoney;
     private syncSummaryProductMetadata;
@@ -274,6 +284,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     private buildTempOrderCustomer;
     private isCustomerBoundDiscount;
+    private shouldKeepCustomerBoundDiscountAfterCustomerChange;
     private productHasCustomerBoundDiscount;
     private shouldSkipDiscountCalculation;
     private clearCustomerBoundDiscounts;
@@ -300,19 +311,20 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * 用一组支付来源覆盖当前订单支付项。
      *
      * 入参允许来自 PaymentModule 的 PaymentItem，内部统一映射为 Sales 协议：
-     * uuid -> metadata.unique_payment_number，id -> custom_payment_id，
+     * 新支付来源的 uuid 会作为 payment_number 的唯一号段，id -> custom_payment_id，
      * isSynced 等运行态字段不会进入 tempOrder.payments。
      */
     setOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
-    /** 追加单个支付项，并立即持久化当前 tempOrder。 */
+    /** 同步兼容入口：按调用当下的 device_id 或 LOCAL 生成支付编号。 */
     addOrderPayment(payment: OrderPaymentSource): OrderPaymentData[];
+    /** 异步入口：创建支付项时读取最新 IoT 设备短号。 */
+    addOrderPaymentAsync(payment: OrderPaymentSource): Promise<OrderPaymentData[]>;
+    private addOrderPaymentWithDevicePrefix;
     /**
-     * 按支付唯一号、后端支付 ID、自定义支付方式 ID 或旧 uuid 更新支付项。
-     *
-     * 该方法服务 PaymentModal 的 void / 编辑场景；更新 metadata 时会做浅合并，
-     * 避免覆盖 unique_payment_number、现金实付/找零等已有元数据。
+     * 默认按支付唯一号精确更新；仅显式指定 legacy 时兼容历史支付标识。
+     * metadata 与 transactions 会分别合并，避免覆盖支付会话号和已有交易记录。
      */
-    updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>): OrderPaymentData[];
+    updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>, options?: OrderPaymentUpdateOptions): Promise<OrderPaymentUpdateResult>;
     /** 从当前订单支付项中移除指定支付项。 */
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
     private confirmPendingVoucherPaymentsInList;
@@ -335,7 +347,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
         status?: 'paid' | 'payment_pending';
+        devicePrefix?: string;
     }): OrderPaymentData[];
+    updateVoucherOrderPaymentsAsync(payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }): Promise<OrderPaymentData[]>;
     private shouldMergeProductToOrder;
     private hasOrderProductLineNote;
     /**
@@ -420,6 +436,14 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         type?: string;
     }): import("./types").OrderSubmitPayload;
     applyLocalPrintOrderNumbers(order?: Record<string, any> | null): Promise<OrderTempOrder>;
+    saveTempOrderAsDraft<T = any>(params?: {
+        cacheId?: string;
+        platform?: string;
+        businessCode?: string;
+        channel?: string;
+        type?: string;
+        enhancePayload?: SubmitPayloadEnhancer;
+    }): Promise<T>;
     /**
      * 提交当前 Sales tempOrder。
      *
@@ -461,7 +485,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;
@@ -518,7 +542,14 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * this.normalizeHydratedBookingHolder({ metadata: { holder: { form_record: [1] } } });
      */
     private normalizeHydratedBookingHolder;
+    /**
+     * 匿名 booking 没有服务端行 ID 时，商品侧已有的 booking_uid 就是唯一可用的强引用。
+     * 在统一规范化生成 UUID 前先复用它；已落库 booking 仍按 schedule_event_id 派生稳定 UID。
+     */
+    private seedAnonymousBookingUidsFromProducts;
     private normalizeTempOrderForRuntime;
+    private isSyntheticDraftOrderIdForRuntime;
+    private withoutSyntheticDraftOrderIdForRuntime;
     private hydrateLinkedBookingIdentity;
     private pickHydratedDisplayText;
     private formatHydratedNamePair;