@pisell/pisellos 2.3.102 → 2.3.103

package/lib/modules/Order/index.js

@@ -95,8 +95,10 @@ class OrderModule extends _BaseModule.BaseModule {
   promotionEvaluator = null;
   /** 赠品选择 resolver；由 SDK host bridge 注入 */
   giftSelectResolver = null;
-  /** applyPromotion 递归保护 flag（写路径同步调 applyPromotion，禁止重入） */
+  /** 促销评估递归保护 flag（写路径同步评估促销，禁止重入） */
   isApplyingPromotion = false;
+  /** 保持旧事件语义：同步事件监听器内触发的订单写入不得递归评估促销。 */
+  isEmittingPromotionApplied = false;
   /** 商品曾应用过客户券卡，客户变更剥离后需强制跑一次 calcDiscount 复位价格 */
   hasActiveCustomerBoundDiscount = false;
   /** 最近一次 applyPromotion 的未满足促销提示 */
@@ -713,7 +715,7 @@ class OrderModule extends _BaseModule.BaseModule {
   }
 
   /**
-   * 应用购物车促销：计算 → 差异化赠品 → 写回 tempOrder.products → emit onPromotionApplied。
+   * 只执行购物车促销评估与赠品写回，不发布稳定态事件。
    *
    * 调用时机：写路径（add/update/remove/clear/setCustomer）末尾自动触发；外部一般无需手动调。
    *
@@ -721,26 +723,27 @@ class OrderModule extends _BaseModule.BaseModule {
    * - 不调用任何公开 CRUD API（如 removeProductFromOrder），全部内部 mutate tempOrder.products，避免事件风暴；
    * - 用 `isApplyingPromotion` 防递归；
    * - 多选项赠品依赖 giftSelectResolver，未注入则跳过且 console.warn；
-   * - 不主动调用 applyDiscount / recalculateSummary，调用方负责跟进。
+   * - 不主动调用 applyDiscount / recalculateSummary，调用方负责跟进；
+   * - 返回的 payload 只能在 applyDiscount（商品写路径还需 summary/persist）完成后发布。
    */
-  async applyPromotion() {
-    if (this.isApplyingPromotion) {
-      return;
+  async evaluatePromotion() {
+    if (this.isApplyingPromotion || this.isEmittingPromotionApplied) {
+      return null;
     }
     if (!this.promotionEvaluator) {
-      return;
+      return null;
     }
     const tempOrder = this.store.tempOrder;
     if (!tempOrder) {
-      return;
+      return null;
     }
     if (this.isActiveVirtualSettlementOrder(tempOrder)) {
       tempOrder.products = (0, _virtualSettlement.normalizeVirtualSettlementProducts)(tempOrder.products);
-      return;
+      return null;
     }
     const strategyConfigs = this.promotionEvaluator.getStrategyConfigs?.();
     if (Array.isArray(strategyConfigs) && strategyConfigs.length === 0) {
-      return;
+      return null;
     }
     this.isApplyingPromotion = true;
     try {
@@ -832,14 +835,46 @@ class OrderModule extends _BaseModule.BaseModule {
         })),
         products: tempOrder.products
       };
-      this.effectsEmit('onPromotionApplied', payload);
+      return payload;
     } catch (error) {
       console.error('[OrderModule] applyPromotion failed', error);
+      return null;
     } finally {
       this.isApplyingPromotion = false;
     }
   }
 
