@pisell/pisellos 0.10.43 → 0.10.45

package/dist/modules/Discount/index.js

@@ -29,7 +29,7 @@ import { uniqueById } from "../../solution/ShopDiscount/utils";
 import { BaseModule } from "../BaseModule";
 import { DiscountHooks } from "./types";
 import Decimal from 'decimal.js';
-import { hasAvailableEntitlementUses, isEntitlementPass } from "./entitlementPass";
+import { getDiscountLifecycleReason, getDiscountUsageBlockReason, getDiscountUsageLimitFailKey, hasAvailableDiscountBalance } from "./availability";
 export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(DiscountModule, _BaseModule);
   var _super = _createSuper(DiscountModule);
@@ -325,169 +325,30 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
         return _batchSearchByProductIds.apply(this, arguments);
       }
       return batchSearchByProductIds;
-    }()
+    }() // 展示列表只剔除已失效项，当前不可用项保留并携带原因。
   }, {
     key: "filterEnabledDiscountList",
     value: function filterEnabledDiscountList(discountList) {
-      var _this2 = this;
       return discountList.filter(function (discount) {
-        return discount.limit_status === 'enable' && _this2.hasAvailableBalance(discount) && _this2.checkUsageCreditsLimit(discount);
-      });
-    }
-  }, {
-    key: "hasAvailableBalance",
-    value: function hasAvailableBalance(discount) {
-      if (isEntitlementPass(discount)) {
-        return hasAvailableEntitlementUses(discount);
-      }
-
-      // good_pass 与折扣卡继续沿用原有金额余额判断。
-      return new Decimal((discount === null || discount === void 0 ? void 0 : discount.par_value) || 0).minus(new Decimal((discount === null || discount === void 0 ? void 0 : discount.used_par_value) || 0)).greaterThan(0);
-    }
-
-    // 检查使用次数限制
-  }, {
-    key: "checkUsageCreditsLimit",
-    value: function checkUsageCreditsLimit(discount) {
-      // 如果没有 extension_data，则不需要限制
-      if (!discount.extension_data || discount.extension_data.length === 0) {
-        return true;
-      }
-
-      // 查找 field_key 为 usage_credits 的数据
-      var usageCreditsData = discount.extension_data.find(function (data) {
-        return data.field_key === 'usage_credits';
+        return discount.limit_status === 'enable' && hasAvailableDiscountBalance(discount) && !getDiscountLifecycleReason(discount);
+      }).map(function (discount) {
+        return _objectSpread(_objectSpread({}, discount), {}, {
+          usageLimitFailKey: getDiscountUsageLimitFailKey(discount),
+          reasonCode: getDiscountUsageBlockReason(discount)
+        });
       });
-
-      // 如果没有找到 usage_credits 数据，则不需要限制
-      if (!usageCreditsData) {
-        return true;
-      }
-      var value = usageCreditsData.value;
-
-      // 检查总次数限制
-      if (value.total_credits && value.total_credits > 0) {
-        if ((discount.total_order_behavior_count || 0) >= value.total_credits) {
-          return false;
-        }
-      }
-
-      // 检查单用户限制
-      if (value.per_user_limit && value.per_user_limit > 0) {
-        if ((discount.customer_order_behavior_count || 0) >= value.per_user_limit) {
-          return false;
-        }
-      }
-
-      // 检查单日限制
-      if (value.max_per_day && value.max_per_day > 0) {
-        if ((discount.today_order_behavior_count || 0) >= value.max_per_day) {
-          return false;
-        }
-      }
-
-      // 检查单周限制
-      if (value.max_per_week && value.max_per_week > 0) {
-        if ((discount.week_order_behavior_count || 0) >= value.max_per_week) {
-          return false;
-        }
-      }
-
-      // 检查单月限制
-      if (value.max_per_month && value.max_per_month > 0) {
-        if ((discount.month_order_behavior_count || 0) >= value.max_per_month) {
-          return false;
-        }
-      }
-
-      // 所有检查都通过
-      return true;
     }
-
-    // 过滤启用且可用的优惠券，并返回校验失败原因
   }, {
     key: "filterEnabledDiscountListWithReason",
     value: function filterEnabledDiscountListWithReason(discountList) {
-      var _this3 = this;
-      var lists = discountList.filter(function (discount) {
-        return discount.limit_status === 'enable';
-      }).filter(function (discount) {
-        return _this3.hasAvailableBalance(discount);
-      }).map(function (discount) {
-        var limitFailKey = _this3.checkUsageCreditsLimitWithFailKey(discount);
-        return _objectSpread(_objectSpread({}, discount), {}, {
-          usageLimitFailKey: limitFailKey
-        });
-      });
-
-      // 可用的列表
-      var availableLists = lists.filter(function (item) {
-        return !item.usageLimitFailKey && item.unified_available_status !== 0;
-      });
-      // 不可用数据
-      var currentFailDiscount = lists.find(function (item) {
-        return item.usageLimitFailKey;
-      });
       return {
-        discountList: availableLists,
-        unavailableReasonKey: currentFailDiscount === null || currentFailDiscount === void 0 ? void 0 : currentFailDiscount.usageLimitFailKey
+        discountList: this.filterEnabledDiscountList(discountList),
+        unavailableReasonKey: discountList.map(getDiscountUsageLimitFailKey).find(function (key) {
+          return key !== null;
+        }) || null
       };
     }
 
-    // 检查使用次数限制，并返回校验失败原因
-  }, {
-    key: "checkUsageCreditsLimitWithFailKey",
-    value: function checkUsageCreditsLimitWithFailKey(discount) {
-      if (!discount.extension_data || discount.extension_data.length === 0) {
-        return null;
-      }
-      var usageCreditsData = discount.extension_data.find(function (data) {
-        return data.field_key === 'usage_credits';
-      });
-      if (!usageCreditsData) {
-        return null;
-      }
-      var value = usageCreditsData.value;
-
-      // 总次数限制
-      if (value.total_credits && value.total_credits > 0) {
-        if ((discount.total_order_behavior_count || 0) >= value.total_credits) {
-          return 'total_credits';
-        }
-      }
-
-      // 单用户限制
-      if (value.per_user_limit && value.per_user_limit > 0) {
-        if ((discount.customer_order_behavior_count || 0) >= value.per_user_limit) {
-          return 'per_user_limit';
-        }
-      }
-
-      // 单日限制
-      if (value.max_per_day && value.max_per_day > 0) {
-        if ((discount.today_order_behavior_count || 0) >= value.max_per_day) {
-          return 'max_per_day';
-        }
-      }
-
-      // 单周限制
-      if (value.max_per_week && value.max_per_week > 0) {
-        if ((discount.week_order_behavior_count || 0) >= value.max_per_week) {
-          return 'max_per_week';
-        }
-      }
-
-      // 单月限制
-      if (value.max_per_month && value.max_per_month > 0) {
-        if ((discount.month_order_behavior_count || 0) >= value.max_per_month) {
-          return 'max_per_month';
-        }
-      }
-
-      // 全部通过
-      return null;
-    }
-
     // 根据productIds去重
   }, {
     key: "uniqueByProductId",

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

@@ -201,6 +201,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/dist/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 } 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, ShopServiceData, ShopServiceType } from './types';
 import type { ICustomer } from '../AccountList/types';
 import type { Discount } from '../Discount/types';
 import { UnavailableReason } from '../Rules/types';
