@pisell/pisellos 0.0.510 → 0.0.511

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

@@ -0,0 +1,9 @@
+// 导出评估器
+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 } from "./examples";

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams, SubmitScanOrderParams, ScanOrderMoreParams, CheckoutOrderParams } from './types';
+import { OrderModuleAPI, CommitOrderParams, SubmitScanOrderParams, ScanOrderMoreParams, CheckoutOrderParams, UpdateProductInOrderParams } from './types';
 import { CartItem } from '../Cart/types';
 import { type SubmitPayloadEnhancer } from './utils';
 import type { ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderSummary, ScanOrderTempOrder } from '../../solution/ScanOrder/types';
@@ -71,11 +71,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateTempOrderBuzzer(buzzer: string): string;
     updateTempOrderContactsInfo(contactsInfo: any[]): any[];
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
-    updateProductInOrder(params: {
-        product_id: number | null;
-        product_variant_id: number;
-        updates: Partial<ScanOrderOrderProduct>;
-    }): Promise<ScanOrderOrderProduct[]>;
+    updateProductInOrder(params: UpdateProductInOrderParams): Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
     submitTempOrder<T = any>(params?: {
         cacheId?: string;
@@ -119,3 +115,4 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getOrderInfoByRemote(order_id: number): Promise<any>;
     getLastOrderInfo(): Record<string, any> | undefined;
 }
+export type { UpdateProductInOrderParams } from './types';

package/dist/modules/Order/index.js

@@ -25,10 +25,10 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
-import { generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, formatDateTime, filterProductsForScanOrderMore, formatV1Product, isTempOrder } from "./utils";
+import { generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, filterProductsForScanOrderMore, formatV1Product, isTempOrder } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
-import { getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
+import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
 import { DiscountModule } from "../Discount";
 import { RulesModule } from "../Rules";
 import { UnavailableReason } from "../Rules/types";
@@ -400,6 +400,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!Array.isArray(p.product_bundle)) {
                 p.product_bundle = [];
               }
+              // 不透明 identity 契约：旧缓存里可能没有 identity_key，
+              // 此处统一回填 UUID 并同步 metadata.unique_identification_number，
+              // 避免升级后 UI 侧持有的 rowKey 找不到对应行。
+              var row = p;
+              if (typeof row.identity_key !== 'string' || row.identity_key.length === 0) {
+                var newKey = createUuidV4();
+                row.identity_key = newKey;
+                if (!row.metadata || _typeof(row.metadata) !== 'object') {
+                  row.metadata = {};
+                }
+                if (!row.metadata.unique_identification_number) {
+                  row.metadata.unique_identification_number = newKey;
+                }
+              }
             }
           } catch (err) {
             _iterator.e(err);
@@ -611,31 +625,59 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductToOrder",
     value: function () {
       var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(product) {
-        var tempOrder, normalizedProduct, productIndex, targetProduct;
+        var tempOrder, hasExplicitIdentityKey, normalizedProduct, productIndex, targetProduct, incomingFingerprint, matchedIndex, _normalizedProduct, _targetProduct, _normalizedProduct2;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
-              normalizedProduct = normalizeOrderProduct(product);
-              productIndex = getProductIdentityIndex(tempOrder.products, normalizedProduct);
-              if (productIndex === -1) {
-                tempOrder.products.push(normalizedProduct);
+              hasExplicitIdentityKey = typeof product.identity_key === 'string' && product.identity_key.length > 0;
+              if (hasExplicitIdentityKey) {
+                // 调用方自持 identity_key（如 VenueBooking 外部生成）→ 走严格 identity 合并。
+                normalizedProduct = normalizeOrderProduct(product);
+                productIndex = getProductIdentityIndex(tempOrder.products, normalizedProduct);
+                if (productIndex === -1) {
+                  tempOrder.products.push(normalizedProduct);
+                } else {
+                  targetProduct = tempOrder.products[productIndex];
+                  tempOrder.products[productIndex] = _objectSpread(_objectSpread(_objectSpread({}, targetProduct), normalizedProduct), {}, {
+                    num: getSafeProductNum(targetProduct.num + normalizedProduct.num),
+                    _origin: normalizedProduct._origin || targetProduct._origin
+                  });
+                }
               } else {
-                targetProduct = tempOrder.products[productIndex];
-                tempOrder.products[productIndex] = _objectSpread(_objectSpread(_objectSpread({}, targetProduct), normalizedProduct), {}, {
-                  num: getSafeProductNum(targetProduct.num + normalizedProduct.num),
-                  _origin: normalizedProduct._origin || targetProduct._origin
+                // 无 identity_key：按 SKU + 内容指纹（options + bundle）匹配既有行以累加数量；
+                // 命中时保留已有 identity_key，未命中才由 normalizeOrderProduct 自动生成 UUID。
+                incomingFingerprint = buildProductLineFingerprint(product.product_option_item, product.product_bundle);
+                matchedIndex = tempOrder.products.findIndex(function (item) {
+                  if (item.product_id !== product.product_id) return false;
+                  if (item.product_variant_id !== product.product_variant_id) return false;
+                  var existedFingerprint = buildProductLineFingerprint(item.product_option_item, item.product_bundle);
+                  return existedFingerprint === incomingFingerprint;
                 });
+                if (matchedIndex === -1) {
+                  _normalizedProduct = normalizeOrderProduct(product);
+                  tempOrder.products.push(_normalizedProduct);
+                } else {
+                  _targetProduct = tempOrder.products[matchedIndex];
+                  _normalizedProduct2 = normalizeOrderProduct(_objectSpread(_objectSpread({}, product), {}, {
+                    identity_key: _targetProduct.identity_key
+                  }));
+                  tempOrder.products[matchedIndex] = _objectSpread(_objectSpread(_objectSpread({}, _targetProduct), _normalizedProduct2), {}, {
+                    identity_key: _targetProduct.identity_key,
+                    num: getSafeProductNum(_targetProduct.num + _normalizedProduct2.num),
+                    _origin: _normalizedProduct2._origin || _targetProduct._origin
+                  });
+                }
               }
               this.applyDiscount();
-              _context7.next = 7;
+              _context7.next = 6;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 7:
+            case 6:
               this.persistTempOrder();
               return _context7.abrupt("return", tempOrder.products);
-            case 9:
+            case 8:
             case "end":
               return _context7.stop();
           }
@@ -650,22 +692,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateProductInOrder",
     value: function () {
       var _updateProductInOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
-        var product_id, product_variant_id, updates, tempOrder, productIndex, targetProduct, nextProduct;
+        var product_id, product_variant_id, updates, identity_key, product_option_item, product_bundle, tempOrder, identityLookup, productIndex, targetProduct, nextProduct;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              product_id = params.product_id, product_variant_id = params.product_variant_id, updates = params.updates;
+              product_id = params.product_id, product_variant_id = params.product_variant_id, updates = params.updates, identity_key = params.identity_key, product_option_item = params.product_option_item, product_bundle = params.product_bundle;
               tempOrder = this.ensureTempOrder();
-              productIndex = getProductIdentityIndex(tempOrder.products, {
+              identityLookup = {
                 product_id: product_id,
                 product_variant_id: product_variant_id
-              });
+              };
+              if (identity_key !== undefined) identityLookup.identity_key = identity_key;
+              if (product_option_item !== undefined) identityLookup.product_option_item = product_option_item;
+              if (product_bundle !== undefined) identityLookup.product_bundle = product_bundle;
+              productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               if (!(productIndex === -1)) {
-                _context8.next = 5;
+                _context8.next = 9;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新');
-            case 5:
+            case 9:
               targetProduct = tempOrder.products[productIndex];
               nextProduct = _objectSpread(_objectSpread(_objectSpread({}, targetProduct), updates), {}, {
                 product_id: product_id,
@@ -674,14 +720,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextProduct.num = getSafeProductNum(nextProduct.num);
               tempOrder.products[productIndex] = nextProduct;
               this.applyDiscount();
-              _context8.next = 12;
+              _context8.next = 16;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 12:
+            case 16:
               this.persistTempOrder();
               return _context8.abrupt("return", tempOrder.products);
-            case 14:
+            case 18:
             case "end":
               return _context8.stop();
           }

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

@@ -16,6 +16,15 @@ export interface OrderState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
 }
+/** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 identity_key / 选项指纹等 */
+export interface UpdateProductInOrderParams {
+    product_id: number | null;
+    product_variant_id: number;
+    updates: Partial<ScanOrderOrderProduct>;
+    identity_key?: string;
+    product_option_item?: any[];
+    product_bundle?: any[];
+}
 /**
  * 订单信息
  */
@@ -43,6 +52,8 @@ export interface SubmitScanOrderProduct {
     discount_list: any[];
     product_bundle: any[];
     metadata: Record<string, any>;
+    /** 商品行备注 */
+    note?: string;
 }
 export interface SubmitScanOrderSummary {
     product_quantity: number;
@@ -210,11 +221,7 @@ export interface OrderModuleAPI {
     updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: any[]) => any[];
     addProductToOrder: (product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity) => Promise<ScanOrderOrderProduct[]>;
-    updateProductInOrder: (params: {
-        product_id: number | null;
-        product_variant_id: number;
-        updates: Partial<ScanOrderOrderProduct>;
-    }) => Promise<ScanOrderOrderProduct[]>;
+    updateProductInOrder: (params: UpdateProductInOrderParams) => Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder: (identity: ScanOrderOrderProductIdentity) => Promise<ScanOrderOrderProduct[]>;
     persistTempOrder: () => void;
     submitTempOrder: <T = any>(params?: {

package/dist/modules/Order/types.js

@@ -6,6 +6,8 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
   return OrderHooks;
 }({});
 
+/** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 identity_key / 选项指纹等 */
+
 /**
  * 订单信息
  */

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

@@ -81,6 +81,7 @@ export declare function formatV1Product(products: ScanOrderSubmitProduct[]): {
     product_id: number | null;
     product_variant_id: number;
     num: number;
+    note: string;
     rowKey: number | null;
     session: null;
     unique: string;

package/dist/modules/Order/utils.js

@@ -49,6 +49,8 @@ export function createDefaultOrderRulesHooks() {
         id: product.product_id,
         // Rules 引擎用 _id 作为 processedProductsMap 键；必须与购物车行级 identity 一致，
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
+        // 不透明 identity 契约下，normalizeOrderProduct / restoreTempOrderFromStorage 已保证 identity_key 必存在；
+        // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
         _id: product.identity_key ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.identity_key) : "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(buildProductLineFingerprint(product.product_option_item, product.product_bundle)),
         price: product.selling_price,
         total: new Decimal(product.selling_price || 0).times(product.num || 1).toNumber(),
@@ -170,6 +172,29 @@ export function formatDateTime(date) {
 function normalizeSubmitPlatform(platform) {
   return (platform === null || platform === void 0 ? void 0 : platform.toLowerCase()) === 'pc' ? 'PC' : 'H5';
 }
+
+// 出站重命名：后端 checkout 协议字段 option_group_item_id；
+// tempOrder / UI 运行时一律使用 product_option_item_id。仅保留后端契约字段，
+// 与 src/modules/Cart/utils/cartProduct.ts#formatOptionsToOrigin 形状一致。
+function formatSubmitOptionItems(options) {
+  if (!Array.isArray(options)) return [];
+  return options.map(function (d) {
+    var _d$option_group_item_;
+    return {
+      num: d === null || d === void 0 ? void 0 : d.num,
+      option_group_item_id: (_d$option_group_item_ = d === null || d === void 0 ? void 0 : d.option_group_item_id) !== null && _d$option_group_item_ !== void 0 ? _d$option_group_item_ : d === null || d === void 0 ? void 0 : d.product_option_item_id,
+      option_group_id: d === null || d === void 0 ? void 0 : d.option_group_id
+    };
+  });
+}
+function formatSubmitBundleItems(bundle) {
+  if (!Array.isArray(bundle)) return [];
+  return bundle.map(function (b) {
+    return _objectSpread(_objectSpread({}, b), {}, {
+      option: formatSubmitOptionItems(b === null || b === void 0 ? void 0 : b.option)
+    });
+  });
+}
 function normalizeSubmitProduct(product) {
   var _origin = product._origin,
     identity_key = product.identity_key,
@@ -196,9 +221,9 @@ function normalizeSubmitProduct(product) {
   return _objectSpread(_objectSpread(_objectSpread({}, submitProduct), bookingUid ? {
     booking_uid: bookingUid
   } : {}), {}, {
-    product_option_item: submitProduct.product_option_item || [],
+    product_option_item: formatSubmitOptionItems(submitProduct.product_option_item),
     discount_list: submitProduct.discount_list || [],
-    product_bundle: submitProduct.product_bundle || [],
+    product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
     // 出站兼容：后端仍消费 payment_price 字段，从 selling_price（券后单价）派生。
     payment_price: submitProduct.selling_price
@@ -402,6 +427,7 @@ export function filterProductsForScanOrderMore(products) {
 }
 export function formatV1Product(products) {
   return products.map(function (product) {
+    var _product$note;
     return {
       bundle: product.product_bundle,
       key: product.product_id,
@@ -409,6 +435,7 @@ export function formatV1Product(products) {
       product_id: product.product_id,
       product_variant_id: product.product_variant_id,
       num: product.num,
+      note: String((_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : ''),
       rowKey: product.product_id,
       session: null,
       unique: createUuidV4()

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

@@ -1,6 +1,7 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult } from './types';
+import type { UpdateProductInOrderParams } from '../../modules/Order/types';
 import type { Discount } from '../../modules/Discount/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
@@ -85,11 +86,12 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private buildSubmitPayloadEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
-    updateProductInOrder(params: {
-        product_id: number | null;
-        product_variant_id: number;
-        updates: Partial<ScanOrderOrderProduct>;
-    }): Promise<ScanOrderOrderProduct[]>;
+    updateProductInOrder(params: UpdateProductInOrderParams): Promise<ScanOrderOrderProduct[]>;
+    /**
+     * 设置单行商品备注（与整单 `updateTempOrderNote` 区分）。
+     * 多行同 SKU 时必须传入与删除/更新一致的 identity（如 `identity_key`）。
+     */
+    setOrderProductLineNote(identity: ScanOrderOrderProductIdentity, note: string): Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
     private loadRuntimeConfigs;
     private syncItemRuleConfigsFromDineInConfig;