@pisell/pisellos 0.10.7 → 0.10.9

package/lib/modules/Discount/index.js

@@ -96,7 +96,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     return Array.from(new Set(ids));
   }
   async loadPrepareConfig(params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     if (typeof params.order_id === "string" && params.order_id.startsWith("LOCAL_")) {
       params.order_id = void 0;
     }
@@ -105,7 +105,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       {
         ...params,
         with_available_wallet_flag: params.with_available_wallet_flag ?? 1,
-        with_available_wallet_pass_flag: params.with_available_wallet_pass_flag ?? 1
+        with_available_wallet_pass_flag: params.with_available_wallet_pass_flag ?? 1,
+        with_virtual_currency: params.with_virtual_currency ?? 1
       }
     );
     const rawDiscountList = [
@@ -121,14 +122,47 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       ...availableWalletList.map((item) => item == null ? void 0 : item.wallet_id),
       ...availableWalletPassList.map((item) => item == null ? void 0 : item.product_id)
     ]);
+    const virtualCurrencyList = this.normalizeVirtualCurrencyList(
+      (_f = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _f.virtual_currency_list
+    );
     const goodPassList = this.filterEnabledDiscountList(
       rawDiscountList
     ) || [];
     return {
       discountList: goodPassList,
-      availableWalletIds
+      availableWalletIds,
+      virtualCurrencyList
     };
   }
