@pisell/pisellos 2.3.68 → 2.3.70

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.d.ts

@@ -119,6 +119,15 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * application_code 仅作为接口兼容字段，不能替代 channel / business_code。
      */
     private getPriceQueryStrategyContext;
+    /**
+     * 子类可在商品重报价前准备客户维度的策略上下文，例如等待 Wallet/优惠资产加载。
+     */
+    protected prepareProductPriceQueryContext(_customerId?: number | string): Promise<void>;
+    /**
+     * 默认保留 BaseSales 的 legacy quotation 行为；已由 /product/query 统一完成
+     * 智能定价与报价合并的业务可在子类中覆盖，避免二次覆盖权威价格。
+     */
+    protected preferAuthoritativeProductQueryPrice(): boolean;
     private getPriceQuerySchedule;
     private loadProductsForPriceQuery;
     private loadProductForPriceQuery;
@@ -436,6 +445,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     transformBaseProductToOrderProduct(params: TransformBaseProductToOrderProductParams): import("./utils/transformBaseProductToOrderProduct").BaseProductOrderProductInput | null;
     calculateProductBookingPrice(params: BaseSalesCalculateProductBookingPriceParams): Promise<BaseSalesProductBookingPriceResult>;
     getQuotationCustomerScopeInfo(): BaseSalesQuotationCustomerScopeInfo;
+    private hasSmartPricingStrategies;
     shouldRecalculateProductBookingPricesForContextChange(params: BaseSalesPriceRecalculationContextChange): boolean;
     calculateProductBookingPrices(paramsList: BaseSalesCalculateProductBookingPriceParams[]): Promise<BaseSalesProductBookingPriceResult[]>;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;

package/lib/solution/BaseSales/index.js

@@ -734,8 +734,24 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (businessCode !== void 0 && businessCode !== null && String(businessCode).trim() !== "") {
       strategyContext.business_code = String(businessCode).trim();
     }
+    const availableWalletIds = this.getAvailableWalletIds();
+    if (availableWalletIds.length > 0 && !Array.isArray(strategyContext.available_wallet_ids)) {
+      strategyContext.available_wallet_ids = availableWalletIds;
+    }
     return strategyContext;
   }
+  /**
+   * 子类可在商品重报价前准备客户维度的策略上下文，例如等待 Wallet/优惠资产加载。
+   */
+  async prepareProductPriceQueryContext(_customerId) {
+  }
+  /**
+   * 默认保留 BaseSales 的 legacy quotation 行为；已由 /product/query 统一完成
+   * 智能定价与报价合并的业务可在子类中覆盖，避免二次覆盖权威价格。
+   */
+  preferAuthoritativeProductQueryPrice() {
+    return false;
+  }
   getPriceQuerySchedule(params) {
     const booking = params.booking || {};
     if (typeof booking.start_date === "string" && booking.start_date.trim()) {
@@ -1478,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) {
@@ -3129,6 +3145,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   async calculateProductBookingPrice(params) {
     const quotation = this.store.quotation;
     const customerId = params.customer_id ?? this.getCurrentOrderCustomerId();
+    await this.prepareProductPriceQueryContext(customerId);
     const authoritativeProduct = await this.loadProductForPriceQuery(params, customerId);
     const product = this.mergeProductForPriceQuery(params.product, authoritativeProduct);
     await this.loadQuotationForPriceQuery({
@@ -3141,7 +3158,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       product,
       fallback_price: authoritativeProduct ? void 0 : params.fallback_price,
       customer_id: customerId,
-      quotation
+      quotation: authoritativeProduct && this.preferAuthoritativeProductQueryPrice() ? void 0 : quotation
     });
   }
   getQuotationCustomerScopeInfo() {
@@ -3178,11 +3195,23 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       quotationScopes
     };
   }
+  hasSmartPricingStrategies() {
+    var _a, _b;
+    const evaluator = (_b = (_a = this.core) == null ? void 0 : _a.context) == null ? void 0 : _b.dataVariantEvaluator;
+    if (!evaluator || typeof evaluator.getStrategyConfigs !== "function") {
+      return false;
+    }
+    const configs = evaluator.getStrategyConfigs();
+    return Array.isArray(configs) && configs.length > 0;
+  }
   shouldRecalculateProductBookingPricesForContextChange(params) {
     const scopeInfo = this.getQuotationCustomerScopeInfo();
     const scopedCustomerIds = new Set(scopeInfo.customerIds.map((id) => String(id)));
     const previousCustomerId = this.normalizePriceContextCustomerId(params.previousCustomerId);
     const nextCustomerId = this.normalizePriceContextCustomerId(params.nextCustomerId);
+    if (this.hasSmartPricingStrategies()) {
+      return previousCustomerId !== nextCustomerId;
+    }
     const previousInScope = previousCustomerId ? scopedCustomerIds.has(previousCustomerId) : false;
     const nextInScope = nextCustomerId ? scopedCustomerIds.has(nextCustomerId) : false;
     let shouldRecalculate = false;
@@ -3203,6 +3232,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       return [];
     const quotation = this.store.quotation;
     const customerId = ((_a = paramsList[0]) == null ? void 0 : _a.customer_id) ?? this.getCurrentOrderCustomerId();
+    await this.prepareProductPriceQueryContext(customerId);
     const productMapsByGroup = /* @__PURE__ */ new Map();
     const groups = /* @__PURE__ */ new Map();
     paramsList.forEach((params) => {
@@ -3260,7 +3290,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         product,
         fallback_price: authoritativeProduct ? void 0 : params.fallback_price,
         customer_id: customerId,
-        quotation
+        quotation: authoritativeProduct && this.preferAuthoritativeProductQueryPrice() ? void 0 : quotation
       });
     });
   }

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。
      */
@@ -287,6 +289,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private buildOrderCustomerPayload;
     protected refreshDiscountConfigAfterOrderCustomerChange(customerId: number | null): Promise<void>;
     protected waitForOrderCustomerPromotionRefresh(): Promise<void>;
+    protected prepareProductPriceQueryContext(customerId?: number | string): Promise<void>;
+    protected preferAuthoritativeProductQueryPrice(): boolean;
     /**
      * 获取客户分页信息
      * @returns 分页信息
@@ -330,7 +334,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -449,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;
@@ -1036,6 +1042,18 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   waitForOrderCustomerPromotionRefresh() {
     return this.orderCustomerPromotionRefreshInFlight || Promise.resolve();
   }
+  async prepareProductPriceQueryContext(customerId) {
+    await Promise.resolve();
+    const normalizedCustomerId = Number(customerId || 0);
+    const refreshTask = this.orderCustomerDiscountRefreshInFlight;
+    const shouldWait = normalizedCustomerId > 1 && this.orderCustomerDiscountRefreshCustomerId === normalizedCustomerId && Boolean(refreshTask);
+    if (shouldWait && refreshTask) {
+      await refreshTask;
+    }
+  }
+  preferAuthoritativeProductQueryPrice() {
+    return true;
+  }
   /**
    * 获取客户分页信息
    * @returns 分页信息

package/package.json

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