@pisell/pisellos 2.3.102 → 2.3.103

package/dist/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/dist/modules/Order/types.js

@@ -41,7 +41,7 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
 
 /** 上一次 applyPromotion 计算出的赠品操作（仅供调试/读取使用） */
 
-/** onPromotionApplied 事件 payload */
+/** onPromotionApplied 稳定态事件 payload（促销、折扣与 summary 均已完成）。 */
 
 /**
  * tempOrder 上的下单客户协议字段视图。

package/dist/solution/BaseSales/index.js

@@ -2767,7 +2767,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
         var _this$getOrderIdentit, _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _discountModule$getDi, _discountModule$getOr, _discountModule$getDi2;
-        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, _discountModule$setOr2, _discountModule$setDi, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _orderStore$summary, orderTotalAmount, result, _iterator3, _step3, _product$metadata5, _tempOrder$_extend3, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
+        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, searchedDiscountList, searchedDiscountIds, preparedDiscountList, _discountModule$setOr, _discountModule$setOr2, _discountModule$setDi, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _orderStore$summary, orderTotalAmount, result, _iterator3, _step3, _product$metadata5, _tempOrder$_extend3, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -2789,43 +2789,52 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 return discount.isManualSelect;
               });
               discountAction = (params === null || params === void 0 ? void 0 : params.action) || (orderId ? 'edit' : 'create');
-              discountConfigCacheKey = [customerId, discountAction, Number(orderId) || 0].join(':');
-              preparedDiscountList = [];
+              discountConfigCacheKey = [customerId, discountAction, Number(orderId) || 0].join(':'); // Walk-In 不请求 prepare config；当前搜索/扫码券必须继续参与本次重算。
+              // current 优先于 original，保留搜索后的最新选择与可用状态。
+              searchedDiscountList = currentDiscountList.filter(function (discount) {
+                return discount.isScan;
+              });
+              searchedDiscountIds = new Set(searchedDiscountList.map(function (discount) {
+                return String(discount.id);
+              }));
+              preparedDiscountList = [].concat(_toConsumableArray(searchedDiscountList), _toConsumableArray(originalDiscountList.filter(function (discount) {
+                return !searchedDiscountIds.has(String(discount.id));
+              })));
               if (!(customerId && customerId !== 1)) {
-                _context25.next = 25;
+                _context25.next = 27;
                 break;
               }
               if (!(!(params !== null && params !== void 0 && params.force) && this.discountConfigCacheKey === discountConfigCacheKey)) {
-                _context25.next = 19;
+                _context25.next = 21;
                 break;
               }
               preparedDiscountList = originalDiscountList;
-              _context25.next = 25;
+              _context25.next = 27;
               break;
-            case 19:
-              _context25.next = 21;
+            case 21:
+              _context25.next = 23;
               return this.store.order.loadDiscountConfig({
                 customerId: customerId,
                 action: discountAction,
                 orderId: Number(orderId) || undefined,
                 apply: false
               });
-            case 21:
+            case 23:
               preparedDiscountList = _context25.sent;
               this.discountConfigCacheKey = discountConfigCacheKey;
-              _context25.next = 25;
+              _context25.next = 27;
               return discountModule === null || discountModule === void 0 || (_discountModule$setOr = discountModule.setOriginalDiscountList) === null || _discountModule$setOr === void 0 ? void 0 : _discountModule$setOr.call(discountModule, preparedDiscountList);
-            case 25:
+            case 27:
               if (!this.isActiveVirtualSettlementOrder(tempOrder)) {
-                _context25.next = 33;
+                _context25.next = 35;
                 break;
               }
-              _context25.next = 28;
-              return discountModule === null || discountModule === void 0 || (_discountModule$setOr2 = discountModule.setOriginalDiscountList) === null || _discountModule$setOr2 === void 0 ? void 0 : _discountModule$setOr2.call(discountModule, []);
-            case 28:
               _context25.next = 30;
-              return discountModule === null || discountModule === void 0 || (_discountModule$setDi = discountModule.setDiscountList) === null || _discountModule$setDi === void 0 ? void 0 : _discountModule$setDi.call(discountModule, []);
+              return discountModule === null || discountModule === void 0 || (_discountModule$setOr2 = discountModule.setOriginalDiscountList) === null || _discountModule$setOr2 === void 0 ? void 0 : _discountModule$setOr2.call(discountModule, []);
             case 30:
+              _context25.next = 32;
+              return discountModule === null || discountModule === void 0 || (_discountModule$setDi = discountModule.setDiscountList) === null || _discountModule$setDi === void 0 ? void 0 : _discountModule$setDi.call(discountModule, []);
+            case 32:
               tempOrder.discount_list = [];
               tempOrder.shop_discount = '0.00';
               return _context25.abrupt("return", {
@@ -2834,9 +2843,9 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 availableWalletIds: this.getAvailableWalletIds(),
                 virtualCurrencyList: this.store.order.getVirtualCurrencyList()
               });
-            case 33:
+            case 35:
               if (!(hasManualDiscountSelection && currentDiscountList.length)) {
-                _context25.next = 35;
+                _context25.next = 37;
                 break;
               }
               return _context25.abrupt("return", {
@@ -2845,12 +2854,12 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 availableWalletIds: this.getAvailableWalletIds(),
                 virtualCurrencyList: this.store.order.getVirtualCurrencyList()
               });
-            case 35:
+            case 37:
               nextDiscountList = this.mergeHistoricalDiscountList(preparedDiscountList || (discountModule === null || discountModule === void 0 || (_discountModule$getDi2 = discountModule.getDiscountList) === null || _discountModule$getDi2 === void 0 ? void 0 : _discountModule$getDi2.call(discountModule)) || [], tempOrder.products || []);
               nextDiscountList = this.mergeCurrentDiscountSelectionState(nextDiscountList, currentDiscountList);
-              _context25.next = 39;
+              _context25.next = 41;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 39:
+            case 41:
               shouldSkipAutoApplyFetchedDiscounts = this.shouldSkipAutoApplyFetchedDiscountsInEditMode({
                 discountAction: discountAction,
                 products: tempOrder.products || [],
@@ -2858,33 +2867,33 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 nextDiscountList: nextDiscountList
               });
               if (!shouldSkipAutoApplyFetchedDiscounts) {
-                _context25.next = 48;
+                _context25.next = 50;
                 break;
               }
-              _context25.next = 43;
+              _context25.next = 45;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 43:
+            case 45:
               _summary = _context25.sent;
               this.store.order.persistTempOrder();
-              _context25.next = 47;
+              _context25.next = 49;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 47:
+            case 49:
               return _context25.abrupt("return", {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 availableWalletIds: this.getAvailableWalletIds(),
                 virtualCurrencyList: this.store.order.getVirtualCurrencyList()
               });
-            case 48:
+            case 50:
               if (!rulesModule) {
-                _context25.next = 84;
+                _context25.next = 86;
                 break;
               }
               orderTotalAmount = Number(((_orderStore$summary = orderStore.summary) === null || _orderStore$summary === void 0 ? void 0 : _orderStore$summary.total_amount) || 0);
@@ -2904,22 +2913,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               _iterator3 = _createForOfIteratorHelper(tempOrder.products || []);
-              _context25.prev = 53;
+              _context25.prev = 55;
               _iterator3.s();
-            case 55:
+            case 57:
               if ((_step3 = _iterator3.n()).done) {
-                _context25.next = 70;
+                _context25.next = 72;
                 break;
               }
               product = _step3.value;
               productUid = (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[productUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin : undefined;
               if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
-                _context25.next = 61;
+                _context25.next = 63;
                 break;
               }
-              return _context25.abrupt("continue", 68);
-            case 61:
+              return _context25.abrupt("continue", 70);
+            case 63:
               totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
                 return sum + Number(pd.amount || 0);
               }, 0);
@@ -2935,60 +2944,60 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 68:
-              _context25.next = 55;
-              break;
             case 70:
-              _context25.next = 75;
+              _context25.next = 57;
               break;
             case 72:
-              _context25.prev = 72;
-              _context25.t0 = _context25["catch"](53);
+              _context25.next = 77;
+              break;
+            case 74:
+              _context25.prev = 74;
+              _context25.t0 = _context25["catch"](55);
               _iterator3.e(_context25.t0);
-            case 75:
-              _context25.prev = 75;
+            case 77:
+              _context25.prev = 77;
               _iterator3.f();
-              return _context25.finish(75);
-            case 78:
+              return _context25.finish(77);
+            case 80:
               if (!result.discountList) {
-                _context25.next = 84;
+                _context25.next = 86;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context25.next = 83;
+              _context25.next = 85;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 83:
+            case 85:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
-            case 84:
-              _context25.next = 86;
+            case 86:
+              _context25.next = 88;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 86:
+            case 88:
               summary = _context25.sent;
               this.store.order.persistTempOrder();
-              _context25.next = 90;
+              _context25.next = 92;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 90:
+            case 92:
               return _context25.abrupt("return", {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 availableWalletIds: this.getAvailableWalletIds(),
                 virtualCurrencyList: this.store.order.getVirtualCurrencyList()
               });
-            case 91:
+            case 93:
             case "end":
               return _context25.stop();
           }
-        }, _callee25, this, [[53, 72, 75, 78]]);
+        }, _callee25, this, [[55, 74, 77, 80]]);
       }));
       function loadDiscountConfig(_x17) {
         return _loadDiscountConfig.apply(this, arguments);
@@ -4458,7 +4467,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       if (this.store.payment) {
         var committed = this.getCommittedWalletAssets();
         var state = this.store.payment.wallet.setCommittedWalletAssets(committed.ids, committed.assets);
-        void this.publishWalletAssetsState(state);
+        void this.publishWalletAssetsState(state, 'local');
       }
       return payments;
     }
@@ -4663,16 +4672,20 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "publishWalletAssetsState",
     value: function () {
       var _publishWalletAssetsState = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(state) {
+        var changeSource,
+          _args43 = arguments;
         return _regeneratorRuntime().wrap(function _callee43$(_context43) {
           while (1) switch (_context43.prev = _context43.next) {
             case 0:
-              _context43.next = 2;
+              changeSource = _args43.length > 1 && _args43[1] !== undefined ? _args43[1] : 'derived';
+              _context43.next = 3;
               return this.effectsEmit(BaseSalesHookNames.onWalletAssetsStateChanged, {
-                state: state
+                state: state,
+                changeSource: changeSource
               });
-            case 2:
-              return _context43.abrupt("return", state);
             case 3:
+              return _context43.abrupt("return", state);
+            case 4:
             case "end":
               return _context43.stop();
           }
@@ -4929,7 +4942,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               _context47.next = 5;
               return this.syncSelectedWalletAssets(state);
             case 5:
-              return _context47.abrupt("return", this.publishWalletAssetsState(state));
+              return _context47.abrupt("return", this.publishWalletAssetsState(state, 'local'));
             case 6:
             case "end":
               return _context47.stop();
@@ -4959,7 +4972,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               _context48.next = 5;
               return this.syncSelectedWalletAssets(state);
             case 5:
-              return _context48.abrupt("return", this.publishWalletAssetsState(state));
+              return _context48.abrupt("return", this.publishWalletAssetsState(state, 'local'));
             case 6:
             case "end":
               return _context48.stop();
@@ -5002,7 +5015,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               return this.syncSelectedWalletAssets(result.state);
             case 11:
               _context49.next = 13;
-              return this.publishWalletAssetsState(result.state);
+              return this.publishWalletAssetsState(result.state, 'local');
             case 13:
               return _context49.abrupt("return", result);
             case 14:
@@ -5034,7 +5047,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               _context50.next = 5;
               return this.syncSelectedWalletAssets(state);
             case 5:
-              return _context50.abrupt("return", this.publishWalletAssetsState(state));
+              return _context50.abrupt("return", this.publishWalletAssetsState(state, 'local'));
             case 6:
             case "end":
               return _context50.stop();
@@ -5265,7 +5278,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               committed = this.getCommittedWalletAssets();
               walletState = this.store.payment.wallet.setCommittedWalletAssets(committed.ids, committed.assets);
               _context53.next = 33;
-              return this.publishWalletAssetsState(walletState);
+              return this.publishWalletAssetsState(walletState, 'local');
             case 33:
               _context53.next = 38;
               break;
@@ -5411,7 +5424,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               committed = this.getCommittedWalletAssets();
               walletState = this.store.payment.wallet.setCommittedWalletAssets(committed.ids, committed.assets);
               _context54.next = 40;
-              return this.publishWalletAssetsState(walletState);
+              return this.publishWalletAssetsState(walletState, 'local');
             case 40:
               return _context54.abrupt("return", {
                 payment: payment || {},
@@ -5573,7 +5586,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               committed = this.getCommittedWalletAssets();
               walletState = this.store.payment.wallet.setCommittedWalletAssets(committed.ids, committed.assets);
               _context55.next = 41;
-              return this.publishWalletAssetsState(walletState);
+              return this.publishWalletAssetsState(walletState, 'local');
             case 41:
               return _context55.abrupt("return", {
                 payment: payment || {},

package/dist/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/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -181,6 +181,7 @@ function buildCacheItemFromOrderLine(input) {
     booking,
     sourceProduct
   } = input;
+  const holderConfig = sourceProduct?.holder_config ?? sourceProduct?.origin?.holder_config ?? product.metadata?.holder_config;
   const resolvedId = product.product_id ?? sourceProduct?.id;
   const selling = Number(product.selling_price ?? 0);
   const original = Number(product.original_price ?? selling);
@@ -249,6 +250,9 @@ function buildCacheItemFromOrderLine(input) {
   }
   const base = {
     ...(sourceProduct || {}),
+    ...(holderConfig !== undefined && holderConfig !== null ? {
+      holder_config: holderConfig
+    } : {}),
     id: resolvedId,
     product_id: resolvedId,
     extension_type: sourceProduct?.extension_type ?? booking?.product?.extension_type ?? sourceProduct?.extension_type,

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

@@ -29,8 +29,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 的未满足促销提示 */
@@ -124,7 +126,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 +134,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[];
@@ -430,6 +437,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * if (pending) await pending;
      */
     private appendProductLineToTempOrder;
+    /**
+     * booking 数量拆行时，若 Holder 数量与拆行数严格一致，则按下标分配。
+     * 数量不一致时保持旧数据，避免猜测 Holder 与商品份数的对应关系。
+     */
+    private createSplitBookingLine;
     /**
      * 添加商品行。带 booking 时强制独立行；num>1 时拆成多条 num=1 的 product+booking（对齐 BookingByStep / ticketBooking addService）。
      *