@pisell/pisellos 2.3.36 → 2.3.38

package/lib/model/strategy/adapter/promotion/type.d.ts

@@ -12,6 +12,8 @@ export declare const PROMOTION_ACTION_TYPES: {
     readonly X_ITEMS_FOR_Y_PRICE: "X_ITEMS_FOR_Y_PRICE";
     /** 买X送Y（买X件送Y件，可累计） */
     readonly BUY_X_GET_Y_FREE: "BUY_X_GET_Y_FREE";
+    /** 商品奖励（满足条件后，订单内指定目标商品享优惠） */
+    readonly ITEM_REWARD: "ITEM_REWARD";
     /** 固定折扣 */
     readonly DISCOUNT_RATE: "DISCOUNT_RATE";
     /** 固定减价 */
@@ -66,6 +68,59 @@ export interface BuyXGetYFreeConfig {
     /** 可选的赠品列表 */
     giftProducts?: ProductIdentifier[];
 }
+/**
+ * 商品奖励优惠方式
+ *
+ * - free: 目标商品最终价为 0
+ * - percent_off: 目标商品按百分比折扣，rewardValue 为 0-100
+ * - amount_off: 每个目标商品固定减免 rewardValue
+ * - fixed_price: 目标商品改为固定价 rewardValue
+ */
+export type ItemRewardMethod = 'free' | 'percent_off' | 'amount_off' | 'fixed_price';
+/**
+ * 商品奖励数量规则
+ *
+ * - per_condition_quantity: 每满足 N 个条件商品，奖励 Y 个目标商品
+ * - all_targets: 满足条件后奖励全部目标商品
+ * - max_per_order: 满足条件后每单最多奖励固定数量目标商品
+ */
+export type ItemRewardQuantityRule = 'per_condition_quantity' | 'all_targets' | 'max_per_order';
+/** 商品奖励目标选择规则 */
+export type ItemRewardTargetSelection = 'consumer_best';
+/**
+ * 商品奖励 - Action Value
+ *
+ * @example
+ * value: {
+ *   rewardMethod: 'free',
+ *   quantityRule: 'per_condition_quantity',
+ *   triggerQuantity: 1,
+ *   rewardQuantity: 1,
+ * }
+ */
+export interface ItemRewardValue {
+    /** 奖励方式 */
+    rewardMethod: ItemRewardMethod;
+    /** 奖励值：percent_off/amount_off/fixed_price 使用，free 可省略 */
+    rewardValue?: number;
+    /** 奖励数量规则 */
+    quantityRule: ItemRewardQuantityRule;
+    /** 每满足 N 个条件商品；默认 1 */
+    triggerQuantity?: number;
+    /** 奖励 Y 个目标商品；默认 1 */
+    rewardQuantity?: number;
+    /** 每单最多奖励 Y 个目标商品；max_per_order 使用 */
+    maxRewardQuantity?: number;
+}
+/**
+ * 商品奖励 - Action Config
+ */
+export interface ItemRewardConfig {
+    /** 奖励对象，本期支持指定商品/变体；product_variant_id=0 表示任意变体 */
+    rewardTargets?: ProductIdentifier[];
+    /** 目标商品超额时的选择规则；本期支持 consumer_best */
+    targetSelection?: ItemRewardTargetSelection;
+}
 /**
  * 商品标识
  *
@@ -102,10 +157,19 @@ export interface BuyXGetYFreeAction extends Omit<ActionEffect, 'type' | 'value'
     valueType: 'object';
     config?: BuyXGetYFreeConfig;
 }
+/**
+ * 商品奖励 Action
+ */
+export interface ItemRewardAction extends Omit<ActionEffect, 'type' | 'value' | 'config'> {
+    type: typeof PROMOTION_ACTION_TYPES.ITEM_REWARD;
+    value: ItemRewardValue;
+    valueType: 'object';
+    config?: ItemRewardConfig;
+}
 /**
  * 促销活动 Action 联合类型
  */
-export type PromotionAction = XItemsForYPriceAction | BuyXGetYFreeAction;
+export type PromotionAction = XItemsForYPriceAction | BuyXGetYFreeAction | ItemRewardAction;
 /**
  * 促销相关运算符
  */
@@ -170,6 +234,8 @@ export interface PromotionProduct {
     quantity: number;
     /** 原价 */
     original_price?: number;
+    /** 内部字段：编辑态订单行只允许参与 ITEM_REWARD，避免旧促销误算历史行 */
+    _promotionOnlyForItemReward?: boolean;
 }
 /**
  * 促销活动适配器转换结果
@@ -195,7 +261,7 @@ export interface PromotionTransformResult {
 /**
  * Action 详情联合类型
  */
-export type PromotionActionDetail = XItemsForYPriceActionDetail | BuyXGetYFreeActionDetail;
+export type PromotionActionDetail = XItemsForYPriceActionDetail | BuyXGetYFreeActionDetail | ItemRewardActionDetail;
 /**
  * X件Y元 Action 详情
  */
@@ -226,6 +292,28 @@ export interface BuyXGetYFreeActionDetail {
     /** 可选的赠品列表 */
     giftProducts: ProductIdentifier[];
 }
+/**
+ * 商品奖励 Action 详情
+ */
+export interface ItemRewardActionDetail {
+    type: typeof PROMOTION_ACTION_TYPES.ITEM_REWARD;
+    /** 奖励方式 */
+    rewardMethod: ItemRewardMethod;
+    /** 奖励值：percent_off/amount_off/fixed_price 使用，free 为 0 */
+    rewardValue: number;
+    /** 奖励数量规则 */
+    quantityRule: ItemRewardQuantityRule;
+    /** 每满足 N 个条件商品；默认 1 */
+    triggerQuantity: number;
+    /** 奖励 Y 个目标商品；默认 1 */
+    rewardQuantity: number;
+    /** 每单最多奖励 Y 个目标商品；max_per_order 使用 */
+    maxRewardQuantity?: number;
+    /** 奖励对象，本期支持指定商品/变体 */
+    rewardTargets: ProductIdentifier[];
+    /** 目标商品超额时的选择规则 */
+    targetSelection: ItemRewardTargetSelection;
+}
 /**
  * X件Y元 - 业务层计算结果
  *

package/lib/model/strategy/adapter/promotion/type.js

@@ -28,6 +28,8 @@ var PROMOTION_ACTION_TYPES = {
   X_ITEMS_FOR_Y_PRICE: "X_ITEMS_FOR_Y_PRICE",
   /** 买X送Y（买X件送Y件，可累计） */
   BUY_X_GET_Y_FREE: "BUY_X_GET_Y_FREE",
+  /** 商品奖励（满足条件后，订单内指定目标商品享优惠） */
+  ITEM_REWARD: "ITEM_REWARD",
   /** 固定折扣 */
   DISCOUNT_RATE: "DISCOUNT_RATE",
   /** 固定减价 */

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

@@ -184,7 +184,7 @@ function synthesizeProductResourceFromBooking(booking) {
   };
 }
 function buildCacheItemFromOrderLine(input) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   const { product, booking, sourceProduct } = input;
   const resolvedId = product.product_id ?? (sourceProduct == null ? void 0 : sourceProduct.id);
   const selling = Number(product.selling_price ?? 0);
