@pisell/pisellos 2.2.280 → 2.2.281

package/dist/model/strategy/adapter/promotion/index.js

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

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

@@ -512,7 +512,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;

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

@@ -157,11 +157,13 @@ export interface OrderCustomerPatch {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
+ * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
+    source?: 'detailHydrate';
 }
 export interface OrderScanCodeResult {
     isAvailable: boolean;

package/dist/modules/Order/types.js

@@ -60,6 +60,7 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
+ * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 

package/dist/solution/BaseSales/index.js

@@ -2126,12 +2126,23 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         return !_this12.isPersistedOrderProduct(product);
       });
       if (hasDraftProduct) return false;
-      var hasSelectedDiscount = params.currentDiscountList.some(function (discount) {
-        return discount.isSelected || discount.isEditMode || discount.isManualSelect;
+
+      // 编辑详情 hydrate 时，商品行上的历史券卡会被还原为 isEditMode=true、
+      // isSelected=true 的只读记录。它们表示“该折扣已在原订单结算”，不是用户在
+      // 当前编辑会话中新做的选择，不能据此放行刚从 prepare/config 拉回来的折扣。
+      // 否则后续 Rules.calcDiscount 会把没有 isManualSelect 标记的可用 runtime 卡
+      // 当作自动候选，再次写入 tempOrder。这里只识别非 isEditMode 的 runtime 状态；
+      // 新建单、编辑态新增商品以及用户本次明确选择/取消折扣的原有流程保持不变。
+      var hasRuntimeDiscountSelection = params.currentDiscountList.some(function (discount) {
+        return !discount.isEditMode && (discount.isSelected || discount.isManualSelect);
       });
-      if (hasSelectedDiscount) return false;
+      if (hasRuntimeDiscountSelection) return false;
+
+      // nextDiscountList 已经合并了历史只读折扣与本次获取的 runtime 折扣，
+      // 因此这里同样必须排除 isEditMode；只有 runtime 条目已有明确选择状态时，
+      // 才允许继续进入折扣重算。
       return !params.nextDiscountList.some(function (discount) {
-        return discount.isSelected || discount.isEditMode || discount.isManualSelect;
+        return !discount.isEditMode && (discount.isSelected || discount.isManualSelect);
       });
     }
   }, {

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 | 5 | 2 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.d.ts

@@ -3,7 +3,7 @@ import { BookingTicketCartView, BookingTicketProductCatalogView, BookingTicketSt
 import type { ProductData } from '../../modules';
 import type { OpenDataConfig } from '../../modules/OpenData';
 import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
-import type { OrderCustomerView } from '../../modules/Order/types';
+import type { OrderCustomerView, OrderCustomerChangePayload } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
 import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
@@ -260,7 +260,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
      * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
      */
-    setOrderCustomer(customer: ICustomer | null): void;
+    setOrderCustomer(customer: ICustomer | null, options?: {
+        source?: OrderCustomerChangePayload['source'];
+    }): void;
     /**
      * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
      */
@@ -451,19 +453,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/dist/solution/BookingTicket/index.js

@@ -542,7 +542,12 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                   country_calling_code: selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.country_calling_code
                 });
                 customerModule.setSelectedCustomer(customer);
-                this.setOrderCustomer(customer);
+                // 详情 hydrate 后仍需广播一次，让 CustomerContext 等 UI 订阅方拿到刚补齐的
+                // customerSnapshot；但它不是用户主动切换客户。通过 source 明确标记初始化事件，
+                // 商品报价/折扣订阅方即可跳过 prepare/config，其他旧订阅方仍可照常刷新 UI。
+                this.setOrderCustomer(customer, {
+                  source: 'detailHydrate'
+                });
                 // await this.store.order.saveDraft();
               }
               return _context6.abrupt("return", sales);
@@ -1558,7 +1563,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
      */
   }, {
     key: "setOrderCustomer",
-    value: function setOrderCustomer(customer) {
+    value: function setOrderCustomer(customer, options) {
       var _this$store$order$get3,
         _this3 = this;
       if (!customer) {
@@ -1581,12 +1586,16 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         var snapshotReplenished = !snapshotBeforeSet && Boolean(snapshotAfterOrderSet);
         if (snapshotReplenished) {
           var _next2 = this.buildOrderCustomerPayload();
-          this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), _next2);
+          this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), _next2 && options !== null && options !== void 0 && options.source ? _objectSpread(_objectSpread({}, _next2), {}, {
+            source: options.source
+          }) : _next2);
         }
         return;
       }
       var next = this.buildOrderCustomerPayload();
