@pisell/pisellos 2.3.149 → 2.3.151

package/dist/model/strategy/adapter/itemRule/adapter.d.ts

@@ -1,6 +1,6 @@
 import type { EvaluationResult, RuntimeContext, ActionEffect } from '../../type';
 import type { BusinessAdapter } from '../type';
-import { type ItemRuleBusinessData, type QuantityCheckResult, type PrefillItemResult, type QuantityLimitResult, type AllergyRequirement } from './type';
+import { type ItemRuleBusinessData, type ItemRuleCartAction, type QuantityCheckResult, type PrefillItemResult, type QuantityLimitResult, type AllergyRequirement } from './type';
 /**
  * ItemRule 适配器
  *
@@ -14,6 +14,7 @@ export declare class ItemRuleAdapter implements BusinessAdapter {
     transformResult(result: EvaluationResult, businessData?: ItemRuleBusinessData): {
         quantityChecks: QuantityCheckResult[];
         prefillItems: PrefillItemResult[];
+        cartActions: ItemRuleCartAction[];
         allergyRequirements: AllergyRequirement[];
     };
     private processAllergyCheck;
@@ -66,5 +67,6 @@ export declare class ItemRuleAdapter implements BusinessAdapter {
      * 根据 quantityFrom 计算预填数量
      */
     private resolvePrefillQuantity;
+    private processDeleteProduct;
 }
 export default ItemRuleAdapter;

package/dist/model/strategy/adapter/itemRule/adapter.js