@@ -259,6 +259,7 @@ function buildCacheItemFromOrderLine(input) {
     price: (sourceProduct == null ? void 0 : sourceProduct.price) ?? selling,
     selling_price: product.selling_price,
     original_price: product.original_price,
+    ...Number(((_g = product.product_sku) == null ? void 0 : _g.open_sold_weight) || 0) === 1 ? { product_sku: JSON.parse(JSON.stringify(product.product_sku)) } : {},
     ...productOptionString ? { product_option_string: productOptionString } : {},
     _extend: extend,
     new: 0,

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

@@ -78,7 +78,7 @@ function mapOrderBundleToOtherBundle(bundle) {
   });
 }
 function buildNormalProductCacheItemFromOrderLine(input) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const { product, sourceProduct } = input;
   const resolvedId = product.product_id ?? (sourceProduct == null ? void 0 : sourceProduct.id);
   const sourcePrice = resolveSourceProductPrice(product, sourceProduct);
@@ -144,6 +144,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     note: product.note,
     order_detail_id: product.order_detail_id ?? null,
     discount_list: discountList,
+    ...Number(((_f = product.product_sku) == null ? void 0 : _f.open_sold_weight) || 0) === 1 ? { product_sku: JSON.parse(JSON.stringify(product.product_sku)) } : {},
     new: 0,
     autoClose: true,
     _extend: extend

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