+  normalizeVirtualCurrencyList(value) {
+    if (!Array.isArray(value))
+      return [];
+    return value.flatMap((item) => {
+      const id = Number(item == null ? void 0 : item.id);
+      const productId = Number(item == null ? void 0 : item.product_id);
+      if (!Number.isFinite(id) || id <= 0 || !Number.isFinite(productId) || productId <= 0) {
+        return [];
+      }
+      const displayExtension = Array.isArray(item == null ? void 0 : item.extension_data) ? item.extension_data.find(
+        (extension) => (extension == null ? void 0 : extension.field_key) === "virtual_currency_display"
+      ) : void 0;
+      let display = displayExtension == null ? void 0 : displayExtension.value;
+      if (typeof display === "string") {
+        try {
+          display = JSON.parse(display);
+        } catch {
+          display = {};
+        }
+      }
+      return [{
+        ...item,
+        id,
+        product_id: productId,
+        balance: String((item == null ? void 0 : item.balance) ?? "0"),
+        virtual_currency_display: display && typeof display === "object" && !Array.isArray(display) ? display : {}
+      }];
+    });
+  }
   async batchSearch(code, options) {
     const { customerId, orderId } = options || {};
     const result = await this.request.get(`/machinecode/batch-search`, {

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

@@ -71,6 +71,17 @@ export interface DiscountWithReason {
 export interface DiscountPrepareConfigResult {
     discountList: Discount[];
     availableWalletIds: number[];
+    virtualCurrencyList?: VirtualCurrencyAsset[];
+}
+export interface VirtualCurrencyAsset extends Record<string, any> {
+    id: number;
+    product_id: number;
+    balance: string;
+    product_name?: string;
+    format_title?: Record<string, any>;
+    code?: string;
+    encoded?: string;
+    virtual_currency_display?: Record<string, any>;
 }
 interface ExtensionData {
     id: number;

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

@@ -3,7 +3,7 @@ import { BaseModule } from '../BaseModule';
 import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CancelOrderParams, ChangeBookingStatusParams, CheckoutOrderParams } 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, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from './types';
+import type { OrderAmountSnapshot, AddProductBookingInput, AddProductToOrderOptions, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions } from './types';
 import type { ICustomer } from '../AccountList/types';
 import type { Discount } from '../Discount/types';
 import { UnavailableReason } from '../Rules/types';
@@ -82,6 +82,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     }): Promise<Discount[]>;
     getDiscountList(): Discount[];
     getAvailableWalletIds(): number[];
+    getVirtualCurrencyList(): import("../Discount/types").VirtualCurrencyAsset[];
     private syncScannedDiscountsToOriginalDiscountList;
     private ensureEditDiscountConfigForProductChange;
     scanCode(code: string, customerId?: number): Promise<{
@@ -156,6 +157,13 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * sessionStorage 的 cacheId 分桶。写入失败由 BaseModule 静默降级。
      */
     persistTempOrder(): void;
+    /**
+     * 终止当前模块实例的 sessionStorage 订单恢复会话。
+     *
+     * 支付跳转等终态场景需要同时删除当前 cacheId 的 tempOrder 快照，并关闭
+     * 本实例后续异步任务的再次写入；新模块实例初始化时会按 otherParams 重新启用。
+     */
+    clearSessionStoragePersistedTempOrder(): void;
     consumeSessionStorageRestore(): Record<string, any> | null;
     notifyTempOrderChanged(): void;
     private createDefaultTempOrderInstance;
@@ -188,6 +196,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         orderExpectedAmount: string;
     };
     private calculateDepositPaidAmount;
+    private hasPaidNormalPayment;
     private resolveNextOrderPaymentType;
     private getPaymentNumberAppData;
     private getPaymentNumberDevicePrefixSync;
@@ -365,6 +374,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateVoucherOrderPaymentsAsync(payments: OrderPaymentSource[], options?: {
         status?: 'paid' | 'payment_pending';
     }): Promise<OrderPaymentData[]>;
+    private normalizeShouldMergeProductResult;
     private shouldMergeProductToOrder;
     private hasOrderProductLineNote;
     /**
@@ -374,6 +384,13 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * this.hasLinkedBookingUid({ metadata: { booking_uid: 'booking-1' } });
      */
     private hasLinkedBookingUid;
+    private isMultiCurrencySettlementEnabled;
+    private isActiveVirtualSettlementOrder;
+    private shouldUseVirtualSettlementSummary;
+    private normalizeVirtualSettlementProductIfEnabled;
+    private assertAndLockProductSettlement;
+    private syncTempOrderSettlementState;
+    private prepareVirtualSettlementTempOrder;
     /**
      * 预约商品加车后的统一收尾：促销、折扣、summary 重算与持久化（批量拆行时只调用一次）。
      *
@@ -386,7 +403,12 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * 带 booking 且 num>1 时由 `addProductToOrder` 拆成多次本方法调用（每次 num=1）。
      *
      * @example
-     * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
+     * const pending = this.appendProductLineToTempOrder(
+     *   tempOrder,
+     *   { product_id: 1, num: 1 },
+     *   booking,
+     * );
+     * if (pending) await pending;
      */
     private appendProductLineToTempOrder;
     /**
@@ -396,7 +418,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * await order.addProductToOrder({ product_id: 1, num: 3 }, { start_time: '10:00' });
      * // → tempOrder.products 新增 3 行，每行 num=1，bookings 3 条
      */
-    addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput): Promise<OrderProduct[]>;
+    addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<OrderProduct[]>;
     /**
      * 批量添加商品行，所有行追加完成后只触发一次促销、折扣、summary 重算与持久化。
      *
@@ -434,13 +456,17 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * @example
      * await order.removeProductsFromOrder([identityA, identityB]);
      */
-    removeProductsFromOrder(identities: OrderProductIdentity[]): Promise<OrderProduct[]>;
-    removeProductFromOrder(identity: OrderProductIdentity): Promise<OrderProduct[]>;
+    removeProductsFromOrder(identities: OrderProductIdentity[], options?: RemoveProductsFromOrderOptions): Promise<OrderProduct[]>;
+    removeProductFromOrder(identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions): Promise<OrderProduct[]>;
     /**
      * 仅清空购物车行（products / bookings），不重置整单。
      * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
      */
     clearOrderCartLines(): Promise<OrderTempOrder>;
+    /**
+     * 切换购物车结算单位时清理所有会影响新币种的订单状态，但保留当前客户。
+     */
+    clearOrderForSettlementSwitch(): Promise<OrderTempOrder>;
     buildCurrentSubmitPayloadForLocalPrint(params?: {
         cacheId?: string;
         platform?: string;
@@ -575,4 +601,4 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getOrderInfo(order_id: number): Promise<any>;
     getVouchers(): any[];
 }
-export type { UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';
+export type { AddProductToOrderOptions, RemoveProductsFromOrderOptions, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';