+  /** 发布促销稳定态；products 必须读取折扣计算后的当前数组。 */
+  emitPromotionApplied(payload) {
+    if (!payload) return;
+    const products = this.store.tempOrder?.products || payload.products;
+    this.isEmittingPromotionApplied = true;
+    try {
+      void this.effectsEmit('onPromotionApplied', {
+        ...payload,
+        products
+      });
+    } finally {
+      // effectsEmit 同步调用监听器后返回 Promise；保持既有的非阻塞事件行为。
+      this.isEmittingPromotionApplied = false;
+    }
+  }
+
+  /** 公开入口：促销、折扣、summary 与持久化完成后发布稳定态事件。 */
+  async applyPromotion() {
+    const payload = await this.evaluatePromotion();
+    if (!payload) return;
+    const tempOrder = this.store.tempOrder;
+    if (!tempOrder) return;
+    this.applyDiscount();
+    this.sanitizeTempOrderProducts(tempOrder);
+    await this.recalculateSummary({
+      createIfMissing: true
+    });
+    this.persistTempOrder();
+    this.emitPromotionApplied(payload);
+  }
+
   /** 最近一次 applyPromotion 输出的未满足促销列表 */
   getUnfulfilledPromotions() {
     return this.lastUnfulfilledPromotions;
@@ -3106,9 +3141,7 @@ class OrderModule extends _BaseModule.BaseModule {
     if (!options?.skipEditDiscountConfigRefresh && !isVirtualSettlement) {
       await this.ensureEditDiscountConfigForProductChange(tempOrder);
     }
-    if (!options?.skipDiscountRecalculation && !isVirtualSettlement) {
-      await this.applyPromotion();
-    }
+    const promotionPayload = !options?.skipDiscountRecalculation && !isVirtualSettlement ? await this.evaluatePromotion() : null;
     if (!options?.skipDiscountRecalculation && !isVirtualSettlement) {
       this.applyDiscount();
     }
@@ -3117,6 +3150,7 @@ class OrderModule extends _BaseModule.BaseModule {
       createIfMissing: true
     });
     this.persistTempOrder();
+    this.emitPromotionApplied(promotionPayload);
   }
 
   /**
@@ -3263,6 +3297,67 @@ class OrderModule extends _BaseModule.BaseModule {
     return commitProductLine(shouldMerge);
   }
 
+  /**
+   * booking 数量拆行时，若 Holder 数量与拆行数严格一致，则按下标分配。
+   * 数量不一致时保持旧数据，避免猜测 Holder 与商品份数的对应关系。
+   */
+  createSplitBookingLine(product, booking, index, splitCount) {
+    const singleLine = (0, _lodashEs.cloneDeep)(product);
+    singleLine.num = 1;
+    delete singleLine.product_quantity;
+    const singleBooking = (0, _lodashEs.cloneDeep)(booking);
+    const bookingHolder = booking?.holder && typeof booking.holder === 'object' ? booking.holder : null;
+    const metadataHolder = booking?.metadata?.holder && typeof booking.metadata.holder === 'object' ? booking.metadata.holder : null;
+    const rawHolderIds = bookingHolder?.form_record ?? booking?.metadata?.holder_id ?? metadataHolder?.form_record ?? product?.metadata?.holder_id;
+    const holderIds = (Array.isArray(rawHolderIds) ? rawHolderIds : [rawHolderIds]).map(holderId => holderId && typeof holderId === 'object' ? holderId.form_record_id : holderId).filter(holderId => holderId !== undefined && holderId !== null && holderId !== '');
+    if (holderIds.length !== splitCount) {
+      return {
+        product: singleLine,
+        booking: singleBooking
+      };
+    }
+    const holderId = holderIds[index];
+    const rawHolderName = bookingHolder?.name ?? metadataHolder?.name;
+    const holderNames = Array.isArray(rawHolderName) ? rawHolderName.map(name => String(name || '').trim()) : typeof rawHolderName === 'string' ? rawHolderName.split(',').map(name => name.trim()) : [];
+    const holderName = holderNames.length === splitCount ? holderNames[index] : undefined;
+    const splitHolder = holder => ({
+      ...holder,
+      form_record: [holderId],
+      ...(holderName ? {
+        name: holderName
+      } : Object.prototype.hasOwnProperty.call(holder, 'name') ? {
+        name: undefined
+      } : {})
+    });
+    singleLine.metadata = {
+      ...(singleLine.metadata || {}),
+      holder_id: [holderId]
+    };
+    if (singleLine._extend && typeof singleLine._extend === 'object') {
+      singleLine._extend = {
+        ...singleLine._extend,
+        holder_id: [holderId]
+      };
+    }
+    if (singleBooking.holder && typeof singleBooking.holder === 'object') {
+      singleBooking.holder = splitHolder(singleBooking.holder);
+    }
+    singleBooking.metadata = {
+      ...(singleBooking.metadata || {}),
+      holder_id: [holderId],
+      ...(singleBooking.metadata?.holder && typeof singleBooking.metadata.holder === 'object' ? {
+        holder: splitHolder(singleBooking.metadata.holder)
+      } : {})
+    };
+    if (Object.prototype.hasOwnProperty.call(singleBooking, 'holder_id')) {
+      singleBooking.holder_id = [holderId];
+    }
+    return {
+      product: singleLine,
+      booking: singleBooking
+    };
+  }
+
   /**
    * 添加商品行。带 booking 时强制独立行；num>1 时拆成多条 num=1 的 product+booking（对齐 BookingByStep / ticketBooking addService）。
    *
@@ -3321,29 +3416,26 @@ class OrderModule extends _BaseModule.BaseModule {
         const splitCount = (0, _utils3.getSafeProductNum)(productRecord.num ?? productRecord.product_quantity ?? 1);
         if (splitCount > 1) {
           for (let i = 0; i < splitCount; i += 1) {
-            const singleLine = (0, _lodashEs.cloneDeep)(productRecord);
-            const singleBooking = (0, _lodashEs.cloneDeep)(booking);
-            singleLine.num = 1;
-            delete singleLine.product_quantity;
+            const splitLine = this.createSplitBookingLine(productRecord, booking, i, splitCount);
             if (i > 0) {
-              delete singleLine.unique_identification_number;
-              delete singleLine.identity_key;
-              if (singleLine.metadata) {
-                singleLine.metadata = {
-                  ...singleLine.metadata
+              delete splitLine.product.unique_identification_number;
+              delete splitLine.product.identity_key;
+              if (splitLine.product.metadata) {
+                splitLine.product.metadata = {
+                  ...splitLine.product.metadata
                 };
-                delete singleLine.metadata.unique_identification_number;
-                delete singleLine.metadata.identity_key;
+                delete splitLine.product.metadata.unique_identification_number;
+                delete splitLine.product.metadata.identity_key;
               }
-              delete singleBooking.booking_uid;
-              if (singleBooking.metadata) {
-                singleBooking.metadata = {
-                  ...singleBooking.metadata
+              delete splitLine.booking.booking_uid;
+              if (splitLine.booking.metadata) {
+                splitLine.booking.metadata = {
+                  ...splitLine.booking.metadata
                 };
-                delete singleBooking.metadata.unique_identification_number;
+                delete splitLine.booking.metadata.unique_identification_number;
               }
             }
-            const committedProduct = await this.appendProductLineToTempOrder(tempOrder, singleLine, singleBooking, {
+            const committedProduct = await this.appendProductLineToTempOrder(tempOrder, splitLine.product, splitLine.booking, {
               insertAtIndex,
               disableMerge: options?.disableMerge
             });
@@ -3399,10 +3491,8 @@ class OrderModule extends _BaseModule.BaseModule {
         const splitCount = (0, _utils3.getSafeProductNum)(productRecord.num ?? productRecord.product_quantity ?? 1);
         if (splitCount > 1) {
           for (let i = 0; i < splitCount; i += 1) {
-            const singleLine = (0, _lodashEs.cloneDeep)(productRecord);
-            singleLine.num = 1;
-            delete singleLine.product_quantity;
-            const appendResult = this.appendProductLineToTempOrder(tempOrder, singleLine, (0, _lodashEs.cloneDeep)(booking));
+            const splitLine = this.createSplitBookingLine(productRecord, booking, i, splitCount);
+            const appendResult = this.appendProductLineToTempOrder(tempOrder, splitLine.product, splitLine.booking);
             if (appendResult) await appendResult;
           }
           continue;
@@ -3658,7 +3748,7 @@ class OrderModule extends _BaseModule.BaseModule {
   async updateOrderProduct(params) {
     const tempOrder = this.ensureTempOrder();
     const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
-    await this.applyPromotion();
+    const promotionPayload = await this.evaluatePromotion();
     this.applyDiscount({
       reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : undefined
     });
@@ -3667,6 +3757,7 @@ class OrderModule extends _BaseModule.BaseModule {
       createIfMissing: true
     });
     this.persistTempOrder();
+    this.emitPromotionApplied(promotionPayload);
     this.logInfo('updateOrderProduct success', {
       params
     });
@@ -3760,8 +3851,9 @@ class OrderModule extends _BaseModule.BaseModule {
     }
     tempOrder.products[productIndex] = normalizedProduct;
     this.prepareVirtualSettlementTempOrder(tempOrder);
-    if (!this.isActiveVirtualSettlementOrder(tempOrder)) {
-      await this.applyPromotion();
+    const isVirtualSettlement = this.isActiveVirtualSettlementOrder(tempOrder);
+    const promotionPayload = !isVirtualSettlement ? await this.evaluatePromotion() : null;
+    if (!isVirtualSettlement) {
       this.applyDiscount();
     }
     this.sanitizeTempOrderProducts(tempOrder);
@@ -3769,6 +3861,7 @@ class OrderModule extends _BaseModule.BaseModule {
       createIfMissing: true
     });
     this.persistTempOrder();
+    this.emitPromotionApplied(promotionPayload);
     this.logInfo('updateOrderProductQuantity success', {
       params
     });
@@ -3813,7 +3906,7 @@ class OrderModule extends _BaseModule.BaseModule {
    */
   async finalizeAfterProductsMutation(tempOrder, options) {
     this.syncTempOrderHolderFromBookings(tempOrder);
-    await this.applyPromotion();
+    const promotionPayload = await this.evaluatePromotion();
     this.applyDiscount({
       reapplyBookingDiscountProductUids: options?.reapplyBookingDiscountProductUids
     });
@@ -3822,6 +3915,7 @@ class OrderModule extends _BaseModule.BaseModule {
       createIfMissing: true
     });
     this.persistTempOrder();
