@pisell/pisellos 2.1.130 → 2.1.132

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

@@ -1,4 +1,3 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -6,6 +5,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
@@ -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, formatV1Product, isTempOrder } from "./utils";
+import { generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, filterProductsForScanOrderMore, 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";
@@ -386,6 +386,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           this.window.localStorage.removeItem(key);
           return;
         }
+        if (Array.isArray(parsedData.products)) {
+          for (var i = 0; i < parsedData.products.length; i++) {
+            var p = parsedData.products[i];
+            if (!p || _typeof(p) !== 'object') continue;
+            if (!Array.isArray(p.product_option_item)) {
+              p.product_option_item = [];
+            }
+            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;
+              }
+            }
+            // 价格 schema 迁移：重跑 normalizeOrderProduct。
+            // `metadata.price_schema_version === 2` → 已是新语义，保留现有 main_product_* 折扣；
+            // 否则（v1 或无 metadata）→ 走 legacyDiscount 反推分支，基于新的 source + options
+            // 重算出含 option 的 main_product_*，并打上 price_schema_version: 2。
+            // 幂等：多次 restore 不会重复叠加 option/bundle。
+            parsedData.products[i] = normalizeOrderProduct(row);
+          }
+        }
         this.store.tempOrder = parsedData;
       } catch (_unused2) {
         var _this$window;
@@ -590,31 +622,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();
           }
@@ -629,38 +689,61 @@ 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 _metadata, _metadata2, _metadata3;
+        var product_id, product_variant_id, updates, identity_key, product_option_item, product_bundle, tempOrder, identityLookup, productIndex, targetProduct, nextProduct, callerUpdatesTopPrice, callerUpdatesMainMeta, existedMeta;
         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,
                 product_variant_id: product_variant_id
               });
               nextProduct.num = getSafeProductNum(nextProduct.num);
-              tempOrder.products[productIndex] = nextProduct;
+              // 兜底：caller 通过 updates 直接改了 selling_price / original_price 时，
+              // 视为 "重新给 source-level 主价"（caller 侧旧约定仍是 main-only 单价）。
+              // 清掉 metadata 里的 source_product_price / main_product_* / price_schema_version，
+              // 让 normalize 把顶层 selling_price 当作 source 来重算 main_original(=source+options) /
+              // main_selling / composite；否则旧 metadata 会反压顶层新值，触发口径不一致。
+              // 如果 caller 走推荐路径（updates.metadata.* 显式指定主价），保留 metadata 由 normalize 认它。
+              callerUpdatesTopPrice = Object.prototype.hasOwnProperty.call(updates || {}, 'selling_price') || Object.prototype.hasOwnProperty.call(updates || {}, 'original_price');
+              callerUpdatesMainMeta = (updates === null || updates === void 0 || (_metadata = updates.metadata) === null || _metadata === void 0 ? void 0 : _metadata.main_product_selling_price) !== undefined || (updates === null || updates === void 0 || (_metadata2 = updates.metadata) === null || _metadata2 === void 0 ? void 0 : _metadata2.main_product_original_price) !== undefined || (updates === null || updates === void 0 || (_metadata3 = updates.metadata) === null || _metadata3 === void 0 ? void 0 : _metadata3.source_product_price) !== undefined;
+              if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+                existedMeta = nextProduct.metadata || {};
+                nextProduct.metadata = _objectSpread({}, existedMeta);
+                delete nextProduct.metadata.source_product_price;
+                delete nextProduct.metadata.main_product_selling_price;
+                delete nextProduct.metadata.main_product_original_price;
+                delete nextProduct.metadata.price_schema_version;
+              }
+              // normalizeOrderProduct 幂等：v2 metadata 存在 → 保留 main_product_* 折扣重算 composite；
+              // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
+              tempOrder.products[productIndex] = normalizeOrderProduct(nextProduct);
               this.applyDiscount();
-              _context8.next = 12;
+              _context8.next = 19;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 12:
+            case 19:
               this.persistTempOrder();
               return _context8.abrupt("return", tempOrder.products);
-            case 14:
+            case 21:
             case "end":
               return _context8.stop();
           }
