@pisell/pisellos 0.0.509 → 0.0.510

package/dist/modules/Order/index.js

@@ -1,10 +1,10 @@
-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."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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 _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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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 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; }
@@ -387,6 +387,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           this.window.localStorage.removeItem(key);
           return;
         }
+        if (Array.isArray(parsedData.products)) {
+          var _iterator = _createForOfIteratorHelper(parsedData.products),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var p = _step.value;
+              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 = [];
+              }
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        }
         this.store.tempOrder = parsedData;
       } catch (_unused2) {
         var _this$window;
@@ -676,32 +696,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();
           }
@@ -1135,46 +1146,46 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      */
     function populateSavedAmounts(productList, discountList) {
       var savedMap = new Map();
-      var _iterator = _createForOfIteratorHelper(productList),
-        _step;
+      var _iterator2 = _createForOfIteratorHelper(productList),
+        _step2;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var product = _step.value;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var product = _step2.value;
           var qty = product.num || 1;
-          var _iterator3 = _createForOfIteratorHelper(product.discount_list || []),
-            _step3;
+          var _iterator4 = _createForOfIteratorHelper(product.discount_list || []),
+            _step4;
           try {
-            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
               var _pd$discount, _pd$metadata;
-              var pd = _step3.value;
+              var pd = _step4.value;
               var discountKey = ((_pd$discount = pd.discount) === null || _pd$discount === void 0 ? void 0 : _pd$discount.resource_id) || pd.id;
               if (discountKey == null) continue;
               var amount = new Decimal(pd.amount || 0).times(qty).plus(((_pd$metadata = pd.metadata) === null || _pd$metadata === void 0 ? void 0 : _pd$metadata.product_discount_difference) || 0);
               savedMap.set(discountKey, (savedMap.get(discountKey) || new Decimal(0)).plus(amount));
             }
           } catch (err) {
-            _iterator3.e(err);
+            _iterator4.e(err);
           } finally {
-            _iterator3.f();
+            _iterator4.f();
           }
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
-      var _iterator2 = _createForOfIteratorHelper(discountList),
-        _step2;
+      var _iterator3 = _createForOfIteratorHelper(discountList),
+        _step3;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var d = _step2.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var d = _step3.value;
           var key = d.id;
           d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
     }
   }]);

package/dist/modules/Order/utils.js

@@ -18,7 +18,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 dayjs from "dayjs";
 import Decimal from 'decimal.js';