+    this.emitPromotionApplied(promotionPayload);
   }
 
   /**
@@ -3926,13 +4020,14 @@ class OrderModule extends _BaseModule.BaseModule {
         productsByUid: {}
       };
     }
-    await this.applyPromotion();
+    const promotionPayload = await this.evaluatePromotion();
     this.applyDiscount();
     this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({
       createIfMissing: true
     });
     this.persistTempOrder();
+    this.emitPromotionApplied(promotionPayload);
     this.logInfo('clearOrderCartLines success', {});
     return tempOrder;
   }

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

@@ -117,7 +117,7 @@ export interface OrderLastGiftActions {
     }>;
     toRemove: string[];
 }
-/** onPromotionApplied 事件 payload */
+/** onPromotionApplied 稳定态事件 payload（促销、折扣与 summary 均已完成）。 */
 export interface OrderPromotionAppliedPayload {
     unfulfilledPromotions: OrderUnfulfilledPromotion[];
     giftActions: OrderLastGiftActions;
@@ -131,7 +131,7 @@ export interface OrderPromotionAppliedPayload {
             product_variant_id: number;
         }>;
     }>;
-    /** 处理后的商品列表 */
+    /** 折扣重算后的最终商品列表 */
     products: OrderProduct[];
 }
 /**
@@ -979,7 +979,7 @@ export interface OrderModuleAPI {
      */
     appendPromotionTags: <T extends Record<string, any>>(products: T[]) => T[];
     /**
-     * 应用购物车促销（评估 → 差异化赠品 → 写回 tempOrder.products → emit onPromotionApplied）。
+     * 应用购物车促销（评估 → 差异化赠品 → 折扣/summary 重算 → emit onPromotionApplied）。
      *
      * 自动在 addProductToOrder / updateOrderProductQuantity / removeProductFromOrder /
      * clearOrderCartLines / setOrderCustomer 等写路径末尾触发，业务一般无需手动调用。

package/lib/modules/Order/types.js

@@ -40,7 +40,7 @@ let OrderHooks = exports.OrderHooks = /*#__PURE__*/function (OrderHooks) {
  */
 /** 未满足的促销策略（购物车底部 alert 渲染源） */
 /** 上一次 applyPromotion 计算出的赠品操作（仅供调试/读取使用） */
-/** onPromotionApplied 事件 payload */
+/** onPromotionApplied 稳定态事件 payload（促销、折扣与 summary 均已完成）。 */
 /**
  * tempOrder 上的下单客户协议字段视图。
  * 这些字段会随订单提交到后端。

package/lib/solution/BaseSales/index.js

@@ -1823,7 +1823,12 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     const hasManualDiscountSelection = this.hasManualDiscountSelection || currentDiscountList.some(discount => discount.isManualSelect);
     const discountAction = params?.action || (orderId ? 'edit' : 'create');
     const discountConfigCacheKey = [customerId, discountAction, Number(orderId) || 0].join(':');
-    let preparedDiscountList = [];
+
+    // Walk-In 不请求 prepare config；当前搜索/扫码券必须继续参与本次重算。
+    // current 优先于 original，保留搜索后的最新选择与可用状态。
+    const searchedDiscountList = currentDiscountList.filter(discount => discount.isScan);
+    const searchedDiscountIds = new Set(searchedDiscountList.map(discount => String(discount.id)));
+    let preparedDiscountList = [...searchedDiscountList, ...originalDiscountList.filter(discount => !searchedDiscountIds.has(String(discount.id)))];
     if (customerId && customerId !== 1) {
       if (!params?.force && this.discountConfigCacheKey === discountConfigCacheKey) {
         preparedDiscountList = originalDiscountList;
@@ -2783,7 +2788,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (this.store.payment) {
       const committed = this.getCommittedWalletAssets();
       const state = this.store.payment.wallet.setCommittedWalletAssets(committed.ids, committed.assets);
-      void this.publishWalletAssetsState(state);
+      void this.publishWalletAssetsState(state, 'local');
     }
     return payments;
   }
@@ -2929,9 +2934,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       })
     };
   }
-  async publishWalletAssetsState(state) {
+  async publishWalletAssetsState(state, changeSource = 'derived') {
     await this.effectsEmit(_types.BaseSalesHookNames.onWalletAssetsStateChanged, {
-      state
+      state,
+      changeSource
     });
     return state;
   }
@@ -3064,7 +3070,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       source: params.source
     });
     await this.syncSelectedWalletAssets(state);
-    return this.publishWalletAssetsState(state);
+    return this.publishWalletAssetsState(state, 'local');
   }
 
   /** 更新已选钱包资产的手动使用金额，并同步 pending payment。 */
@@ -3072,7 +3078,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.payment) throw new Error('payment 模块未初始化');
     const state = this.store.payment.wallet.updateWalletAssetAmount(params.assetId, params.amount);
     await this.syncSelectedWalletAssets(state);