@@ -675,32 +758,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductFromOrder",
     value: function () {
       var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(identity) {
-        var tempOrder, beforeProducts, removedByStrictIdentity;
+        var tempOrder;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
-              beforeProducts = tempOrder.products;
               tempOrder.products = tempOrder.products.filter(function (item) {
                 return !isIdentityMatch(item, identity);
               });
-              removedByStrictIdentity = beforeProducts.length - tempOrder.products.length;
-              if (removedByStrictIdentity === 0 && identity.identity_key) {
-                tempOrder.products = tempOrder.products.filter(function (item) {
-                  var isSameProduct = String(item.product_id) === String(identity.product_id) && String(item.product_variant_id) === String(identity.product_variant_id);
-                  var hasNoIdentityKey = !item.identity_key;
-                  return !(isSameProduct && hasNoIdentityKey);
-                });
-              }
               this.applyDiscount();
-              _context9.next = 8;
+              _context9.next = 5;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 8:
+            case 5:
               this.persistTempOrder();
               return _context9.abrupt("return", tempOrder.products);
-            case 10:
+            case 7:
             case "end":
               return _context9.stop();
           }
@@ -736,7 +810,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 _context10.next = 12;
                 break;
               }
-              products = formatV1Product(payload.products);
+              products = filterProductsForScanOrderMore(payload.products);
               _context10.next = 8;
               return this.scanOrderMore({
                 query: {
@@ -1047,7 +1121,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              return _context13.abrupt("return", this.request.post(fetchUrl, query));
+              return _context13.abrupt("return", this.request.post(fetchUrl, query, {
+                customToast: function customToast() {}
+              }));
             case 3:
             case "end":
               return _context13.stop();
@@ -1073,7 +1149,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 products: query.products,
                 request_unique_idempotency_token: query.request_unique_idempotency_token
               };
-              return _context14.abrupt("return", this.request.put(fetchUrl, requestBody));
+              return _context14.abrupt("return", this.request.put(fetchUrl, requestBody, {
+                customToast: function customToast() {}
+              }));
             case 4:
             case "end":
               return _context14.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[];
+}
 /**
  * 订单信息
  */
@@ -35,14 +44,27 @@ export interface SubmitScanOrderProduct {
     num: number;
     product_variant_id: number;
     product_option_item: any[];
+    /**
+     * 行 composite 券后单价。
+     * 公式：`metadata.main_product_selling_price` + Σ(bundle_selling_price × num)。
+     * 主商品（含 option、含主商品折扣）的单价存在 `metadata.main_product_selling_price`。
+     */
     selling_price: string;
+    /**
+     * 行 composite 券前单价。
+     * 公式：`metadata.main_product_original_price` + Σ(bundle 原价 × num)。
+     * 主商品（含 option、不含折扣）的单价存在 `metadata.main_product_original_price`。
+     */
     original_price: string;
+    /** 出站兼容字段，直接由 `selling_price` 派生，语义同 composite。 */
     payment_price: string;
     tax_fee: string;
     is_charge_tax: number;
     discount_list: any[];
     product_bundle: any[];
     metadata: Record<string, any>;
+    /** 商品行备注 */
+    note?: string;
 }
 export interface SubmitScanOrderSummary {
     product_quantity: number;
@@ -210,11 +232,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

@@ -1,21 +1,66 @@
+import Decimal from 'decimal.js';
 import { CartItem } from "../Cart";
 import type { ScanOrderSubmitPayload, ScanOrderSubmitProduct, ScanOrderSummary, ScanOrderTempOrder } from '../../solution/ScanOrder/types';
 import type { RulesParamsHooks } from '../Rules/types';
+/**
+ * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
+ *
+ * 新语义 v2 约定：
+ * - `mainPrice` 必须是**已经包含 option 的主商品单价**（即 `metadata.main_product_selling_price`
+ *   或 `metadata.main_product_original_price`），option 价格不由本函数叠加。
+ * - 套餐价：Σ((bundle.bundle_selling_price ?? bundle.price) × (bundle.num ?? bundle.quantity ?? 1))
+ *   当 `useOriginalBundle=true` 时，改用 `bundle.original_price ?? bundle.product_price ?? bundle.price`。
+ * - 返回值：保留 2 位小数的字符串，方便直接写回 `selling_price` / `original_price` 字段。
+ *
+ * 被 `normalizeOrderProduct`、Rules setProduct 钩子、各 Solution 的 setDiscountSelected 共用，
+ * 保证合成逻辑单点来源。
+ */
+export declare function composeLinePrice(params: {
+    mainPrice: string | number | null | undefined;
+    bundle?: Array<{
+        bundle_selling_price?: any;
+        price?: any;
+        num?: any;
+        quantity?: any;
+        original_price?: any;
+        product_price?: any;
+    }> | null;
+    useOriginalBundle?: boolean;
+}): string;
+/**
+ * 计算 option 单价合计：Σ(option.price × option.num)。
+ * 在新语义 v2 下，main_product_original_price = source_product_price + 本函数结果。
+ */
+export declare function sumOptionUnitPrice(options?: Array<{
+    price?: any;
+    num?: any;
+}> | null): Decimal;
 /**
  * OrderModule 默认 Rules 钩子工厂。
  *
- * 价格语义约定（订单域）：
- * - `selling_price`：券后单品单价（实际成交单价）。初次加购 = `original_price`；券应用后由 Rules 引擎更新。
- * - `original_price`：券前单品单价（店铺售价）。不承载后台划线价语义。
- * - `payment_price`：已从内部字段移除；只在出站 payload 中由 `selling_price` 派生以兼容后端。
+ * 价格语义约定（订单域，v2 composite 口径）：
+ * - `selling_price`：券后 **行 composite 单价**
+ *   = `metadata.main_product_selling_price` + Σ(bundle_selling_price × num)。
+ * - `original_price`：券前 **行 composite 单价**
+ *   = `metadata.main_product_original_price` + Σ(bundle 原价 × num)。
+ * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），不含 option、
+ *   不含折扣。**权威源**。
+ * - `metadata.main_product_original_price` = source + Σ(option.price × option.num)（含 option、不含折扣）。
+ * - `metadata.main_product_selling_price` = main_original − 主商品券 per-unit amount（含 option、含折扣）。
+ * - `payment_price`：出站 payload 中由 `selling_price` 派生以兼容后端（composite）。
  *
- * Rules 钩子契约：
- * - `getProduct.total` = `selling_price × num`（当前成交总价）
- * - `getProduct.origin_total` = `original_price × num`（券前总价）
- * - `setProduct` 写回 `selling_price` 的优先级：
- *   1. `values.main_product_selling_price`（券应用分支，per-unit 券后主价）
- *   2. `values.price`（还原分支 `restoredPrice`、good_pass 归零）
- *   3. `values.total / num`（仅当 Rules 只给出总价时的兜底）
+ * Rules 钩子契约（hook_adapt 方案，Rules 内部保持不变）：
+ * - `getProduct.price` / `getProduct.original_price` 回传 **source-level 主价**
+ *   （`metadata.source_product_price`）。Rules 内部 `getProductTotalPrice` /
+ *   `getProductOriginTotalPrice` 会自行叠加 option + bundle，喂 source 可避免 option 双加。
+ * - `getProduct.total` = `selling_price × num`（行 composite × num），与 Rules 内部产出的
+ *   total（source + option + bundle）对齐。
+ * - `setProduct` 反向流程：把 Rules 返回的 source-level `main_product_selling_price` / `price`
+ *   加回 Σoptions，重新合成含 option 的 main_product_* 并派生 composite。
+ *   优先级：
+ *     1. `values.main_product_selling_price`（券应用分支，per-unit 券后 source-level 主价）
+ *     2. `values.price`（还原分支 `restoredPrice`、good_pass 归零）
+ *     3. `values.total / num`（仅当 Rules 只给出总价时的兜底）
  *
  * 导出为纯函数方便单测直接驱动钩子，不依赖 OrderModule 实例。
  */
@@ -72,6 +117,15 @@ export declare function buildSubmitPayload(params: {
     type?: string;
     enhance?: SubmitPayloadEnhancer;
 }): ScanOrderSubmitPayload;
+/** 加单（scanOrderMore）不应提交 booking 关联的虚拟规则商品行 */
+export declare function filterProductsForScanOrderMore(products: ScanOrderSubmitProduct[]): ScanOrderSubmitProduct[];
+/**
+ * 历史 V1 加餐结构映射器。
+ *
+ * @deprecated 加餐（`PUT /order/order/product/:id`）已改为与正常 checkout 共用
+ * `ScanOrderSubmitProduct` 新结构（见 `OrderModule.submitTempOrder` 的加餐分支）。
+ * 本函数仅保留以兼容历史接入方，未来会移除。新代码请勿再调用。
+ */
 export declare function formatV1Product(products: ScanOrderSubmitProduct[]): {
     bundle: any[];
     key: number | null;
@@ -79,6 +133,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;