-import { createEmptySummary } from "../../solution/ScanOrder/utils";
+import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
 /**
  * OrderModule 默认 Rules 钩子工厂。
  *
@@ -47,7 +47,9 @@ export function createDefaultOrderRulesHooks() {
       var _product$_origin, _product$_origin2, _product$_origin3, _product$_origin4;
       return {
         id: product.product_id,
-        _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),
+        // Rules 引擎用 _id 作为 processedProductsMap 键；必须与购物车行级 identity 一致，
+        // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
+        _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(),
         origin_total: new Decimal(product.original_price || product.selling_price || 0).times(product.num || 1).toNumber(),

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

@@ -31,6 +31,9 @@ export interface ScanOrderOrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;
     identity_key?: string;
+    /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
+    product_option_item?: any[];
+    product_bundle?: any[];
 }
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;

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

@@ -81,10 +81,27 @@ export declare function buildItemRuleBusinessData(params: {
     itemRuleConfigs: StrategyConfig[];
 }): ItemRuleBusinessData;
 export declare function attachItemRuleLimitsToTopLevelProducts<T>(productList: T, limits: QuantityLimitResult[]): T;
+/**
+ * 将选项行 / 套餐行归一成稳定 JSON，用于「同 SKU 是否合并」判断。
+ * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
+ */
+export declare function buildProductLineFingerprint(productOptionItem?: unknown, productBundle?: unknown): string;
+/**
+ * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
+ * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ */
+export declare function isSkuOnlyDeleteIdentity(x: ScanOrderOrderProductIdentity): boolean;
+/**
+ * 与常见 UI 约定一致：仅当存在**一条** `product_option_item` 时，
+ * `${product_id}_${option_group_id}_${product_option_item_id}_${num}` 可作为删除用 `identity_key`。
+ * 多小料行请使用加购时的 `identity_key` / `metadata.unique_identification_number` 或按 `product_option_item` 指纹删除。
+ */
+export declare function buildSyntheticSingleOptionIdentityKey(productId: number | null, productOptionItem: unknown): string | undefined;
 /**
  * 判断两个商品 identity 是否匹配。
- * 当双方都没有 identity_key 时回退到 product_id + product_variant_id 比较（向后兼容）；
- * 一旦有一方携带 identity_key，则必须严格相等。
+ * - 任一方带 `identity_key`：两侧都有则比字符串相等；仅一侧有则比「另一侧有效 key 集合」是否含该 key（见 collectLineIdentityKeyCandidates）。
+ * - 否则若任一方为「仅 SKU」删除通配（未声明 product_option_item / product_bundle 键），只比 SKU。
+ * - 否则比较选项 + 套餐指纹（同 SKU 且指纹相同才合并数量）。
  */
 export declare function isIdentityMatch(a: ScanOrderOrderProductIdentity, b: ScanOrderOrderProductIdentity): boolean;
 /**

package/dist/solution/ScanOrder/utils.js

@@ -366,15 +366,116 @@ export function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
   return productList;
 }
 
+/**
+ * 将选项行 / 套餐行归一成稳定 JSON，用于「同 SKU 是否合并」判断。
+ * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
+ */
+export function buildProductLineFingerprint(productOptionItem, productBundle) {
+  var optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
+  var normalizedOpts = optArr.map(function (item) {
+    var _item$price;
+    return {
+      product_option_item_id: Number(item === null || item === void 0 ? void 0 : item.product_option_item_id) || 0,
+      option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
+      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+      price: String((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : '')
+    };
+  }).sort(function (p, q) {
+    if (p.product_option_item_id !== q.product_option_item_id) {
+      return p.product_option_item_id - q.product_option_item_id;
+    }
+    if (p.option_group_id !== q.option_group_id) return p.option_group_id - q.option_group_id;
+    if (p.num !== q.num) return p.num - q.num;
+    return p.price.localeCompare(q.price);
+  });
+  var bundleArr = Array.isArray(productBundle) ? productBundle : [];
+  var normalizedBundles = bundleArr.map(function (item) {
+    var _ref, _item$bundle_id;
+    return {
+      bundle_id: Number((_ref = (_item$bundle_id = item === null || item === void 0 ? void 0 : item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref !== void 0 ? _ref : 0) || 0,
+      product_id: Number(item === null || item === void 0 ? void 0 : item.product_id) || 0,
+      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+    };
+  }).sort(function (p, q) {
+    if (p.bundle_id !== q.bundle_id) return p.bundle_id - q.bundle_id;
+    if (p.product_id !== q.product_id) return p.product_id - q.product_id;
+    return p.num - q.num;
+  });
+  return JSON.stringify([normalizedOpts, normalizedBundles]);
+}
+
+/**
+ * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
+ * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ */
+export function isSkuOnlyDeleteIdentity(x) {
+  if (x.identity_key) return false;
+  return !('product_option_item' in x) && !('product_bundle' in x);
+}
+
+/**
+ * 与常见 UI 约定一致：仅当存在**一条** `product_option_item` 时，
+ * `${product_id}_${option_group_id}_${product_option_item_id}_${num}` 可作为删除用 `identity_key`。
+ * 多小料行请使用加购时的 `identity_key` / `metadata.unique_identification_number` 或按 `product_option_item` 指纹删除。
+ */
+export function buildSyntheticSingleOptionIdentityKey(productId, productOptionItem) {
+  if (productId == null || !Number.isFinite(Number(productId))) return undefined;
+  var opts = Array.isArray(productOptionItem) ? productOptionItem : [];
+  if (opts.length !== 1) return undefined;
+  var o = opts[0];
+  var gid = Number(o === null || o === void 0 ? void 0 : o.option_group_id) || 0;
+  var oid = Number(o === null || o === void 0 ? void 0 : o.product_option_item_id) || 0;
+  var rawNum = o === null || o === void 0 ? void 0 : o.num;
+  var n = typeof rawNum === 'number' && !Number.isNaN(rawNum) ? Math.max(1, Math.floor(rawNum)) : 1;
+  return "".concat(productId, "_").concat(gid, "_").concat(oid, "_").concat(n);
+}
+function collectLineIdentityKeyCandidates(x) {
+  var _row$metadata;
+  var out = new Set();
+  var row = x;
+  if (typeof row.identity_key === 'string' && row.identity_key.length > 0) {
+    out.add(row.identity_key);
+  }
+  var uid = (_row$metadata = row.metadata) === null || _row$metadata === void 0 ? void 0 : _row$metadata.unique_identification_number;
+  if (typeof uid === 'string' && uid.length > 0) out.add(uid);
+  var synthetic = buildSyntheticSingleOptionIdentityKey(row.product_id, row.product_option_item);
+  if (synthetic) out.add(synthetic);
+  var opts = 'product_option_item' in row && Array.isArray(row.product_option_item) ? row.product_option_item : [];
+  var bundles = 'product_bundle' in row && Array.isArray(row.product_bundle) ? row.product_bundle : [];
+  // 无小料且无套餐时，与常见 UI 约定对齐：`${product_id}_${product_variant_id}_0`
+  if (opts.length === 0 && bundles.length === 0 && row.product_id != null && Number.isFinite(Number(row.product_id))) {
+    var vid = Number(row.product_variant_id) || 0;
+    out.add("".concat(row.product_id, "_").concat(vid, "_0"));
+  }
+  return out;
+}
+function fingerprintForIdentityWithOptionKeys(x) {
+  var row = x;
+  var opts = 'product_option_item' in row ? Array.isArray(row.product_option_item) ? row.product_option_item : [] : [];
+  var buds = 'product_bundle' in row ? Array.isArray(row.product_bundle) ? row.product_bundle : [] : [];
+  return buildProductLineFingerprint(opts, buds);
+}
+
 /**
  * 判断两个商品 identity 是否匹配。
- * 当双方都没有 identity_key 时回退到 product_id + product_variant_id 比较（向后兼容）；
- * 一旦有一方携带 identity_key，则必须严格相等。
+ * - 任一方带 `identity_key`：两侧都有则比字符串相等；仅一侧有则比「另一侧有效 key 集合」是否含该 key（见 collectLineIdentityKeyCandidates）。
+ * - 否则若任一方为「仅 SKU」删除通配（未声明 product_option_item / product_bundle 键），只比 SKU。
+ * - 否则比较选项 + 套餐指纹（同 SKU 且指纹相同才合并数量）。
  */
 export function isIdentityMatch(a, b) {
   if (a.product_id !== b.product_id || a.product_variant_id !== b.product_variant_id) return false;
-  if (!a.identity_key && !b.identity_key) return true;
-  return a.identity_key === b.identity_key;
+  if (a.identity_key || b.identity_key) {
+    if (a.identity_key && b.identity_key) return a.identity_key === b.identity_key;
+    if (a.identity_key && !b.identity_key) {
+      return collectLineIdentityKeyCandidates(b).has(a.identity_key);
+    }
+    if (!a.identity_key && b.identity_key) {
+      return collectLineIdentityKeyCandidates(a).has(b.identity_key);
+    }
+    return false;
+  }
+  if (isSkuOnlyDeleteIdentity(a) || isSkuOnlyDeleteIdentity(b)) return true;
+  return fingerprintForIdentityWithOptionKeys(a) === fingerprintForIdentityWithOptionKeys(b);
 }
 
 /**
@@ -414,14 +515,14 @@ export function normalizeOrderProduct(product) {
     metadata.main_product_selling_price = resolvedSellingPrice;
   }
   if (metadata.source_product_price === undefined) {
-    var _ref, _product$_origin$pric, _product$_origin, _product$_origin2;
-    metadata.source_product_price = (_ref = (_product$_origin$pric = (_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.price) !== null && _product$_origin$pric !== void 0 ? _product$_origin$pric : (_product$_origin2 = product._origin) === null || _product$_origin2 === void 0 ? void 0 : _product$_origin2.base_price) !== null && _ref !== void 0 ? _ref : resolvedSellingPrice;
+    var _ref2, _product$_origin$pric, _product$_origin, _product$_origin2;
+    metadata.source_product_price = (_ref2 = (_product$_origin$pric = (_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.price) !== null && _product$_origin$pric !== void 0 ? _product$_origin$pric : (_product$_origin2 = product._origin) === null || _product$_origin2 === void 0 ? void 0 : _product$_origin2.base_price) !== null && _ref2 !== void 0 ? _ref2 : resolvedSellingPrice;
   }
   var normalizedBundle = (product.product_bundle || []).map(function (item) {
-    var _ref2, _item$bundle_selling_, _ref3, _ref4, _item$custom_price;
+    var _ref3, _item$bundle_selling_, _ref4, _ref5, _item$custom_price;
     return _objectSpread(_objectSpread({}, item), {}, {
-      bundle_selling_price: (_ref2 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref2 !== void 0 ? _ref2 : '0.00',
-      custom_price: (_ref3 = (_ref4 = (_item$custom_price = item.custom_price) !== null && _item$custom_price !== void 0 ? _item$custom_price : item.bundle_selling_price) !== null && _ref4 !== void 0 ? _ref4 : item.price) !== null && _ref3 !== void 0 ? _ref3 : '0.00'
+      bundle_selling_price: (_ref3 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref3 !== void 0 ? _ref3 : '0.00',
+      custom_price: (_ref4 = (_ref5 = (_item$custom_price = item.custom_price) !== null && _item$custom_price !== void 0 ? _item$custom_price : item.bundle_selling_price) !== null && _ref5 !== void 0 ? _ref5 : item.price) !== null && _ref4 !== void 0 ? _ref4 : '0.00'
     });
   });
   return {

package/lib/modules/Order/index.js

@@ -288,6 +288,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         this.window.localStorage.removeItem(key);
         return;
       }
+      if (Array.isArray(parsedData.products)) {
+        for (const p of parsedData.products) {
+          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 = [];
+          }
+        }
+      }
       this.store.tempOrder = parsedData;
     } catch {
       (_b = (_a = this.window) == null ? void 0 : _a.localStorage) == null ? void 0 : _b.removeItem(key);
@@ -444,18 +456,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   async removeProductFromOrder(identity) {
     const tempOrder = this.ensureTempOrder();
-    const beforeProducts = tempOrder.products;
     tempOrder.products = tempOrder.products.filter(
       (item) => !(0, import_utils3.isIdentityMatch)(item, identity)
     );
-    const removedByStrictIdentity = beforeProducts.length - tempOrder.products.length;
-    if (removedByStrictIdentity === 0 && identity.identity_key) {
-      tempOrder.products = tempOrder.products.filter((item) => {
-        const isSameProduct = String(item.product_id) === String(identity.product_id) && String(item.product_variant_id) === String(identity.product_variant_id);
-        const hasNoIdentityKey = !item.identity_key;
-        return !(isSameProduct && hasNoIdentityKey);
-      });
-    }
     this.applyDiscount();
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();

package/lib/modules/Order/utils.js

@@ -60,7 +60,12 @@ function createDefaultOrderRulesHooks() {
       var _a, _b, _c, _d;
       return {
         id: product.product_id,
-        _id: product.identity_key ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${product.product_variant_id}`,
+        // Rules 引擎用 _id 作为 processedProductsMap 键；必须与购物车行级 identity 一致，
+        // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
+        _id: product.identity_key ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
+          product.product_option_item,
+          product.product_bundle
+        )}`,
         price: product.selling_price,
         total: new import_decimal.default(product.selling_price || 0).times(product.num || 1).toNumber(),
         origin_total: new import_decimal.default(product.original_price || product.selling_price || 0).times(product.num || 1).toNumber(),

package/lib/solution/ScanOrder/types.d.ts

@@ -31,6 +31,9 @@ export interface ScanOrderOrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;
     identity_key?: string;
+    /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
+    product_option_item?: any[];
+    product_bundle?: any[];
 }
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;

package/lib/solution/ScanOrder/utils.d.ts

@@ -81,10 +81,27 @@ export declare function buildItemRuleBusinessData(params: {
     itemRuleConfigs: StrategyConfig[];
 }): ItemRuleBusinessData;
 export declare function attachItemRuleLimitsToTopLevelProducts<T>(productList: T, limits: QuantityLimitResult[]): T;
+/**
+ * 将选项行 / 套餐行归一成稳定 JSON，用于「同 SKU 是否合并」判断。
+ * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
+ */
+export declare function buildProductLineFingerprint(productOptionItem?: unknown, productBundle?: unknown): string;
+/**
+ * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
+ * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ */
+export declare function isSkuOnlyDeleteIdentity(x: ScanOrderOrderProductIdentity): boolean;
+/**
+ * 与常见 UI 约定一致：仅当存在**一条** `product_option_item` 时，
+ * `${product_id}_${option_group_id}_${product_option_item_id}_${num}` 可作为删除用 `identity_key`。
+ * 多小料行请使用加购时的 `identity_key` / `metadata.unique_identification_number` 或按 `product_option_item` 指纹删除。
+ */
+export declare function buildSyntheticSingleOptionIdentityKey(productId: number | null, productOptionItem: unknown): string | undefined;
 /**
  * 判断两个商品 identity 是否匹配。
- * 当双方都没有 identity_key 时回退到 product_id + product_variant_id 比较（向后兼容）；
- * 一旦有一方携带 identity_key，则必须严格相等。
+ * - 任一方带 `identity_key`：两侧都有则比字符串相等；仅一侧有则比「另一侧有效 key 集合」是否含该 key（见 collectLineIdentityKeyCandidates）。
+ * - 否则若任一方为「仅 SKU」删除通配（未声明 product_option_item / product_bundle 键），只比 SKU。
+ * - 否则比较选项 + 套餐指纹（同 SKU 且指纹相同才合并数量）。
  */
 export declare function isIdentityMatch(a: ScanOrderOrderProductIdentity, b: ScanOrderOrderProductIdentity): boolean;
 /**

package/lib/solution/ScanOrder/utils.js

@@ -33,7 +33,9 @@ __export(utils_exports, {
   attachItemRuleLimitsToTopLevelProducts: () => attachItemRuleLimitsToTopLevelProducts,
   buildItemRuleBusinessData: () => buildItemRuleBusinessData,
   buildProductKey: () => buildProductKey,
+  buildProductLineFingerprint: () => buildProductLineFingerprint,
   buildQuantityLimitIndex: () => buildQuantityLimitIndex,
+  buildSyntheticSingleOptionIdentityKey: () => buildSyntheticSingleOptionIdentityKey,
   collectLinkProductIdsFromReservationRules: () => collectLinkProductIdsFromReservationRules,
   computeResourceIsFull: () => computeResourceIsFull,
   createEmptySummary: () => createEmptySummary,
@@ -44,6 +46,7 @@ __export(utils_exports, {
   getTopLevelVariantId: () => getTopLevelVariantId,
   hasCustomCapacityProduct: () => hasCustomCapacityProduct,
   isIdentityMatch: () => isIdentityMatch,
+  isSkuOnlyDeleteIdentity: () => isSkuOnlyDeleteIdentity,
   normalizeEnabledItemRuleIds: () => normalizeEnabledItemRuleIds,
   normalizeItemRuleStrategies: () => normalizeItemRuleStrategies,
   normalizeOrderProduct: () => normalizeOrderProduct,
@@ -339,12 +342,102 @@ function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
   }
   return productList;
 }
+function buildProductLineFingerprint(productOptionItem, productBundle) {
+  const optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
+  const normalizedOpts = optArr.map((item) => ({
+    product_option_item_id: Number(item == null ? void 0 : item.product_option_item_id) || 0,
+    option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
+    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+    price: String((item == null ? void 0 : item.price) ?? "")
+  })).sort((p, q) => {
+    if (p.product_option_item_id !== q.product_option_item_id) {
+      return p.product_option_item_id - q.product_option_item_id;
+    }
+    if (p.option_group_id !== q.option_group_id)
+      return p.option_group_id - q.option_group_id;
+    if (p.num !== q.num)
+      return p.num - q.num;
+    return p.price.localeCompare(q.price);
+  });
+  const bundleArr = Array.isArray(productBundle) ? productBundle : [];
+  const normalizedBundles = bundleArr.map((item) => ({
+    bundle_id: Number((item == null ? void 0 : item.bundle_id) ?? (item == null ? void 0 : item.id) ?? 0) || 0,
+    product_id: Number(item == null ? void 0 : item.product_id) || 0,
+    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+  })).sort((p, q) => {
+    if (p.bundle_id !== q.bundle_id)
+      return p.bundle_id - q.bundle_id;
+    if (p.product_id !== q.product_id)
+      return p.product_id - q.product_id;
+    return p.num - q.num;
+  });
+  return JSON.stringify([normalizedOpts, normalizedBundles]);
+}
+function isSkuOnlyDeleteIdentity(x) {
+  if (x.identity_key)
+    return false;
+  return !("product_option_item" in x) && !("product_bundle" in x);
+}
+function buildSyntheticSingleOptionIdentityKey(productId, productOptionItem) {
+  if (productId == null || !Number.isFinite(Number(productId)))
+    return void 0;
+  const opts = Array.isArray(productOptionItem) ? productOptionItem : [];
+  if (opts.length !== 1)
+    return void 0;
+  const o = opts[0];
+  const gid = Number(o == null ? void 0 : o.option_group_id) || 0;
+  const oid = Number(o == null ? void 0 : o.product_option_item_id) || 0;
+  const rawNum = o == null ? void 0 : o.num;
+  const n = typeof rawNum === "number" && !Number.isNaN(rawNum) ? Math.max(1, Math.floor(rawNum)) : 1;
+  return `${productId}_${gid}_${oid}_${n}`;
+}
+function collectLineIdentityKeyCandidates(x) {
+  var _a;
+  const out = /* @__PURE__ */ new Set();
+  const row = x;
+  if (typeof row.identity_key === "string" && row.identity_key.length > 0) {
+    out.add(row.identity_key);
+  }
+  const uid = (_a = row.metadata) == null ? void 0 : _a.unique_identification_number;
+  if (typeof uid === "string" && uid.length > 0)
+    out.add(uid);
+  const synthetic = buildSyntheticSingleOptionIdentityKey(
+    row.product_id,
+    row.product_option_item
+  );
+  if (synthetic)
+    out.add(synthetic);
+  const opts = "product_option_item" in row && Array.isArray(row.product_option_item) ? row.product_option_item : [];
+  const bundles = "product_bundle" in row && Array.isArray(row.product_bundle) ? row.product_bundle : [];
+  if (opts.length === 0 && bundles.length === 0 && row.product_id != null && Number.isFinite(Number(row.product_id))) {
+    const vid = Number(row.product_variant_id) || 0;
+    out.add(`${row.product_id}_${vid}_0`);
+  }
+  return out;
+}
+function fingerprintForIdentityWithOptionKeys(x) {
+  const row = x;
+  const opts = "product_option_item" in row ? Array.isArray(row.product_option_item) ? row.product_option_item : [] : [];
+  const buds = "product_bundle" in row ? Array.isArray(row.product_bundle) ? row.product_bundle : [] : [];
+  return buildProductLineFingerprint(opts, buds);
+}
 function isIdentityMatch(a, b) {
   if (a.product_id !== b.product_id || a.product_variant_id !== b.product_variant_id)
     return false;
-  if (!a.identity_key && !b.identity_key)
+  if (a.identity_key || b.identity_key) {
+    if (a.identity_key && b.identity_key)
+      return a.identity_key === b.identity_key;
+    if (a.identity_key && !b.identity_key) {
+      return collectLineIdentityKeyCandidates(b).has(a.identity_key);
+    }
+    if (!a.identity_key && b.identity_key) {
+      return collectLineIdentityKeyCandidates(a).has(b.identity_key);
+    }
+    return false;
+  }
+  if (isSkuOnlyDeleteIdentity(a) || isSkuOnlyDeleteIdentity(b))
     return true;
-  return a.identity_key === b.identity_key;
+  return fingerprintForIdentityWithOptionKeys(a) === fingerprintForIdentityWithOptionKeys(b);
 }
 function getProductIdentityIndex(products, identity) {
   return products.findIndex((item) => isIdentityMatch(item, identity));
@@ -505,7 +598,9 @@ function pickFirstCustomCapacityDimensionId(products) {
   attachItemRuleLimitsToTopLevelProducts,
   buildItemRuleBusinessData,
   buildProductKey,
+  buildProductLineFingerprint,
   buildQuantityLimitIndex,
+  buildSyntheticSingleOptionIdentityKey,
   collectLinkProductIdsFromReservationRules,
   computeResourceIsFull,
   createEmptySummary,
@@ -516,6 +611,7 @@ function pickFirstCustomCapacityDimensionId(products) {
   getTopLevelVariantId,
   hasCustomCapacityProduct,
   isIdentityMatch,
+  isSkuOnlyDeleteIdentity,
   normalizeEnabledItemRuleIds,
   normalizeItemRuleStrategies,
   normalizeOrderProduct,

package/package.json

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