-      this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), next);
+      this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), next && options !== null && options !== void 0 && options.source ? _objectSpread(_objectSpread({}, next), {}, {
+        source: options.source
+      }) : next);
       this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
       // 客户切换可能改变可用促销/赠品；触发一次重算（recursion-safe）。
       var promotionRefreshTask = this.store.order.applyPromotion().then(function () {

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

@@ -0,0 +1,51 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  ITEM_REWARD_STRATEGY: () => import_examples.ITEM_REWARD_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  ITEM_REWARD_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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

@@ -512,7 +512,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;

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

@@ -157,11 +157,13 @@ export interface OrderCustomerPatch {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
+ * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
+    source?: 'detailHydrate';
 }
 export interface OrderScanCodeResult {
     isAvailable: boolean;

package/lib/solution/BaseSales/index.js

@@ -1494,13 +1494,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const hasDraftProduct = params.products.some((product) => !this.isPersistedOrderProduct(product));
     if (hasDraftProduct)
       return false;
-    const hasSelectedDiscount = params.currentDiscountList.some(
-      (discount) => discount.isSelected || discount.isEditMode || discount.isManualSelect
+    const hasRuntimeDiscountSelection = params.currentDiscountList.some(
+      (discount) => !discount.isEditMode && (discount.isSelected || discount.isManualSelect)
     );
-    if (hasSelectedDiscount)
+    if (hasRuntimeDiscountSelection)
       return false;
     return !params.nextDiscountList.some(
-      (discount) => discount.isSelected || discount.isEditMode || discount.isManualSelect
+      (discount) => !discount.isEditMode && (discount.isSelected || discount.isManualSelect)
     );
   }
   mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {

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 | 5 | 2 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -3,7 +3,7 @@ import { BookingTicketCartView, BookingTicketProductCatalogView, BookingTicketSt
 import type { ProductData } from '../../modules';
 import type { OpenDataConfig } from '../../modules/OpenData';
 import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
-import type { OrderCustomerView } from '../../modules/Order/types';
+import type { OrderCustomerView, OrderCustomerChangePayload } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
 import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
@@ -260,7 +260,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
      * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
      */
-    setOrderCustomer(customer: ICustomer | null): void;
+    setOrderCustomer(customer: ICustomer | null, options?: {
+        source?: OrderCustomerChangePayload['source'];
+    }): void;
     /**
      * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
      */
@@ -451,19 +453,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/BookingTicket/index.js

@@ -343,7 +343,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
         country_calling_code: selectedCustomer == null ? void 0 : selectedCustomer.country_calling_code
       };
       customerModule.setSelectedCustomer(customer);
-      this.setOrderCustomer(customer);
+      this.setOrderCustomer(customer, { source: "detailHydrate" });
     }
     return sales;
   }
@@ -891,7 +891,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
    * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
    * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
    */
-  setOrderCustomer(customer) {
+  setOrderCustomer(customer, options) {
     var _a;
     if (!customer) {
       this.clearOrderCustomer();
@@ -911,12 +911,18 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       const snapshotReplenished = !snapshotBeforeSet && Boolean(snapshotAfterOrderSet);
       if (snapshotReplenished) {
         const next2 = this.buildOrderCustomerPayload();
-        this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next2);
+        this.core.effects.emit(
+          `${this.name}:onOrderCustomerChange`,
+          next2 && (options == null ? void 0 : options.source) ? { ...next2, source: options.source } : next2
+        );
       }
       return;
     }
     const next = this.buildOrderCustomerPayload();
-    this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next);
+    this.core.effects.emit(
+      `${this.name}:onOrderCustomerChange`,
+      next && (options == null ? void 0 : options.source) ? { ...next, source: options.source } : next
+    );
     this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
     const promotionRefreshTask = this.store.order.applyPromotion().then(() => void 0);
     this.orderCustomerPromotionRefreshInFlight = promotionRefreshTask;

package/package.json

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