@pisell/pisellos 2.3.150 → 2.3.152

package/lib/solution/BaseSales/fulfillmentItemRules.js

@@ -0,0 +1,259 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FulfillmentItemRulesController = void 0;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _itemRule = require("../../model/strategy/adapter/itemRule");
+var _transformBaseProductToOrderProduct = require("./utils/transformBaseProductToOrderProduct");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const ownershipField = 'fulfillment_item_rule';
+function positiveIds(value) {
+  if (!Array.isArray(value)) return [];
+  return [...new Set(value.map(Number).filter(id => Number.isInteger(id) && id > 0))];
+}
+function lineIdentity(line) {
+  return {
+    product_id: line.product_id,
+    product_variant_id: line.product_variant_id,
+    unique_identification_number: line.metadata?.unique_identification_number || line.unique_identification_number,
+    product_sku: line.product_sku,
+    product_bundle: line.product_bundle
+  };
+}
+function cartFingerprint(lines) {
+  return JSON.stringify(lines.map(line => [lineIdentity(line), line.num, line.metadata?.[ownershipField]]));
+}
+function selectionFingerprint(lines, excludedIds) {
+  const quantities = new Map();
+  for (const line of lines) {
+    if (excludedIds.has(Number(line.product_id)) || line.metadata?._giftInfo) continue;
+    const key = JSON.stringify([Number(line.product_id), Number(line.product_variant_id) || 0]);
+    quantities.set(key, (quantities.get(key) || 0) + Number(line.num || 0));
+  }
+  return JSON.stringify([...quantities].sort(([left], [right]) => left.localeCompare(right)));
+}
+function ownerKey(action, product) {
+  return JSON.stringify([action.strategyId, action.ruleId, product.product_id, product.product_variant_id ?? 0]);
+}
+function ownedLines(lines, key) {
+  return lines.filter(line => line.metadata?.[ownershipField] === key);
+}
+
+/** Executes item rules at the sales boundary, independent of the calling template. */
+class FulfillmentItemRulesController {
+  sequence = 0;
+  pending = Promise.resolve();
+  evaluator = new _itemRule.ItemRuleEvaluator();
+  constructor(host) {
+    this.host = host;
+  }
+  invalidate() {
+    this.sequence += 1;
+  }
+  apply(serviceType) {
+    const sequence = ++this.sequence;
+    // Even an unsupported mode supersedes any pending takeaway operation.
+    if (serviceType !== 'takeaway' && serviceType !== 'dine_in') return Promise.resolve();
+    const order = this.host.getOrder();
+    const tempOrder = order.getTempOrder?.();
+    const scope = this.host.getScope();
+    const identity = JSON.stringify([tempOrder?.order_id, tempOrder?.external_sale_number, tempOrder?.customer_id]);
+    const initialProducts = tempOrder?.products;
+    const initialFingerprint = cartFingerprint(initialProducts || []);
+    const isCurrent = () => sequence === this.sequence && scope === this.host.getScope() && this.host.getOrder() === order && order.getTempOrder?.() === tempOrder && identity === JSON.stringify([tempOrder?.order_id, tempOrder?.external_sale_number, tempOrder?.customer_id]) && tempOrder?.metadata?.shop_service_data?.service_type === serviceType;
+    const run = async () => {
+      const openData = await this.host.loadOpenData();
+      const ids = positiveIds(openData?.[`fulfillment.${serviceType}_fees_rules`]);
+      if (!ids.length || !isCurrent()) return;
+      if (!tempOrder) return;
+      const assertSnapshot = () => {
+        if (!isCurrent() || tempOrder.products !== initialProducts || cartFingerprint(tempOrder.products) !== initialFingerprint) {
+          throw new Error('The order changed while preparing fulfillment item rules');
+        }
+      };
+      assertSnapshot();
+      const response = await this.host.fetchStrategyModels(ids);
+      assertSnapshot();
+      if (response?.code !== 200 || !Array.isArray(response?.data?.list)) {
+        throw new Error('Unable to load fulfillment item rules');
+      }
+      // Response order need not match the configured order (the latter breaks priority ties).
+      const configs = ids.map(id => {
+        const config = response.data.list.find(item => Number(item?.id) === id)?.metadata;
+        if (config?.metadata?.type !== 'item_rule' || !Array.isArray(config.actions) || !config.conditions) {
+          throw new Error(`Invalid or missing fulfillment item rule ${id}`);
+        }
+        return config;
+      });
+      const runtime = this.host.getOtherParams();
+      const pax = runtime.itemRule?.pax || {};
+      const businessData = {
+        executionScope: 'set_handover',
+        serviceType,
+        channel: String(runtime.channel ?? runtime.platform ?? ''),
+        pax: {
+          total: Number(pax.total) || 0,
+          adult: Number(pax.adult) || 0,
+          child: Number(pax.child) || 0
+        },
+        cartItems: tempOrder.products.map(line => ({
+          product_id: Number(line.product_id),
+          product_variant_id: Number(line.product_variant_id) || 0,
+          quantity: Number(line.num) || 0
+        })),
+        strategyConfigs: configs,
+        custom: runtime.itemRule?.custom
+      };
+      const initialEvaluation = this.evaluator.evaluate(businessData);
+      const requiresMainQuantity = initialEvaluation.rawResults.some(result => result.applicable && result.matchedActions.some(action => action.type === 'PREFILL_CART' && action.target === 'cart' && action.config?.scope === 'set_handover' && action.config.products?.some(product => product.quantityFrom === 'main_product_number')));
+      const actions = requiresMainQuantity ? this.evaluator.evaluate({
+        ...businessData,
+        mainProductNumber: await this.getMainProductNumber(tempOrder.products, configs)
+      }).cartActions : initialEvaluation.cartActions;
+      assertSnapshot();
+      // Prepare every addition before changing the cart; missing products must not leave a half-loaded batch.
+      const sources = await this.loadPrefillSources(actions, tempOrder.products);
+      assertSnapshot();
+      const targetIds = new Set(actions.flatMap(action => action.products.map(product => Number(product.product_id))));
+      const originalSelection = selectionFingerprint(tempOrder.products, targetIds);
+      // Promotion may add gifts or split/merge rows. Only a change to the purchased
+      // quantities invalidates this selection, not promotion's own line reshaping.
+      const targetIsCurrent = () => isCurrent() && selectionFingerprint(tempOrder.products, targetIds) === originalSelection;
+      for (const action of actions) {
+        if (!targetIsCurrent()) return;
+        if (action.type === 'DELETE_PRODUCT') {
+          const deletedIds = new Set(action.products.map(product => Number(product.product_id)));
+          const lines = tempOrder.products.filter(line => deletedIds.has(Number(line.product_id)));
+          if (lines.length) {
+            await order.removeProductsFromOrder(lines.map(lineIdentity), {
+              isCurrentOrder: targetIsCurrent
+            });
+          }
+          continue;
+        }
+        for (const product of action.products) {
+          if (!targetIsCurrent()) return;
+          const key = ownerKey(action, product);
+          const existing = ownedLines(tempOrder.products, key);
+          const quantity = Math.max(0, Math.floor(Number(product.quantity) || 0));
+          if (product.repeat_skip && existing.length) {
+            if (quantity === 0) {
+              await order.removeProductsFromOrder(existing.map(lineIdentity), {
+                isCurrentOrder: targetIsCurrent
+              });
+              continue;
+            }
+            // Keep one owned row and its pricing; never absorb independently added products.
+            if (existing.length > 1) {
+              await order.removeProductsFromOrder(existing.slice(1).map(lineIdentity), {
+                isCurrentOrder: targetIsCurrent
+              });
+            }
+            if (!targetIsCurrent()) return;
+            if (Number(existing[0].num) !== quantity) {
+              await order.updateOrderProductQuantity({
+                ...lineIdentity(existing[0]),
+                num: quantity
+              }, {
+                isCurrentOrder: targetIsCurrent
+              });
+            }
+            continue;
+          }
+          if (quantity === 0) continue;
+          const source = sources.get(Number(product.product_id));
+          const line = (0, _transformBaseProductToOrderProduct.transformBaseProductToOrderProduct)({
+            sourceProduct: source,
+            payload: {
+              product_id: product.product_id,
+              product_variant_id: product.product_variant_id ?? 0,
+              quantity
+            }
+          });
+          if (!line) throw new Error(`Unable to prepare fulfillment product ${product.product_id}`);
+          line.metadata = {
+            ...line.metadata,
+            [ownershipField]: key
+          };
+          const beforeProducts = tempOrder.products;
+          const beforeFingerprint = cartFingerprint(beforeProducts);
+          await order.addProductToOrder(line, undefined, {
+            insertAtStart: true,
+            disableMerge: true,
+            availabilityCommitGuard: () => {
+              if (!targetIsCurrent() || tempOrder.products !== beforeProducts || cartFingerprint(tempOrder.products) !== beforeFingerprint) {
+                throw new Error('The order changed while adding a fulfillment product');
+              }
+            },
+            availabilityCommitTargetGuard: () => targetIsCurrent() && ownedLines(tempOrder.products, key).length > 0
+          });
+        }
+      }
+    };
+    // Serialize writes; a newer choice invalidates the old request before its next mutation.
+    const task = this.pending.then(run).catch(error => {
+      if (sequence === this.sequence) this.host.reportError(error);
+      // Fees are best effort by product decision: Next must remain usable on failure.
+    });
+    this.pending = task;
+    return task;
+  }
+  async loadProducts(ids) {
+    if (!ids.length) return [];
+    const products = this.host.getProducts();
+    if (!products) throw new Error('products module is unavailable for fulfillment item rules');
+    const runtime = this.host.getOtherParams();
+    const now = (0, _dayjs.default)();
+    return products.loadProducts({
+      product_ids: ids,
+      cacheId: runtime.cacheId,
+      customer_id: this.host.getOrder().getTempOrder()?.customer_id ?? undefined,
+      schedule_date: now.format('YYYY-MM-DD'),
+      schedule_datetime: now.format('YYYY-MM-DD HH:mm:ss')
+    });
+  }
+  async getMainProductNumber(lines, configs) {
+    const feeIds = new Set(configs.flatMap(config => config.actions.flatMap(action => action.config?.scope === 'set_handover' && ['PREFILL_CART', 'DELETE_PRODUCT'].includes(action.type) ? (action.config.products || []).map(product => Number(product.product_id)) : [])));
+    const candidates = lines.filter(line => !line.metadata?.[ownershipField] && !feeIds.has(Number(line.product_id)));
+    if (!candidates.length) return 0;
+    const ids = positiveIds(candidates.map(line => line.product_id));
+    const cached = (await this.host.getProducts()?.queryProducts({
+      includeIds: ids
+    })) || [];
+    const sources = new Map();
+    for (const line of candidates) {
+      const cachedSource = cached.find(product => Number(product.id) === Number(line.product_id));
+      const source = Array.isArray(cachedSource?.data_variants) ? cachedSource : line._origin;
+      if (Array.isArray(source?.data_variants)) sources.set(Number(line.product_id), source);
+    }
+    const missing = ids.filter(id => !sources.has(id));
+    for (const source of await this.loadProducts(missing)) sources.set(Number(source.id ?? source.product_id), source);
+    if (ids.some(id => !sources.has(id))) throw new Error('Unable to identify fulfillment main products');
+    return candidates.reduce((sum, line) => {
+      const source = sources.get(Number(line.product_id));
+      const isMain = source?.data_variants?.some(variant => variant?.data?.client_meta?.is_main_product === 1);
+      return sum + (isMain ? Math.max(0, Math.floor(Number(line.num) || 0)) : 0);
+    }, 0);
+  }
+  async loadPrefillSources(actions, lines) {
+    const ids = positiveIds(actions.flatMap(action => action.type === 'PREFILL_CART' ? action.products.filter(product => product.quantity > 0).map(product => product.product_id) : []));
+    const cached = ids.length ? (await this.host.getProducts()?.queryProducts({
+      includeIds: ids
+    })) || [] : [];
+    const sources = new Map(cached.map(product => [Number(product.id), product]));
+    // Existing owned rows can supply their original product if the catalog no longer contains it.
+    for (const line of lines) {
+      if (line.metadata?.[ownershipField] && line._origin && !sources.has(Number(line.product_id))) {
+        sources.set(Number(line.product_id), line._origin);
+      }
+    }
+    for (const source of await this.loadProducts(ids.filter(id => !sources.has(id)))) {
+      sources.set(Number(source.id ?? source.product_id), source);
+    }
+    if (ids.some(id => !sources.has(id))) throw new Error('Unable to load fulfillment fee products');
+    return sources;
+  }
+}
+exports.FulfillmentItemRulesController = FulfillmentItemRulesController;

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