@@ -20,6 +20,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private openCache;
     private sessionStoragePersistEnabled;
     private sessionStorageRestoreRecord;
+    /** 只允许当前订单最新的 prepare/config 请求回写客户资产态。 */
+    private customerWalletPrepareConfigEpoch;
     private salesSummaryModuleName;
     private rulesHooksOverride?;
     private moduleHooksOverride?;
@@ -29,8 +31,10 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private promotionEvaluator;
     /** 赠品选择 resolver；由 SDK host bridge 注入 */
     private giftSelectResolver;
-    /** applyPromotion 递归保护 flag（写路径同步调 applyPromotion，禁止重入） */
+    /** 促销评估递归保护 flag（写路径同步评估促销，禁止重入） */
     private isApplyingPromotion;
+    /** 保持旧事件语义：同步事件监听器内触发的订单写入不得递归评估促销。 */
+    private isEmittingPromotionApplied;
     /** 商品曾应用过客户券卡，客户变更剥离后需强制跑一次 calcDiscount 复位价格 */
     private hasActiveCustomerBoundDiscount;
     /** 最近一次 applyPromotion 的未满足促销提示 */
@@ -76,6 +80,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';
@@ -85,6 +94,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<{
@@ -124,7 +134,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     appendPromotionTags<T extends Record<string, any>>(products: T[]): T[];
     /**
-     * 应用购物车促销：计算 → 差异化赠品 → 写回 tempOrder.products → emit onPromotionApplied。
+     * 只执行购物车促销评估与赠品写回，不发布稳定态事件。
      *
      * 调用时机：写路径（add/update/remove/clear/setCustomer）末尾自动触发；外部一般无需手动调。
      *
@@ -132,8 +142,13 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * - 不调用任何公开 CRUD API（如 removeProductFromOrder），全部内部 mutate tempOrder.products，避免事件风暴；
      * - 用 `isApplyingPromotion` 防递归；
      * - 多选项赠品依赖 giftSelectResolver，未注入则跳过且 console.warn；
-     * - 不主动调用 applyDiscount / recalculateSummary，调用方负责跟进。
+     * - 不主动调用 applyDiscount / recalculateSummary，调用方负责跟进；
+     * - 返回的 payload 只能在 applyDiscount（商品写路径还需 summary/persist）完成后发布。
      */
+    private evaluatePromotion;
+    /** 发布促销稳定态；products 必须读取折扣计算后的当前数组。 */
+    private emitPromotionApplied;
+    /** 公开入口：促销、折扣、summary 与持久化完成后发布稳定态事件。 */
     applyPromotion(): Promise<void>;
     /** 最近一次 applyPromotion 输出的未满足促销列表 */
     getUnfulfilledPromotions(): OrderUnfulfilledPromotion[];
@@ -169,8 +184,10 @@ 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 writeCustomerWalletSnapshotsFromPrepareConfig;
     private createExternalSaleNumber;
     private ensureExternalSaleNumber;
     private ensureRequestUniqueIdempotencyToken;
@@ -306,9 +323,24 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
     syncTempOrderNoteToRemote(orderId: number | string, note: string): Promise<string>;
     getTempOrderNote(): string;
+    private ensureSalesNotesRuntimeState;
+    private ensureSalesNotesLoadedForMutation;
+    private normalizeSalesNoteUuid;
+    private getSalesNotePrimaryRelation;
+    private removeSalesNotesForMissingProductLines;
+    private setSalesNoteOnTempOrder;
+    getSalesNotes(): SalesNote[];
+    createSalesNotesMutationSnapshot(): SalesNotesMutationSnapshot;
+    restoreSalesNotesMutationSnapshot(snapshot: SalesNotesMutationSnapshot): void;
+    setSalesNote(input: SetSalesNoteInput): Promise<SalesNote>;
+    removeSalesNote(uuid: string): Promise<void>;
+    clearSalesNotes(): Promise<void>;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderDepositAmount(amount: string | number): OrderSummary;
     updateTempOrderBuzzer(buzzer: string): string;
+    private updateTempOrderShopServiceData;
+    updateTempOrderPickupReferenceMode(mode: PickupReferenceMode): ShopServiceData;
+    updateTempOrderServiceType(serviceType: ShopServiceType): ShopServiceData;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     private buildTempOrderCustomer;
     private isCustomerBoundDiscount;
@@ -476,7 +508,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     removeProductFromOrder(identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions): Promise<OrderProduct[]>;
     /**
      * 仅清空购物车行（products / bookings），不重置整单。
-     * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
+     * 普通整单 note 保持不变；以商品行为主体的 Sales Notes 同步删除。
      */
     clearOrderCartLines(): Promise<OrderTempOrder>;
     /**
@@ -540,7 +572,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;
@@ -618,4 +650,4 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getOrderInfo(order_id: number): Promise<any>;
     getVouchers(): any[];
 }
-export type { AddProductToOrderOptions, OrderMetaList, PointCardSnapshotItem, RemoveProductsFromOrderOptions, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';
+export type { AddProductToOrderOptions, OrderMetaList, PointCardSnapshotItem, VirtualCurrencySnapshotItem, RemoveProductsFromOrderOptions, SalesNote, SalesNoteDraftInput, SalesNoteLocalizedSelection, SalesNoteLocalizedText, SalesNoteRelation, SalesNoteTextInput, SetSalesNoteInput, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';