-    return this.publishWalletAssetsState(state);
+    return this.publishWalletAssetsState(state, 'local');
   }
 
   /** 扫码精确查券；仅可用资产会被自动选中。 */
@@ -3087,7 +3093,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     const result = await wallet.scanWalletAssetAsync(code);
     if (result.type === 'normalCode') {
       await this.syncSelectedWalletAssets(result.state);
-      await this.publishWalletAssetsState(result.state);
+      await this.publishWalletAssetsState(result.state, 'local');
     }
     return result;
   }
@@ -3097,7 +3103,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.payment) throw new Error('payment 模块未初始化');
     const state = this.store.payment.wallet.clearWalletAssetSelection();
     await this.syncSelectedWalletAssets(state);
-    return this.publishWalletAssetsState(state);
+    return this.publishWalletAssetsState(state, 'local');
   }
 
   /**
@@ -3227,7 +3233,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       try {
         const committed = this.getCommittedWalletAssets();
         const walletState = this.store.payment.wallet.setCommittedWalletAssets(committed.ids, committed.assets);
-        await this.publishWalletAssetsState(walletState);
+        await this.publishWalletAssetsState(walletState, 'local');
       } catch (error) {
         this.logWarning('confirmWalletPayment: Wallet committed 状态同步失败', {
           error: error instanceof Error ? error.message : String(error)
@@ -3311,7 +3317,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       if (this.store.payment) {
         const committed = this.getCommittedWalletAssets();
         const walletState = this.store.payment.wallet.setCommittedWalletAssets(committed.ids, committed.assets);
-        await this.publishWalletAssetsState(walletState);
+        await this.publishWalletAssetsState(walletState, 'local');
       }
       return {
         payment: payment || {},
@@ -3417,7 +3423,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       if (this.store.payment) {
         const committed = this.getCommittedWalletAssets();
         const walletState = this.store.payment.wallet.setCommittedWalletAssets(committed.ids, committed.assets);
-        await this.publishWalletAssetsState(walletState);
+        await this.publishWalletAssetsState(walletState, 'local');
       }
       return {
         payment: payment || {},

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.102",
+  "version": "2.3.103",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",