@@ -18,6 +18,7 @@ import { QuotationModule } from '../../modules/Quotation';
 import type { ISalesDetail, ISalesDetailHeader, ISalesBooking, ISalesPayment, ISalesSurcharge } from './utils/parseSalesResponse';
 import { AppPlugin } from '../../plugins/app';
 import { type TransformBaseProductToOrderProductParams } from './utils/transformBaseProductToOrderProduct';
+import type { OpenDataConfig } from '../../modules/OpenData/types';
 export interface BaseSalesState {
     order?: OrderModule;
     products?: ProductList;
@@ -80,6 +81,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private serverOrderChangeSyncEnabled;
     protected pickupTimingEnabled: boolean;
     private pickupTimingController?;
+    private fulfillmentItemRulesController?;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -159,6 +161,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected getSubmitOrderSalesChannel(): string | undefined;
     /** Only solutions opting into Pickup Timing supply effective OpenData. */
     protected loadPickupTimingOpenData(_force: boolean): Promise<Record<string, unknown>>;
+    protected loadFulfillmentItemRuleOpenData(): Promise<OpenDataConfig | null>;
+    private getFulfillmentItemRulesController;
     protected isPickupTimingEnabled(): boolean;
     protected getPickupTimingContextData(key: string): unknown;
     protected getPickupTimingScope(): string;
@@ -270,7 +274,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderDepositAmount(amount: string | number): OrderSummary;
     setPickupReferenceMode(mode: PickupReferenceMode): ShopServiceData;
-    setServiceType(serviceType: ShopServiceType): ShopServiceData;
+    setServiceType(serviceType: ShopServiceType): Promise<ShopServiceData>;
     getPickupTimingBooking(): import("../../modules/Order").PickupTimingBooking | null;
     setPickupTimingBooking(input: PickupTimingBookingInput): import("../../modules/Order").PickupTimingBooking;
     clearPickupTimingBooking(): void;

package/lib/solution/BaseSales/index.js

@@ -23,6 +23,7 @@ Object.keys(_types).forEach(function (key) {
 var _Order = require("../../modules/Order");
 var _pickupTiming = require("../../modules/Order/pickupTiming");
 var _pickupTiming2 = require("./pickupTiming");
+var _fulfillmentItemRules = require("./fulfillmentItemRules");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
 var _types2 = require("../BookingByStep/types");
@@ -503,6 +504,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   serverOrderChangeSyncEnabled = false;
   pickupTimingEnabled = false;
   pickupTimingController;
+  fulfillmentItemRulesController;
   constructor(name, version) {
     super(name, version);
   }
@@ -1165,6 +1167,34 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   async loadPickupTimingOpenData(_force) {
     return {};
   }
+  async loadFulfillmentItemRuleOpenData() {
+    const openData = this.otherParams?.openData ?? this.otherParams?.dineInConfig;
+    return openData && typeof openData === 'object' && !Array.isArray(openData) ? openData : null;
+  }
+  getFulfillmentItemRulesController() {
+    if (!this.fulfillmentItemRulesController) {
+      this.fulfillmentItemRulesController = new _fulfillmentItemRules.FulfillmentItemRulesController({
+        getOrder: () => {
+          if (!this.store.order) throw new Error('order 模块未初始化');
+          return this.store.order;
+        },
+        getProducts: () => this.store.products,
+        loadOpenData: () => this.loadFulfillmentItemRuleOpenData(),
+        getScope: () => this.getPickupTimingScope(),
+        getOtherParams: () => this.otherParams,
+        fetchStrategyModels: ids => this.request.get('/promotion', {
+          skip: 1,
+          num: 99,
+          status: 'active',
+          ids
+        }),
+        reportError: error => this.logWarning('履约费用策略执行失败，保留服务类型设置', {
+          error: error instanceof Error ? error.message : String(error)
+        })
+      });
+    }
+    return this.fulfillmentItemRulesController;
+  }
   isPickupTimingEnabled() {
     return this.pickupTimingEnabled && this.otherParams?.enablePickupTiming !== false;
   }
@@ -1193,6 +1223,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
           if (!this.store.order) throw new Error('order 模块未初始化');
           return this.store.order;
         },
+        setServiceType: serviceType => this.setServiceType(serviceType),
         getSchedule: () => this.store.schedule,
         loadOpenData: force => this.loadPickupTimingOpenData(force),
         getTimezone: () => String(this.getPickupTimingContextData('timezone') ?? ''),
@@ -1559,6 +1590,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   }
   async destroy() {
     this.resetPickupTimingCache();
+    this.fulfillmentItemRulesController?.invalidate();
     this.serverOrderChangeUnsubscribe?.();
     this.serverOrderChangeUnsubscribe = null;
     this.paymentMethodsChangedUnsubscribe?.();
@@ -1776,9 +1808,16 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) throw new Error('order 模块未初始化');
     return this.store.order.updateTempOrderPickupReferenceMode(mode);
   }