@@ -73,11 +73,13 @@ export var ItemRuleAdapter = /*#__PURE__*/function () {
     value: function transformResult(result, businessData) {
       var quantityChecks = [];
       var prefillItems = [];
+      var cartActions = [];
       var allergyRequirements = [];
       if (!result.applicable || !businessData) {
         return {
           quantityChecks: quantityChecks,
           prefillItems: prefillItems,
+          cartActions: cartActions,
           allergyRequirements: allergyRequirements
         };
       }
@@ -93,7 +95,31 @@ export var ItemRuleAdapter = /*#__PURE__*/function () {
             }
           } else if (action.type === ITEM_RULE_ACTION_TYPES.PREFILL_CART) {
             var items = this.processPrefillCart(action, businessData);
-            prefillItems.push.apply(prefillItems, _toConsumableArray(items));
+            prefillItems.push.apply(prefillItems, _toConsumableArray(items.filter(function (item) {
+              return item.quantity > 0;
+            })));
+            if (items.length) {
+              var _action$priority;
+              cartActions.push({
+                type: ITEM_RULE_ACTION_TYPES.PREFILL_CART,
+                strategyId: result.config.metadata.id,
+                ruleId: action.id,
+                priority: (_action$priority = action.priority) !== null && _action$priority !== void 0 ? _action$priority : 0,
+                products: items
+              });
+            }
+          } else if (action.type === ITEM_RULE_ACTION_TYPES.DELETE_PRODUCT) {
+            var products = this.processDeleteProduct(action, businessData);
+            if (products.length) {
+              var _action$priority2;
+              cartActions.push({
+                type: ITEM_RULE_ACTION_TYPES.DELETE_PRODUCT,
+                strategyId: result.config.metadata.id,
+                ruleId: action.id,
+                priority: (_action$priority2 = action.priority) !== null && _action$priority2 !== void 0 ? _action$priority2 : 0,
+                products: products
+              });
+            }
           } else if (action.type === ITEM_RULE_ACTION_TYPES.ALLERGY_CHECK) {
             var requirement = this.processAllergyCheck(action, result, businessData);
             if (requirement) allergyRequirements.push(requirement);
@@ -107,6 +133,7 @@ export var ItemRuleAdapter = /*#__PURE__*/function () {
       return {
         quantityChecks: quantityChecks,
         prefillItems: prefillItems,
+        cartActions: cartActions,
         allergyRequirements: allergyRequirements
       };
     }
@@ -117,7 +144,7 @@ export var ItemRuleAdapter = /*#__PURE__*/function () {
   }, {
     key: "processAllergyCheck",
     value: function processAllergyCheck(action, result, businessData) {
-      var _currentProduct$produ, _productTargets$find, _target$dataSource, _action$priority, _target$product_varia;
+      var _currentProduct$produ, _productTargets$find, _target$dataSource, _action$priority3, _target$product_varia;
       var config = action.config;
       var currentProduct = businessData.currentProduct;
       if (!config || config.targetType !== 'product' || config.promptScope !== 'once_per_order_product' || !Array.isArray(config.targets) || !currentProduct) {
@@ -142,7 +169,7 @@ export var ItemRuleAdapter = /*#__PURE__*/function () {
       return _objectSpread(_objectSpread({
         strategyId: result.config.metadata.id,
         ruleId: action.id,
-        priority: (_action$priority = action.priority) !== null && _action$priority !== void 0 ? _action$priority : 0,
+        priority: (_action$priority3 = action.priority) !== null && _action$priority3 !== void 0 ? _action$priority3 : 0,
         targetType: 'product',
         product_id: currentProductId
       }, Number((_target$product_varia = target.product_variant_id) !== null && _target$product_varia !== void 0 ? _target$product_varia : 0) > 0 ? {
@@ -536,7 +563,9 @@ export var ItemRuleAdapter = /*#__PURE__*/function () {
     key: "processPrefillCart",
     value: function processPrefillCart(action, businessData) {
       var config = action.config;
-      if (!(config !== null && config !== void 0 && config.products)) return [];
+      if (!Array.isArray(config === null || config === void 0 ? void 0 : config.products)) return [];
+      if (config.scope !== businessData.executionScope) return [];
+      if (config.scope === 'set_handover' && action.target !== 'cart') return [];
       var results = [];
       var _iterator7 = _createForOfIteratorHelper(config.products),
         _step7;
@@ -544,13 +573,18 @@ export var ItemRuleAdapter = /*#__PURE__*/function () {
         for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
           var prefillProduct = _step7.value;
           var quantity = this.resolvePrefillQuantity(prefillProduct.quantityFrom, prefillProduct.quantity, businessData);
-          if (quantity <= 0) continue;
-          results.push({
+          var shouldSyncZero = config.scope === 'set_handover' && prefillProduct.repeat_skip === true;
+          if (!Number.isFinite(quantity) || quantity < 0 || quantity === 0 && !shouldSyncZero) {
+            continue;
+          }
+          results.push(_objectSpread({
             ruleId: action.id,
             product_id: prefillProduct.product_id,
             product_variant_id: prefillProduct.product_variant_id,
             quantity: quantity
-          });
+          }, prefillProduct.repeat_skip !== undefined ? {
+            repeat_skip: prefillProduct.repeat_skip === true
+          } : {}));
         }
       } catch (err) {
         _iterator7.e(err);
@@ -573,10 +607,43 @@ export var ItemRuleAdapter = /*#__PURE__*/function () {
           return businessData.pax.adult;
         case 'fixed':
           return fixedValue !== null && fixedValue !== void 0 ? fixedValue : 0;
+        case 'main_product_number':
+          {
+            var _businessData$mainPro;
+            var mainProductNumber = (_businessData$mainPro = businessData.mainProductNumber) !== null && _businessData$mainPro !== void 0 ? _businessData$mainPro : 0;
+            return Number.isFinite(mainProductNumber) ? Math.max(0, mainProductNumber) : 0;
+          }
         default:
           return fixedValue !== null && fixedValue !== void 0 ? fixedValue : 0;
       }
     }
+  }, {
+    key: "processDeleteProduct",
+    value: function processDeleteProduct(action, businessData) {
+      var config = action.config;
+      if (action.target !== 'cart' || (config === null || config === void 0 ? void 0 : config.scope) !== 'set_handover' || config.scope !== businessData.executionScope || !Array.isArray(config.products)) {
+        return [];
+      }
+      var productIds = new Set();
+      var _iterator8 = _createForOfIteratorHelper(config.products),
+        _step8;
+      try {
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var product = _step8.value;
+          var productId = Number(product === null || product === void 0 ? void 0 : product.product_id);
+          if (Number.isInteger(productId) && productId > 0) productIds.add(productId);
+        }
+      } catch (err) {
+        _iterator8.e(err);
+      } finally {
+        _iterator8.f();
+      }
+      return Array.from(productIds, function (product_id) {
+        return {
+          product_id: product_id
+        };
+      });
+    }
   }]);
   return ItemRuleAdapter;
 }();

package/dist/model/strategy/adapter/itemRule/evaluator.d.ts

@@ -1,5 +1,5 @@
 import type { StrategyConfig } from '../../type';
-import { type ItemRuleBusinessData, type ItemRuleEvaluationResult, type QuantityCheckResult, type QuantityLimitResult, type PrefillItemResult, type AllergyRequirement } from './type';
+import { type ItemRuleBusinessData, type ItemRuleEvaluationResult, type QuantityCheckResult, type QuantityLimitResult, type PrefillItemResult, type ItemRuleCartAction, type AllergyRequirement } from './type';
 /**
  * ItemRule 评估器
  *
@@ -47,4 +47,6 @@ export declare class ItemRuleEvaluator {
      * 便捷方法：仅获取需要预填到购物车的商品
      */
     getPrefillItems(businessData: ItemRuleBusinessData): PrefillItemResult[];
+    /** 获取按优先级排序的购物车动作，交由销售业务层执行。 */
+    getCartActions(businessData: ItemRuleBusinessData): ItemRuleCartAction[];
 }

package/dist/model/strategy/adapter/itemRule/evaluator.js

@@ -63,6 +63,7 @@ export var ItemRuleEvaluator = /*#__PURE__*/function () {
       }) : this.strategyConfigs;
       var allQuantityChecks = [];
       var allPrefillItems = [];
+      var allCartActions = [];
       var allAllergyRequirements = [];
       var rawResults = [];
       var context = this.adapter.prepareContext(businessData);
@@ -76,9 +77,11 @@ export var ItemRuleEvaluator = /*#__PURE__*/function () {
           var _this$adapter$transfo = this.adapter.transformResult(evalResult, businessData),
             quantityChecks = _this$adapter$transfo.quantityChecks,
             prefillItems = _this$adapter$transfo.prefillItems,
+            cartActions = _this$adapter$transfo.cartActions,
             allergyRequirements = _this$adapter$transfo.allergyRequirements;
           allQuantityChecks.push.apply(allQuantityChecks, _toConsumableArray(quantityChecks));
           allPrefillItems.push.apply(allPrefillItems, _toConsumableArray(prefillItems));
+          allCartActions.push.apply(allCartActions, _toConsumableArray(cartActions));
           allAllergyRequirements.push.apply(allAllergyRequirements, _toConsumableArray(allergyRequirements));
         }
       } catch (err) {
@@ -92,6 +95,9 @@ export var ItemRuleEvaluator = /*#__PURE__*/function () {
       return {
         quantityChecks: allQuantityChecks,
         prefillItems: allPrefillItems,
+        cartActions: allCartActions.sort(function (left, right) {
+          return right.priority - left.priority;
+        }),
         allergyRequirements: allAllergyRequirements,
         allPassed: failedChecks.length === 0,
         failedChecks: failedChecks,
@@ -188,6 +194,13 @@ export var ItemRuleEvaluator = /*#__PURE__*/function () {
       var result = this.evaluate(businessData);
       return result.prefillItems;
     }
+
+    /** 获取按优先级排序的购物车动作，交由销售业务层执行。 */
+  }, {
+    key: "getCartActions",
+    value: function getCartActions(businessData) {
+      return this.evaluate(businessData).cartActions;
+    }
   }]);
   return ItemRuleEvaluator;
 }();

package/dist/model/strategy/adapter/itemRule/type.d.ts

@@ -4,6 +4,8 @@ export declare const ITEM_RULE_ACTION_TYPES: {
     readonly QUANTITY_CHECK: "QUANTITY_CHECK";
     /** 预填购物车 */
     readonly PREFILL_CART: "PREFILL_CART";
+    /** 按商品 ID 删除购物车商品 */
+    readonly DELETE_PRODUCT: "DELETE_PRODUCT";
     /** 加购前过敏信息确认 */
     readonly ALLERGY_CHECK: "ALLERGY_CHECK";
 };
@@ -101,6 +103,10 @@ export interface AllergyRequirement {
     promptScope: AllergyPromptScope;
     allowNote: boolean;
 }
+/** 购物车动作触发时机，与数量校验的提交范围相互独立。 */
+export type ItemRuleExecutionScope = 'set_handover';
+/** 预填数量来源；主商品数量不扩展到 QUANTITY_CHECK。 */
+export type PrefillQuantitySource = QuantitySource | 'main_product_number';
 /**
  * 预填商品项
  */
@@ -110,9 +116,11 @@ export interface PrefillProduct {
     /** 变体 ID（可选，0 或不填表示无变体/默认） */
     product_variant_id?: number;
     /** 数量来源 */
-    quantityFrom: QuantitySource;
+    quantityFrom: PrefillQuantitySource;
     /** 固定数量（当 quantityFrom 为 'fixed' 时使用） */
     quantity?: number;
+    /** 设置取餐方式时同步自动附加行的数量，重复执行不累加。 */
+    repeat_skip?: boolean;
 }
 /**
  * Prefill Cart Action 的详细配置
@@ -120,9 +128,18 @@ export interface PrefillProduct {
  * 存储在 ActionEffect.config 中
  */
 export interface PrefillCartConfig {
+    /** 不填时保持原有预填时机；set_handover 仅在设置取餐方式时执行。 */
+    scope?: ItemRuleExecutionScope;
     /** 要预填的商品列表 */
     products: PrefillProduct[];
 }
+/** 删除指定商品的全部购物车行，不区分变体或是否为自动添加。 */
+export interface DeleteProductConfig {
+    scope: ItemRuleExecutionScope;
+    products: Array<{
+        product_id: number;
+    }>;
+}
 /**
  * 购物车商品摘要
  */
@@ -157,6 +174,10 @@ export interface ItemRuleBusinessData {
     historicalItems?: CartItemSummary[];
     /** 服务类型（如 'dine-in', 'takeaway'） */
     serviceType?: string;
+    /** 当前购物车动作触发时机；未填时不评估 set_handover 动作。 */
+    executionScope?: ItemRuleExecutionScope;
+    /** 由销售业务层提供的主商品总数量，不包含附加费用商品。 */
+    mainProductNumber?: number;
     /** 当前业务渠道（如 'kiosk', 'pos', 'online_store'） */
     channel?: string;
     /** 当前正在加入购物车的商品；ALLERGY_CHECK 只读取该商品的 Target。 */
@@ -209,7 +230,23 @@ export interface PrefillItemResult {
     product_variant_id?: number;
     /** 应添加的数量 */
     quantity: number;
+    /** true 时执行器同步自动附加行数量；quantity=0 表示移除该自动行。 */
+    repeat_skip?: boolean;
 }
+/** 保留不同购物车动作之间的优先级与执行顺序。 */
+export type ItemRuleCartAction = {
+    strategyId: string;
+    ruleId: string;
+    priority: number;
+} & ({
+    type: 'PREFILL_CART';
+    products: PrefillItemResult[];
+} | {
+    type: 'DELETE_PRODUCT';
+    products: Array<{
+        product_id: number;
+    }>;
+});
 /**
  * 单条规则的数量限制（不含校验结果，仅描述配置中的约束）
  */
@@ -258,6 +295,8 @@ export interface ItemRuleEvaluationResult {
     quantityChecks: QuantityCheckResult[];
     /** 需要预填的商品列表 */
     prefillItems: PrefillItemResult[];
+    /** 按 priority 降序排列的购物车动作；同优先级保持策略与动作顺序。 */
+    cartActions: ItemRuleCartAction[];
     /** 当前商品命中的过敏门禁要求；不同 Action/商品不会合并。 */
     allergyRequirements: AllergyRequirement[];
     /** 所有校验是否全部通过 */

package/dist/model/strategy/adapter/itemRule/type.js

@@ -7,6 +7,8 @@ export var ITEM_RULE_ACTION_TYPES = {
   QUANTITY_CHECK: 'QUANTITY_CHECK',
   /** 预填购物车 */
   PREFILL_CART: 'PREFILL_CART',
+  /** 按商品 ID 删除购物车商品 */
+  DELETE_PRODUCT: 'DELETE_PRODUCT',
   /** 加购前过敏信息确认 */
   ALLERGY_CHECK: 'ALLERGY_CHECK'
 };
@@ -72,6 +74,10 @@ export var ITEM_RULE_TEMPLATES = {
 // Prefill Cart 相关类型
 // ============================================
 
+/** 购物车动作触发时机，与数量校验的提交范围相互独立。 */
+
+/** 预填数量来源；主商品数量不扩展到 QUANTITY_CHECK。 */
+
 /**
  * 预填商品项
  */
@@ -82,6 +88,8 @@ export var ITEM_RULE_TEMPLATES = {
  * 存储在 ActionEffect.config 中
  */
 
+/** 删除指定商品的全部购物车行，不区分变体或是否为自动添加。 */
+
 // ============================================
 // 业务数据类型（Evaluator 输入）
 // ============================================
@@ -110,6 +118,8 @@ export var ITEM_RULE_TEMPLATES = {
  * 单个 Prefill Cart 的预填结果
  */
 
+/** 保留不同购物车动作之间的优先级与执行顺序。 */
+
 /**
  * 单条规则的数量限制（不含校验结果，仅描述配置中的约束）
  */

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

@@ -82,6 +82,8 @@ export interface OpenDataConfig {
     'sale.enabled_item_rules'?: number[];
     'fulfillment.enable_pickup'?: boolean;
     'fulfillment.handover_mode'?: string[];
+    'fulfillment.takeaway_fees_rules'?: number[];
+    'fulfillment.dine_in_fees_rules'?: number[];
     'fulfillment.pickup.timing_mode'?: 'asap_only' | 'scheduled_only' | 'asap_and_scheduled';
     'fulfillment.pickup.schedule'?: number[];
     'fulfillment.pickup.advance_days'?: number;

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

@@ -509,7 +509,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private applyOrderProductUpdateToTempOrder;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<OrderProduct[]>;
     updateOrderProducts(paramsList: UpdateOrderProductParams[]): Promise<OrderProduct[]>;
-    updateOrderProductQuantity(params: UpdateOrderProductQuantityParams): Promise<OrderProduct[]>;
+    updateOrderProductQuantity(params: UpdateOrderProductQuantityParams, options?: {
+        isCurrentOrder?: () => boolean;
+    }): Promise<OrderProduct[]>;
     updateOrderBooking(params: UpdateOrderBookingParams): any[];
     /**
      * 商品行写路径收尾：促销 → 折扣 → 清洗 → summary → 持久化。
@@ -593,7 +595,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;