@pisell/pisellos 2.2.309 → 2.2.310

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

@@ -44,7 +44,10 @@ interface ApplicableProductDetails {
     original_amount: string;
     num: number;
     metadata?: {
+        encoded?: string;
         product_discount_difference?: number;
+        /** 月卡扣除本单新增使用后的剩余次数；不限次数时为 null。 */
+        balance?: number | null;
     };
     discount?: {
         fixed_amount?: number;
@@ -63,6 +66,13 @@ interface UsageCreditsValue {
     max_per_week: number;
     max_per_month: number;
 }
+export type IncludedUses = {
+    type: 'limited';
+    value: number;
+} | {
+    type: 'unlimited';
+    value: null;
+};
 export type DiscountFilterRejectKey = 'total_credits' | 'per_user_limit' | 'max_per_day' | 'max_per_week' | 'max_per_month';
 export interface DiscountWithReason {
     discountList: Discount[];
@@ -107,30 +117,37 @@ interface ExtensionData {
 }
 export interface Discount {
     id: number;
+    shop_id?: number;
     product_name: string;
     encoded: string;
     code: string;
     tag: string;
-    expire_time?: string;
+    expire_time?: string | null;
+    expire_date?: string | null;
+    end_time?: string | null;
     product_id: number;
     relation_type: string;
     par_value: string;
     used_par_value: string;
     limit_status: string;
     limited_relation_product_data: Limitedrelationproductdata;
-    balance: string;
+    balance?: string | number | null;
+    available_num?: number;
+    available_products_info?: any[];
     format_title: Formattitle;
     metadata?: {
+        encoded?: string;
         discount_card_type?: 'fixed_amount' | 'percent';
         custom_product_bundle_map_id?: string;
         validity_type?: "custom_schedule_validity" | "fixed_validity";
-        discount_calculation_mode: 'item_level' | 'order_level';
-        holder: {
+        included_uses?: IncludedUses;
+        discount_calculation_mode?: 'item_level' | 'order_level';
+        holder?: {
             type: "customer" | "custom";
         };
     };
     product: Product;
-    type: "product" | 'good_pass';
+    type?: "product" | 'good_pass' | 'entitlement_pass' | 'discount_card' | 'product_discount_card';
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;
@@ -163,9 +180,17 @@ export interface Discount {
     applicableProductIds?: number[];
     applicableProductDetails: ApplicableProductDetails[];
     appliedProductDetails: ApplicableProductDetails[];
+    /** Entitlement Pass 编辑订单时已经提交的使用明细。 */
+    committedAppliedProductDetails?: ApplicableProductDetails[];
     isDisabledForProductUsed?: boolean;
     amount?: number;
     customer_id?: number | string | null;
+    holder?: {
+        holder_type?: 'customer' | 'form' | string;
+        holder_id?: number | string | Array<number | string>;
+        created_at?: string | null;
+        [key: string]: any;
+    };
     extension_data?: ExtensionData[];
     total_order_behavior_count?: number;
     today_order_behavior_count?: number;
@@ -180,6 +205,12 @@ export interface Discount {
     start_time?: string;
     discount_rule_uncheck_flag?: boolean;
     usageLimitFailKey?: string | null;
+    /** 本次规则计算的不可用原因；可用性恢复后清除。 */
+    reason?: string;
+    reasonCode?: string;
+    unified_messages?: {
+        title?: string | Record<string, string>;
+    };
     unified_available_status?: number | undefined | null;
 }
 export interface DiscountState {

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

@@ -33,7 +33,7 @@ export declare class OpenDataModule extends BaseModule implements Module {
     getOpenData(): OpenDataConfig | null;
     getInvoiceLayoutConfig(): InvoiceLayoutConfig;
     getInvoiceTemplateSettings(): InvoiceTemplateSettings;
-    ensureInvoiceTemplateSettings(target: string): Promise<InvoiceTemplateSettings>;
+    ensureInvoiceTemplateSettings(target: string, openDataConfig?: OpenDataConfig): Promise<InvoiceTemplateSettings>;
     private commitInvoiceTemplateSettings;
     private resolveInvoiceTemplateSettings;
     private buildInvoiceTemplateCacheKey;

package/lib/modules/OpenData/index.js

@@ -153,7 +153,8 @@ class OpenDataModule extends _BaseModule.BaseModule {
     this.fatherModule = this.otherParams.fatherModule;
   }
   shouldSkipInvoiceTemplateDocument() {
-    return String(this.otherParams?.platform || '').trim().toLowerCase() === 'h5';
+    const platform = String(this.otherParams?.platform || '').trim().toLowerCase();
+    return platform === 'pc' || platform === 'h5';
   }
   async fetchOpenData(params) {
     const fetchRevision = ++this.fetchRevision;
@@ -211,8 +212,16 @@ class OpenDataModule extends _BaseModule.BaseModule {
     }
     return (0, _utils.getDefaultInvoiceTemplateSettings)();
   }
-  async ensureInvoiceTemplateSettings(target) {
+  async ensureInvoiceTemplateSettings(target, openDataConfig) {
     const normalizedTarget = String(target || '').trim();
+    if (openDataConfig && openDataConfig !== this.store.data) {
+      // 部分解决方案会在初始化参数中直接收到已经拉取完成的 OpenData。
+      // 将它纳入模块状态后再解析 Document，避免为了 Invoice 重复请求 setting，
+      // 同时让后续同步 getter 能校验同一份 document id 与 target。
+      this.fetchRevision += 1;
+      this.store.data = openDataConfig;
+      this.store.lastFetchedAt = Date.now();
+    }
     const config = this.store.data;
     if (!normalizedTarget || !config) {
       return (0, _utils.getDefaultInvoiceTemplateSettings)();

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, 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, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, ShopServiceData, ShopServiceType } 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, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, PointCardSnapshotMergeContext, PointCardSnapshotItem, ShopServiceData, ShopServiceType } from './types';
 import type { ICustomer } from '../AccountList/types';
 import type { Discount } from '../Discount/types';
 import { UnavailableReason } from '../Rules/types';
@@ -20,6 +20,10 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private openCache;
     private sessionStoragePersistEnabled;
     private sessionStorageRestoreRecord;
+    /** 只允许当前订单最新的 prepare/config 请求回写客户资产态。 */
+    private customerWalletPrepareConfigEpoch;
+    /** Payment 可能早于 prepare/config 返回；先按实例 ID 暂存卡号等待 Snapshot。 */
+    private pointCardSnapshotCodeCandidates;
     private salesSummaryModuleName;
     private rulesHooksOverride?;
     private moduleHooksOverride?;
@@ -78,6 +82,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logError;
     private registerDiscountModules;
     private createDefaultRulesHooks;
+    /**
+     * Stable across notifyTempOrderChanged's immutable copy, but changes when a
+     * different local/server order becomes current.
+     */
+    private getDiscountConfigOrderIdentityKey;
     loadDiscountConfig(params: {
         customerId: number;
         action?: 'create' | 'edit';
@@ -87,6 +96,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getDiscountList(): Discount[];
     getAvailableWalletIds(): number[];
     getVirtualCurrencyList(): import("../Discount/types").VirtualCurrencyAsset[];
+    getCustomerWalletPrepareConfigEpoch(): number;
     private syncScannedDiscountsToOriginalDiscountList;
     private ensureEditDiscountConfigForProductChange;
     scanCode(code: string, customerId?: number): Promise<{
@@ -101,6 +111,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     applyDiscount(options?: {
         reapplyBookingDiscountProductUids?: string[];
         reapplyWeighedDiscountProductUids?: string[];
+        preferredEntitlementPassIds?: number[];
     }): void;
     /**
      * 注入促销评估器。
@@ -177,8 +188,19 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     consumeSessionStorageRestore(): Record<string, any> | null;
     notifyTempOrderChanged(): void;
     private createDefaultTempOrderInstance;
-    private clearTempOrderPointCardSnapshot;
-    private writePointCardSnapshotFromPrepareConfig;
+    private clearTempOrderCustomerWalletSnapshots;
+    private clearCustomerWalletState;
+    private clearCustomerWalletRuntimeState;
+    private rememberPointCardSnapshotCodeCandidates;
+    private getRememberedPointCardSnapshotCodeCandidates;
+    private getPointCardSnapshotOrderIdentityKey;
+    private isPointCardSnapshotMergeContextCurrent;
+    private writeCustomerWalletSnapshotsFromPrepareConfig;
+    /**
+     * 将 Payment WalletPass 返回的实例 code 回填到当前订单 Snapshot。
+     * 这里只按资产 ID 补空值，不新增卡、不覆盖 prepare/config 冻结的余额。
+     */
+    mergePointCardSnapshotCodes(walletPassList: unknown, context?: PointCardSnapshotMergeContext): PointCardSnapshotItem[];
     private createExternalSaleNumber;
     private ensureExternalSaleNumber;
     private ensureRequestUniqueIdempotencyToken;
@@ -468,7 +490,12 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     }>, options?: {
         skipEditDiscountConfigRefresh?: boolean;
     }): Promise<OrderProduct[]>;
+    private getFullCoveragePassDiscounts;
+    private hasEntitlementPassDiscount;
     private hasGoodPassDiscount;
+    private isPersistedProductLine;
+    private isRuntimeEntitlementAppend;
+    private hasSameEntitlementMergePriceConfig;
     private getBundleRuntimeIdentity;
     private preservePersistedBundlePriceFields;
     private applyOrderProductUpdateToTempOrder;
@@ -589,6 +616,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     createOrderByCheckout(params: CheckoutOrderParams): Promise<any>;
     submitSalesOrder<T = any>(params: SubmitSalesOrderParams): Promise<T>;
+    private isSalesCheckoutHandledByOsServer;
     /**
      * 发送支付链接邮件。
      *
@@ -635,4 +663,4 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getOrderInfo(order_id: number): Promise<any>;
     getVouchers(): any[];
 }
-export type { AddProductToOrderOptions, OrderMetaList, PointCardSnapshotItem, RemoveProductsFromOrderOptions, SalesNote, SalesNoteDraftInput, SalesNoteLocalizedSelection, SalesNoteLocalizedText, SalesNoteRelation, SalesNoteTextInput, SetSalesNoteInput, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';
+export type { AddProductToOrderOptions, OrderMetaList, PointCardSnapshotItem, VirtualCurrencySnapshotItem, RemoveProductsFromOrderOptions, SalesNote, SalesNoteDraftInput, SalesNoteLocalizedSelection, SalesNoteLocalizedText, SalesNoteRelation, SalesNoteTextInput, SetSalesNoteInput, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';