-  setServiceType(serviceType) {
+  async setServiceType(serviceType) {
     if (!this.store.order) throw new Error('order 模块未初始化');
-    return this.store.order.updateTempOrderServiceType(serviceType);
+    const serviceData = this.store.order.updateTempOrderServiceType(serviceType);
+    await this.getFulfillmentItemRulesController().apply(serviceType);
+    // 费用规则可能增删商品；即使没有普通促销，也要同步页面的购物车和金额快照。
+    const tempOrder = this.getTempOrder();
+    if (tempOrder) await this.effectsEmit('onTempOrderReplaced', {
+      tempOrder
+    });
+    return serviceData;
   }
   getPickupTimingBooking() {
     return this.store.order?.getPickupTimingBooking() || null;
@@ -1870,6 +1909,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   async clearOrderCartLines() {
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');
+      this.fulfillmentItemRulesController?.invalidate();
       const tempOrder = await this.store.order.clearOrderCartLines();
       if (this.currentSalesDetail) {
         this.currentSalesDetail = {
@@ -1897,6 +1937,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   /** 切换法币 / WalletPass 单位时清空商品、折扣与支付状态，保留客户。 */
   async clearOrderForSettlementSwitch() {
     if (!this.store.order) throw new Error('order 模块未初始化');
+    this.fulfillmentItemRulesController?.invalidate();
     const tempOrder = await this.store.order.clearOrderForSettlementSwitch();
     if (this.currentSalesDetail) {
       this.currentSalesDetail = {

package/lib/solution/BaseSales/pickupTiming.d.ts

@@ -1,8 +1,10 @@
 import type { OrderModule } from '../../modules/Order';
+import type { ShopServiceType } from '../../modules/Order/types';
 import type { ScheduleModule } from '../../modules/Schedule';
 import { type PickupTimingAvailability, type PickupTimingSelection, type PickupTimingValidationResult } from '../../modules/FulfillmentTiming';
 interface PickupTimingHost {
     getOrder: () => OrderModule;
+    setServiceType?: (serviceType: ShopServiceType) => unknown | Promise<unknown>;
     getSchedule: () => ScheduleModule | undefined;
     loadOpenData: (force: boolean) => Promise<Record<string, unknown>>;
     getTimezone: () => string;

package/lib/solution/BaseSales/pickupTiming.js

@@ -219,7 +219,11 @@ class PickupTimingController {
       return this.getSelection();
     }
     if (selection.serviceType !== 'pick_up') {
-      order.updateTempOrderServiceType(selection.serviceType);
+      if (this.host.setServiceType) {
+        await this.host.setServiceType(selection.serviceType);
+      } else {
+        order.updateTempOrderServiceType(selection.serviceType);
+      }
       return this.getSelection();
     }
     const slot = selection.mode === 'asap' ? (0, _FulfillmentTiming.getAsapPickupTiming)({

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

@@ -328,7 +328,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 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -375,7 +375,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "normal" | "session">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -58,6 +58,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private getIdGeneratorPlugin;
     protected loadOpenDataConfig(): Promise<OpenDataConfig | null>;
     getOpenData(): Promise<OpenDataConfig | null>;
+    protected loadFulfillmentItemRuleOpenData(): Promise<OpenDataConfig | null>;
     getInvoiceLayoutConfig(): Promise<InvoiceLayoutConfig>;
     getInvoiceTemplateSettings(): Promise<InvoiceTemplateSettings>;
     protected isInvoiceOpenDataCacheCurrent(): boolean;

package/lib/solution/BookingTicket/index.js

@@ -289,6 +289,9 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   async getOpenData() {
     return this.loadOpenDataConfig();
   }
+  async loadFulfillmentItemRuleOpenData() {
+    return this.store.openData ? this.getOpenData() : super.loadFulfillmentItemRuleOpenData();
+  }
   async getInvoiceLayoutConfig() {
     const openData = await this.loadOpenDataConfig();
     if (!openData) return (0, _OpenData.getDefaultInvoiceLayoutConfig)();

package/package.json

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