@@ -27,6 +27,8 @@ export declare class OpenDataModule extends BaseModule implements Module {
     fetchOpenData(params: OpenDataFetchParams): Promise<OpenDataConfig>;
     getOpenData(): OpenDataConfig | null;
     getLastFetchedAt(): number | null;
+    /** 清除内存与 sessionStorage 镜像中的 OpenData，供宿主切店时调用。 */
+    clearCache(): void;
     checkAvailability(scheduleModule?: ScheduleModule): OpenDataAvailabilityResult;
     storeChange(): void;
 }

package/lib/modules/OpenData/index.js

@@ -104,6 +104,11 @@ var OpenDataModule = class extends import_BaseModule.BaseModule {
   getLastFetchedAt() {
     return this.store.lastFetchedAt ?? null;
   }
+  /** 清除内存与 sessionStorage 镜像中的 OpenData，供宿主切店时调用。 */
+  clearCache() {
+    this.store.data = null;
+    this.store.lastFetchedAt = null;
+  }
   checkAvailability(scheduleModule) {
     var _a;
     const scheduleList = scheduleModule ? scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(

package/lib/modules/Order/index.js

@@ -85,6 +85,11 @@ function isPaidPaymentRecord(payment) {
 function isCommittedVoucherPaymentRecord(payment) {
   return isVoucherPaymentRecord(payment) && (payment == null ? void 0 : payment.status) !== "voided" && (hasSyncedOrderPaymentRecord(payment) || isPaidPaymentRecord(payment));
 }
+function getVoucherPaymentLifecycleKey(payment) {
+  if (!isVoucherPaymentRecord(payment))
+    return null;
+  return `${String(payment.voucher_id)}::${String(payment.status || "")}`;
+}
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "order", version);
@@ -2746,14 +2751,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const committedVoucherPaymentIds = new Set(
       committedVoucherPayments.filter((payment) => hasSyncedOrderPaymentRecord(payment)).map((payment) => String(payment.order_payment_id))
     );
-    const committedVoucherIds = new Set(
-      committedVoucherPayments.map((payment) => String(payment.voucher_id))
+    const committedVoucherLifecycleKeys = new Set(
+      committedVoucherPayments.map((payment) => getVoucherPaymentLifecycleKey(payment)).filter((key) => key !== null)
     );
     const replaceableVouchers = mappedVouchers.filter((payment) => {
       if (hasSyncedOrderPaymentRecord(payment) && committedVoucherPaymentIds.has(String(payment.order_payment_id))) {
         return false;
       }
-      if (payment.voucher_id !== void 0 && committedVoucherIds.has(String(payment.voucher_id))) {
+      const lifecycleKey = getVoucherPaymentLifecycleKey(payment);
+      if (lifecycleKey && committedVoucherLifecycleKeys.has(lifecycleKey)) {
         return false;
       }
       return true;
@@ -3623,7 +3629,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       cacheId: (params == null ? void 0 : params.cacheId) ?? this.cacheId,
       platform: (params == null ? void 0 : params.platform) || ((_a = this.otherParams) == null ? void 0 : _a.platform),
-      businessCode: (params == null ? void 0 : params.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code),
+      businessCode: (params == null ? void 0 : params.businessCode) || ((_b = this.otherParams) == null ? void 0 : _b.businessCode) || ((_c = this.otherParams) == null ? void 0 : _c.business_code) || tempOrder.business_code,
       channel: params == null ? void 0 : params.channel,
       type: (params == null ? void 0 : params.type) ?? ((_d = this.otherParams) == null ? void 0 : _d.type),
       summary: latestSummary,

package/lib/modules/Order/utils.js

@@ -444,7 +444,12 @@ function resolveEffectivePerUnitDiscount(product) {
     (sum, discount) => sum + Number((discount == null ? void 0 : discount.amount) || 0),
     0
   );
-  const hasPromoDiscountItem = discountList.some((item) => (item == null ? void 0 : item.type) === "promotion");
+  const hasPromoDiscountItem = discountList.some(
+    (item) => {
+      var _a, _b;
+      return (item == null ? void 0 : item.type) === "promotion" || (item == null ? void 0 : item.type) === "product" && ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.actionType) === "ITEM_REWARD";
+    }
+  );
   if (hasPromoDiscountItem)
     return fromList;
   const metadata = (product == null ? void 0 : product.metadata) || {};

package/lib/modules/Payment/index.js

@@ -1088,7 +1088,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           roundedValue = this.standardRound(baseValue, true);
           break;
         case import_types.RoundingRule.StandardDown:
-        case "standard_down":
+        case "standard_rounding_midpoint_down":
           roundedValue = this.standardRound(baseValue, false);
           break;
         case import_types.RoundingRule.AlwaysUp:

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

@@ -40,11 +40,11 @@ export declare enum RoundingRule {
     /** 标准舍入（中点向上） */
     Standard = "standard_rounding",
     /** 标准舍入（中点向下） */
-    StandardDown = "standard_down",
+    StandardDown = "standard_rounding_midpoint_down",
     /** 总是向上舍入 */
-    AlwaysUp = "always_up",
+    AlwaysUp = "round_up",
     /** 总是向下舍入 */
-    AlwaysDown = "always_down"
+    AlwaysDown = "round_down"
 }
 /**
  * 舍入结果
@@ -340,6 +340,8 @@ export interface CashPayment {
     processCashPayment: (amount: number, orderUuid: string) => Promise<void>;
     /** 获取现金余额 */
     getCashBalance: () => Promise<number>;
+    /** 根据币种面额生成现金快捷金额。 */
+    getRecommendedAmount: (money: number, currency: string) => number[];
 }
 /**
  * Eftpos支付接口
@@ -365,6 +367,56 @@ export interface WalletStoredInitData {
     noApplicableVoucher: any[];
     products: any[];
 }
+export type WalletAssetId = string | number;
+export type WalletAssetSelectionSource = 'manual' | 'scan';
+export type WalletAssetsStatus = 'idle' | 'loading' | 'ready' | 'error';
+/**
+ * 购物车与结账共享的钱包资产状态。
+ *
+ * 原始券字段完整保留在 items / selectedItems 中，Payment 只补充统一的
+ * 可用性、选择和加载状态，不在此层引入 UI ViewModel。
+ */
+export interface WalletAssetsState {
+    status: WalletAssetsStatus;
+    items: any[];
+    selectedIds: WalletAssetId[];
+    selectedItems: any[];
+    committedIds: WalletAssetId[];
+    selectionSources: Record<string, WalletAssetSelectionSource>;
+    totalSelectedAmount: number;
+    customerId?: string | number;
+    error: string | null;
+    revision: number;
+}
+/**
+ * Shared Wallet Assets 的可序列化运行时快照。
+ *
+ * state 供购物车 / Checkout 直接恢复展示与选择；searchResults 和
+ * calculationContext 用于商品变化后继续重验扫码搜索过的 Wallet。
+ */
+export interface WalletAssetsSnapshot {
+    state: WalletAssetsState;
+    searchResults: SearchIdentificationCodeItem[];
+    walletParams: WalletDeductionRecommendParams | null;
+    calculationContext: {
+        orderTotalAmount: number;
+        products: any[];
+    };
+}
+export interface RefreshWalletAssetsOptions {
+    /** 商品/金额变化默认保留并重验选择；客户变化由实现层强制清空。 */
+    preserveSelection?: boolean;
+}
+export interface SelectWalletAssetOptions {
+    selected: boolean;
+    source?: WalletAssetSelectionSource;
+}
+export interface ScanWalletAssetResult {
+    type: SearchIdentificationCodeResult['type'];
+    asset?: any;
+    selected: boolean;
+    state: WalletAssetsState;
+}
 export interface WalletPassPayment {
     /** 生成钱包API默认参数 */
     generateWalletParams: (businessData: WalletInitBusinessData) => WalletDeductionRecommendParams;
@@ -416,6 +468,22 @@ export interface WalletPassPayment {
     processWalletPayment: (amount: number, orderUuid: string, voucherId?: string) => Promise<void>;
     /** 获取钱包余额 */
     getWalletBalance: (voucherId: string) => Promise<number>;
+    /** 刷新购物车/结账共享的钱包资产，刷新本身不会默认选券。 */
+    refreshWalletAssetsFromBusinessAsync: (businessData: WalletInitBusinessData, options?: RefreshWalletAssetsOptions) => Promise<WalletAssetsState>;
+    /** 获取共享钱包资产状态快照。 */
+    getWalletAssetsState: () => WalletAssetsState;
+    /** 导出供 Shared Checkout 跨运行时传递的 Wallet Assets 快照。 */
+    exportWalletAssetsSnapshot: () => WalletAssetsSnapshot;
+    /** 恢复 Shared Checkout 传回的 Wallet Assets 快照。 */
+    importWalletAssetsSnapshot: (snapshot: WalletAssetsSnapshot) => WalletAssetsState;
+    /** 设置单张钱包资产的选择状态并重新计算其实际抵扣额。 */
+    selectWalletAsset: (assetId: WalletAssetId, options: SelectWalletAssetOptions) => WalletAssetsState;
+    /** 精确搜索钱包资产；仅当前券可用时自动选择。 */
+    scanWalletAssetAsync: (code: string) => Promise<ScanWalletAssetResult>;
+    /** 清空未确认的钱包资产选择。 */
+    clearWalletAssetSelection: () => WalletAssetsState;
+    /** 同步订单中已经支付、不可撤销的钱包资产。 */
+    setCommittedWalletAssets: (committedIds: WalletAssetId[], committedAssets?: any[]) => WalletAssetsState;
 }
 /**
  * 支付模块API接口
@@ -608,7 +676,8 @@ export declare enum WalletPassHooks {
     OnSearchIdentificationCodeCompleted = "wallet:onSearchIdentificationCodeCompleted",
     OnWalletInitializationStarted = "wallet:onWalletInitializationStarted",
     OnWalletInitializationCompleted = "wallet:onWalletInitializationCompleted",
-    OnWalletInitializationFailed = "wallet:onWalletInitializationFailed"
+    OnWalletInitializationFailed = "wallet:onWalletInitializationFailed",
+    OnWalletAssetsStateChanged = "wallet:onWalletAssetsStateChanged"
 }
 /**
  * 支付钩子事件（统一接口）

package/lib/modules/Payment/types.js

@@ -51,9 +51,9 @@ var TaskRunStatus = /* @__PURE__ */ ((TaskRunStatus2) => {
 })(TaskRunStatus || {});
 var RoundingRule = /* @__PURE__ */ ((RoundingRule2) => {
   RoundingRule2["Standard"] = "standard_rounding";
-  RoundingRule2["StandardDown"] = "standard_down";
-  RoundingRule2["AlwaysUp"] = "always_up";
-  RoundingRule2["AlwaysDown"] = "always_down";
+  RoundingRule2["StandardDown"] = "standard_rounding_midpoint_down";
+  RoundingRule2["AlwaysUp"] = "round_up";
+  RoundingRule2["AlwaysDown"] = "round_down";
   return RoundingRule2;
 })(RoundingRule || {});
 var RoundingInterval = /* @__PURE__ */ ((RoundingInterval2) => {
@@ -73,6 +73,7 @@ var WalletPassHooks = /* @__PURE__ */ ((WalletPassHooks2) => {
   WalletPassHooks2["OnWalletInitializationStarted"] = "wallet:onWalletInitializationStarted";
   WalletPassHooks2["OnWalletInitializationCompleted"] = "wallet:onWalletInitializationCompleted";
   WalletPassHooks2["OnWalletInitializationFailed"] = "wallet:onWalletInitializationFailed";
+  WalletPassHooks2["OnWalletAssetsStateChanged"] = "wallet:onWalletAssetsStateChanged";
   return WalletPassHooks2;
 })(WalletPassHooks || {});
 var PaymentHooks = /* @__PURE__ */ ((PaymentHooks2) => {

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

@@ -1,4 +1,4 @@
-import { WalletPassPayment, WalletDeductionRecommendParams, WalletRecommendItem, UserIdentificationCodeParams, UserIdentificationCodeItem, SearchIdentificationCodeParams, SearchIdentificationCodeItem, SearchIdentificationCodeResult, WalletInitBusinessData } from './types';
+import { WalletPassPayment, WalletDeductionRecommendParams, WalletRecommendItem, UserIdentificationCodeParams, UserIdentificationCodeItem, SearchIdentificationCodeParams, SearchIdentificationCodeItem, SearchIdentificationCodeResult, WalletInitBusinessData, WalletAssetId, WalletAssetsSnapshot, WalletAssetsState, RefreshWalletAssetsOptions, SelectWalletAssetOptions, ScanWalletAssetResult } from './types';
 import type { PaymentModule } from './index';
 /**
  * 钱包支付实现
@@ -10,12 +10,22 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     private searchResults;
     private walletParams;
     private walletInitData;
+    private walletAssetsState;
+    private walletAssetsRequestSequence;
+    private walletAssetsCalculationContext;
     constructor(paymentModule: PaymentModule);
     /**
      * 发送事件的辅助方法
      * 支持使用WalletPassHooks或PaymentHooks
      */
     private emitEvent;
+    private publishWalletAssetsState;
+    private recalculateWalletAssets;
+    /**
+     * 使用最新订单参数重验扫码搜索过的支付类 Wallet 资产。
+     * 请求失败或暂时无匹配结果时保留旧资产，避免商品变化造成列表闪空。
+     */
+    private revalidateSearchedWalletAssets;
     /**
      * 生成钱包API默认参数
      * 根据业务数据生成标准的钱包API参数，并存储在模块中
@@ -73,6 +83,20 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     searchIdentificationCodeAsync(params: SearchIdentificationCodeParams, config?: {
         noCache?: boolean;
     }): Promise<SearchIdentificationCodeResult>;
+    /**
+     * 刷新购物车与结账共享的钱包资产。
+     *
+     * 与 legacy initializeWalletDataFromBusinessAsync 不同，这里维护选择状态；
+     * 推荐结果只作为可用性/金额计算输入，不会自动成为 selectedIds。
+     */
+    refreshWalletAssetsFromBusinessAsync(businessData: WalletInitBusinessData, options?: RefreshWalletAssetsOptions): Promise<WalletAssetsState>;
+    getWalletAssetsState(): WalletAssetsState;
+    exportWalletAssetsSnapshot(): WalletAssetsSnapshot;
+    importWalletAssetsSnapshot(snapshot: WalletAssetsSnapshot): WalletAssetsState;
+    selectWalletAsset(assetId: WalletAssetId, options: SelectWalletAssetOptions): WalletAssetsState;
+    scanWalletAssetAsync(code: string): Promise<ScanWalletAssetResult>;
+    clearWalletAssetSelection(): WalletAssetsState;
+    setCommittedWalletAssets(committedIds: WalletAssetId[], committedAssets?: any[]): WalletAssetsState;
     processWalletPayment(amount: number, orderUuid: string, voucherId?: string): Promise<void>;
     getWalletBalance(voucherId: string): Promise<number>;
     /**