@pisell/pisellos 2.1.130 → 2.1.132

package/dist/modules/SalesSummary/utils.js

@@ -19,41 +19,6 @@ function getSafeNum(num) {
   if (num < 1) return 1;
   return Math.floor(num);
 }
-function getVariantPrice(product) {
-  var _product$metadata;
-  var variantId = Number(product.product_variant_id || 0);
-  if (!variantId) return null;
-
-  // TODO: callbackData 在 src/ 内无写入方，暂时注释掉观察
-  // const callbackVariantList = product._origin?.callbackData?.origin?.variant;
-  // if (Array.isArray(callbackVariantList)) {
-  //   const variant = callbackVariantList.find(
-  //     (item: any) => Number(item.id) === variantId,
-  //   );
-  //   if (variant?.price !== undefined && variant?.price !== null) {
-  //     return toDecimal(variant.price);
-  //   }
-  // }
-
-  var metadataVariantList = (_product$metadata = product.metadata) === null || _product$metadata === void 0 || (_product$metadata = _product$metadata.origin) === null || _product$metadata === void 0 ? void 0 : _product$metadata.variant;
-  if (Array.isArray(metadataVariantList)) {
-    var variant = metadataVariantList.find(function (item) {
-      return Number(item.id) === variantId;
-    });
-    if ((variant === null || variant === void 0 ? void 0 : variant.price) !== undefined && (variant === null || variant === void 0 ? void 0 : variant.price) !== null) {
-      return toDecimal(variant.price);
-    }
-  }
-  return null;
-}
-function getOptionUnitPrice(product) {
-  var optionItems = product.product_option_item || [];
-  return optionItems.reduce(function (sum, item) {
-    var quantity = getSafeNum(item === null || item === void 0 ? void 0 : item.num);
-    var itemPrice = toDecimal(item === null || item === void 0 ? void 0 : item.price);
-    return sum.plus(itemPrice.times(quantity));
-  }, new Decimal(0));
-}
 function getBundleUnitPrice(product) {
   var useOriginal = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var bundleItems = product.product_bundle || [];
@@ -65,19 +30,27 @@ function getBundleUnitPrice(product) {
   }, new Decimal(0));
 }
 
-// 单商品总价口径：主商品单价 + option + bundle（随后再乘商品数量）
+// 单商品 composite 单价（随后再乘商品数量）：
+// 新语义 v2 下 `metadata.main_product_selling_price` 已经是"含 option、含主商品折扣"的主价，
+// composite 单价 = main_product_selling_price + Σ(bundle_selling_price × num)。
+// 不再叠加 options（会重复计算），也不再用 variant/selling_price 兜底（选项已固化进 metadata）。
 function getUnitPaymentTotal(product) {
-  var variantPrice = getVariantPrice(product);
-  var basePrice = variantPrice || toDecimal(product.selling_price);
-  return basePrice.plus(getOptionUnitPrice(product)).plus(getBundleUnitPrice(product));
+  var _product$metadata, _product$metadata2;
+  var mainSelling = (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.main_product_selling_price;
+  var mainOriginal = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.main_product_original_price;
+  var basePrice = mainSelling !== undefined ? toDecimal(mainSelling) : mainOriginal !== undefined ? toDecimal(mainOriginal) : toDecimal(product.selling_price);
+  return basePrice.plus(getBundleUnitPrice(product));
 }
 function getUnitOriginalTotal(product) {
-  var basePrice = toDecimal(product.original_price || product.selling_price);
-  return basePrice.plus(getOptionUnitPrice(product)).plus(getBundleUnitPrice(product, true));
+  var _product$metadata3, _product$metadata4;
+  var mainOriginal = (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.main_product_original_price;
+  var mainSelling = (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_selling_price;
+  var basePrice = mainOriginal !== undefined ? toDecimal(mainOriginal) : mainSelling !== undefined ? toDecimal(mainSelling) : toDecimal(product.original_price || product.selling_price);
+  return basePrice.plus(getBundleUnitPrice(product, true));
 }
 function buildSurchargeServiceItems(products) {
   return products.map(function (product) {
-    var _product$is_charge_ta, _product$metadata2, _product$metadata3;
+    var _product$is_charge_ta, _product$metadata5, _product$metadata6;
     var quantity = getSafeNum(product.num);
     var unitTotal = getUnitPaymentTotal(product);
     return {
@@ -99,8 +72,8 @@ function buildSurchargeServiceItems(products) {
       options: product.product_option_item || [],
       relation_details: [],
       metadata: product.metadata || {},
-      start_date: ((_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.start_date) || '',
-      start_time: ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.start_time) || ''
+      start_date: ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.start_date) || '',
+      start_time: ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.start_time) || ''
     };
   });
 }
@@ -221,11 +194,6 @@ function isBundleMarkupOrDiscount(item) {
   var isDiscount = (item === null || item === void 0 ? void 0 : item.price_type) === 'markdown' && ((item === null || item === void 0 ? void 0 : item.price_type_ext) === '' || !(item !== null && item !== void 0 && item.price_type_ext));
   return isMarkup || isDiscount;
 }
-function getDiscountListAmount(discountList) {
-  return (discountList || []).reduce(function (total, d) {
-    return total.plus(toDecimal(d.amount));
-  }, new Decimal(0));
-}
 
 /**
  * 计算单个商品税费（返回精确值，不四舍五入）。
@@ -250,20 +218,17 @@ function calculateSingleItemTax(params) {
 }
 
 /**
- * 获取主商品折扣后总价（主体价格 + option + 加价/减价 bundle）。
- * 与 Summary/utils.ts 的 getMainProductTotal 逻辑对齐，适配 SalesSummaryProduct 结构。
+ * 获取主商品折扣后总价（含 option、含主商品折扣、含加价/减价 bundle）。
+ *
+ * 新语义 v2 下：
+ * - `metadata.main_product_selling_price` 已是"含 option、含折扣"的主价，直接读即可；
+ * - 无需再 `minus(mainDiscountAmount)` 或 `plus(getOptionUnitPrice)`；
+ * - 仅需叠加 `markup` / `markdown` 类 bundle（原价 bundle 已由 `calculateProductsTax` 独立处理）。
  */
 function getMainProductPaymentTotal(product) {
-  var _product$metadata$mai, _product$metadata4, _product$_origin3, _product$_origin4;
-  var variantPrice = getVariantPrice(product);
-  var total = variantPrice || toDecimal((_product$metadata$mai = (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_selling_price) !== null && _product$metadata$mai !== void 0 ? _product$metadata$mai : product.selling_price);
-  var mainDiscountList = ((_product$_origin3 = product._origin) === null || _product$_origin3 === void 0 || (_product$_origin3 = _product$_origin3.product) === null || _product$_origin3 === void 0 ? void 0 : _product$_origin3.discount_list) || ((_product$_origin4 = product._origin) === null || _product$_origin4 === void 0 ? void 0 : _product$_origin4.discount_list) || [];
-  var mainDiscountAmount = getDiscountListAmount(mainDiscountList.filter(function (d) {
-    var _d$metadata;
-    return !(d !== null && d !== void 0 && (_d$metadata = d.metadata) !== null && _d$metadata !== void 0 && _d$metadata.custom_product_bundle_map_id);
-  }));
-  total = total.minus(mainDiscountAmount);
-  total = total.plus(getOptionUnitPrice(product));
+  var _ref2, _product$metadata$mai, _product$metadata7, _product$metadata8;
+  var mainSelling = (_ref2 = (_product$metadata$mai = (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.main_product_selling_price) !== null && _product$metadata$mai !== void 0 ? _product$metadata$mai : (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.main_product_original_price) !== null && _ref2 !== void 0 ? _ref2 : 0;
+  var total = toDecimal(mainSelling);
   var bundleItems = product.product_bundle || [];
   var _iterator5 = _createForOfIteratorHelper(bundleItems),
     _step5;
@@ -271,8 +236,10 @@ function getMainProductPaymentTotal(product) {
     for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
       var bundleItem = _step5.value;
       if (isBundleMarkupOrDiscount(bundleItem)) {
-        var _ref2, _bundleItem$bundle_se;
-        total = total.plus(toDecimal((_ref2 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref2 !== void 0 ? _ref2 : 0));
+        var _ref3, _bundleItem$bundle_se, _bundleItem$num;
+        var unit = toDecimal((_ref3 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
+        var qty = getSafeNum((_bundleItem$num = bundleItem.num) !== null && _bundleItem$num !== void 0 ? _bundleItem$num : bundleItem.quantity);
+        total = total.plus(unit.times(qty));
       }
     }
   } catch (err) {
@@ -340,24 +307,24 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
         _step7;
       try {
         for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var _bundleItem$num, _ref3, _bundleItem$bundle_se2, _ref4, _ref5, _bundleItem$original_, _ref6, _bundleItem$is_charge, _ref7, _bundleItem$is_charge2;
+          var _bundleItem$num2, _ref4, _bundleItem$bundle_se2, _ref5, _ref6, _bundleItem$original_, _ref7, _bundleItem$is_charge, _ref8, _bundleItem$is_charge2;
           var bundleItem = _step7.value;
           if (!isBundleOriginalPrice(bundleItem)) continue;
-          var bundleQuantity = new Decimal(getSafeNum((_bundleItem$num = bundleItem.num) !== null && _bundleItem$num !== void 0 ? _bundleItem$num : bundleItem.quantity));
-          var bundlePrice = toDecimal((_ref3 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
-          var bundleOriginalPrice = toDecimal((_ref4 = (_ref5 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref5 !== void 0 ? _ref5 : bundleItem.price) !== null && _ref4 !== void 0 ? _ref4 : 0);
+          var bundleQuantity = new Decimal(getSafeNum((_bundleItem$num2 = bundleItem.num) !== null && _bundleItem$num2 !== void 0 ? _bundleItem$num2 : bundleItem.quantity));
+          var bundlePrice = toDecimal((_ref4 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref4 !== void 0 ? _ref4 : 0);
+          var bundleOriginalPrice = toDecimal((_ref5 = (_ref6 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref6 !== void 0 ? _ref6 : bundleItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
           var bundleTaxPrecise = calculateSingleItemTax({
             price: bundlePrice,
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
-            isChargeTax: (_ref6 = (_bundleItem$is_charge = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge !== void 0 ? _bundleItem$is_charge : product.is_charge_tax) !== null && _ref6 !== void 0 ? _ref6 : 0
+            isChargeTax: (_ref7 = (_bundleItem$is_charge = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge !== void 0 ? _bundleItem$is_charge : product.is_charge_tax) !== null && _ref7 !== void 0 ? _ref7 : 0
           });
           var bundleTaxRounded = bundleTaxPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
           var bundleOrigTaxPrecise = calculateSingleItemTax({
             price: bundleOriginalPrice,
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
-            isChargeTax: (_ref7 = (_bundleItem$is_charge2 = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge2 !== void 0 ? _bundleItem$is_charge2 : product.is_charge_tax) !== null && _ref7 !== void 0 ? _ref7 : 0
+            isChargeTax: (_ref8 = (_bundleItem$is_charge2 = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge2 !== void 0 ? _bundleItem$is_charge2 : product.is_charge_tax) !== null && _ref8 !== void 0 ? _ref8 : 0
           });
           var bundleOrigTaxRounded = bundleOrigTaxPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
           bundleItem.tax_fee = bundleTaxRounded.toNumber();

package/dist/modules/ScanOrderLogger/providers/feishu.js

@@ -2,94 +2,202 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 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; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function safeStringify(payload) {
-  if (payload === undefined || payload === null) return '';
+var DEFAULT_THROTTLE_MS = 3000;
+var pendingQueue = [];
+var flushTimer = null;
+var cachedProviderConfig;
+function safeStringify(value) {
+  if (value === undefined || value === null) return '';
+  if (typeof value === 'string') return value;
+  if (typeof value === 'number' || typeof value === 'boolean' || typeof value === 'bigint') {
+    return String(value);
+  }
   try {
-    return JSON.stringify(payload);
+    return JSON.stringify(value);
   } catch (error) {
     return "[unserializable: ".concat(String(error), "]");
   }
 }
-function createFeishuMessageContent(contentArr) {
-  return JSON.stringify(contentArr.map(function (item) {
-    return [{
-      tag: 'text',
-      text: "".concat(item.key, ": ")
-    }, {
-      tag: 'text',
-      text: item.value
-    }];
+function isWebhookUsable(webhook) {
+  if (!webhook) return false;
+  if (webhook.includes('REPLACE_ME')) return false;
+  return true;
+}
+function buildRecordSegments(record) {
+  var context = record.context || {};
+  return [[{
+    tag: 'text',
+    text: "[".concat(record.level, "] ").concat(record.timestamp, " ").concat(record.title, "\n")
+  }], [{
+    tag: 'text',
+    text: "\u7F13\u5B58\u6807\u8BC6: ".concat(safeStringify(context.cacheId), "\n")
+  }], [{
+    tag: 'text',
+    text: "\u65E5\u5FD7\u6765\u6E90: ".concat(safeStringify(context), "\n")
+  }], [{
+    tag: 'text',
+    text: "\u65E5\u5FD7\u5185\u5BB9: ".concat(safeStringify(record.payload), "\n")
+  }], [{
+    tag: 'text',
+    text: "\u6269\u5C55\u4FE1\u606F: ".concat(safeStringify(record.extra), "\n")
+  }], [{
+    tag: 'text',
+    text: '------\n'
+  }]];
+}
+function buildFeishuBody(records) {
+  var title = records.length === 1 ? records[0].title : "ScanOrder \u65E5\u5FD7\u6279\u91CF (".concat(records.length, " \u6761)");
+  var content = [];
+  records.forEach(function (record) {
+    buildRecordSegments(record).forEach(function (segment) {
+      return content.push(segment);
+    });
+  });
+  return JSON.stringify({
+    msg_type: 'post',
+    content: JSON.stringify({
+      post: {
+        zh_cn: {
+          title: title,
+          content: content
+        }
+      }
+    })
+  });
+}
+function postToFeishu(_x, _x2) {
+  return _postToFeishu.apply(this, arguments);
+}
+function _postToFeishu() {
+  _postToFeishu = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(webhook, body) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.next = 2;
+          return fetch(webhook, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            body: body
+          });
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _postToFeishu.apply(this, arguments);
+}
+function flushQueue() {
+  return _flushQueue.apply(this, arguments);
+}
+function _flushQueue() {
+  _flushQueue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _cachedProviderConfig;
+    var records, webhook;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          flushTimer = null;
+          if (pendingQueue.length) {
+            _context3.next = 3;
+            break;
+          }
+          return _context3.abrupt("return");
+        case 3:
+          records = pendingQueue.splice(0, pendingQueue.length);
+          webhook = (_cachedProviderConfig = cachedProviderConfig) === null || _cachedProviderConfig === void 0 || (_cachedProviderConfig = _cachedProviderConfig.feishu) === null || _cachedProviderConfig === void 0 ? void 0 : _cachedProviderConfig.webhook;
+          if (isWebhookUsable(webhook)) {
+            _context3.next = 7;
+            break;
+          }
+          return _context3.abrupt("return");
+        case 7:
+          if (!(typeof fetch !== 'function')) {
+            _context3.next = 10;
+            break;
+          }
+          console.warn('[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志批量上报');
+          return _context3.abrupt("return");
+        case 10:
+          _context3.prev = 10;
+          _context3.next = 13;
+          return postToFeishu(webhook, buildFeishuBody(records));
+        case 13:
+          _context3.next = 18;
+          break;
+        case 15:
+          _context3.prev = 15;
+          _context3.t0 = _context3["catch"](10);
+          console.warn('[ScanOrderLogger] Feishu 批量上报失败', _context3.t0);
+        case 18:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3, null, [[10, 15]]);
   }));
+  return _flushQueue.apply(this, arguments);
 }
 export var feishuLoggerProvider = {
   send: function send(payload) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _payload$providerConf;
-      var webhook, record, contentArr, contentStr;
+      var _payload$providerConf, _payload$providerConf2, _payload$providerConf3;
+      var webhook, throttleMs;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            cachedProviderConfig = payload.providerConfig;
             webhook = (_payload$providerConf = payload.providerConfig) === null || _payload$providerConf === void 0 || (_payload$providerConf = _payload$providerConf.feishu) === null || _payload$providerConf === void 0 ? void 0 : _payload$providerConf.webhook;
-            if (!(webhook && webhook.includes('REPLACE_ME'))) {
-              _context.next = 3;
+            if (webhook) {
+              _context.next = 5;
               break;
             }
+            console.warn('[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报');
             return _context.abrupt("return");
-          case 3:
-            if (webhook) {
-              _context.next = 6;
+          case 5:
+            if (isWebhookUsable(webhook)) {
+              _context.next = 7;
               break;
             }
-            console.warn('[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报');
             return _context.abrupt("return");
-          case 6:
+          case 7:
             if (!(typeof fetch !== 'function')) {
-              _context.next = 9;
+              _context.next = 10;
               break;
             }
             console.warn('[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报');
             return _context.abrupt("return");
-          case 9:
-            record = payload.record;
-            contentArr = [{
-              key: '日志级别',
-              value: record.level
-            }, {
-              key: '日志时间',
-              value: record.timestamp
-            }, {
-              key: '日志标题',
-              value: record.title
-            }, {
-              key: '缓存标识',
-              value: record.context.cacheId || ''
-            }, {
-              key: '日志来源',
-              value: safeStringify(record.context)
-            }, {
-              key: '日志内容',
-              value: safeStringify(record.payload)
-            }, {
-              key: '扩展信息',
-              value: safeStringify(record.extra)
-            }];
-            contentStr = createFeishuMessageContent(contentArr);
-            _context.next = 14;
-            return fetch(webhook, {
-              headers: {
-                'Content-Type': 'application/json'
-              },
-              method: 'POST',
-              body: JSON.stringify({
-                msg_type: 'post',
-                content: "{\"post\":{\"zh_cn\":{\"title\":\"".concat(record.title, "\",\"content\":").concat(contentStr, "}}}")
-              })
-            });
-          case 14:
+          case 10:
+            throttleMs = (_payload$providerConf2 = (_payload$providerConf3 = payload.providerConfig) === null || _payload$providerConf3 === void 0 || (_payload$providerConf3 = _payload$providerConf3.feishu) === null || _payload$providerConf3 === void 0 ? void 0 : _payload$providerConf3.throttleMs) !== null && _payload$providerConf2 !== void 0 ? _payload$providerConf2 : DEFAULT_THROTTLE_MS;
+            if (!(throttleMs <= 0)) {
+              _context.next = 21;
+              break;
+            }
+            _context.prev = 12;
+            _context.next = 15;
+            return postToFeishu(webhook, buildFeishuBody([payload.record]));
+          case 15:
+            _context.next = 20;
+            break;
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](12);
+            console.warn('[ScanOrderLogger] Feishu 日志上报失败', _context.t0);
+          case 20:
+            return _context.abrupt("return");
+          case 21:
+            pendingQueue.push(payload.record);
+            if (!flushTimer) {
+              flushTimer = setTimeout(function () {
+                void flushQueue();
+              }, throttleMs);
+            }
+          case 23:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[12, 17]]);
     }))();
   }
 };

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

@@ -2,6 +2,12 @@ export type ScanOrderLogLevel = 'info' | 'warning' | 'error' | 'debug';
 export type ScanOrderLoggerProviderType = 'feishu' | 'grafana';
 export interface ScanOrderLoggerProviderFeishuConfig {
     webhook?: string;
+    /**
+     * 节流窗口毫秒数，默认 3000ms
+     * - >0：首条日志进入队列并启动定时器，窗口结束后合并成一条 Feishu post 统一发送
+     * - <=0：关闭节流，保持每条日志立即单独发送
+     */
+    throttleMs?: number;
 }
 export interface ScanOrderLoggerProviderGrafanaConfig {
     endpoint?: string;

package/dist/modules/Summary/utils.js

@@ -685,31 +685,16 @@ var getBundleItemIsDiscountPrice = function getBundleItemIsDiscountPrice(item) {
 var getBundleItemIsMarkupOrDiscountPrice = function getBundleItemIsMarkupOrDiscountPrice(item) {
   return getBundleItemIsMarkupPrice(item) || getBundleItemIsDiscountPrice(item);
 };
-var getDiscountAmount = function getDiscountAmount(discounts) {
-  return (discounts || []).reduce(function (total, discount) {
-    return total.add(new Decimal(discount.amount || 0));
-  }, new Decimal(0)).toNumber();
-};
 
 /**
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
  */
 var getMainProductTotal = function getMainProductTotal(item) {
-  var _ref8, _ref9, _item$main_product_se, _item$metadata, _item$_origin3, _item$_originData;
-  var total = new Decimal((_ref8 = (_ref9 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref9 !== void 0 ? _ref9 : item.price) !== null && _ref8 !== void 0 ? _ref8 : 0);
-  var discount = (item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.discount_list) || (item === null || item === void 0 || (_item$_originData = item._originData) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.product) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.discount_list) === null || _item$_originData === void 0 ? void 0 : _item$_originData.filter(function (item) {
-    var _item$metadata2;
-    return !(item !== null && item !== void 0 && (_item$metadata2 = item.metadata) !== null && _item$metadata2 !== void 0 && _item$metadata2.custom_product_bundle_map_id);
-  })) || [];
-  var mainProductDiscountAmount = getDiscountAmount(discount);
-  total = total.minus(mainProductDiscountAmount);
-
-  // 单规格
-  if (item !== null && item !== void 0 && item.option && Array.isArray(item === null || item === void 0 ? void 0 : item.option)) {
-    total = total.add(item === null || item === void 0 ? void 0 : item.option.reduce(function (t, option) {
-      return t.add(new Decimal(option.price || 0).mul(option.num || 1));
-    }, new Decimal(0)));
-  }
+  var _ref8, _ref9, _item$main_product_se, _item$metadata, _item$metadata2;
+  // 新语义 v2 下 `main_product_selling_price` / `metadata.main_product_selling_price`
+  // 已经是"含 option、含主商品折扣"的主价，直接作为主商品基准，无需再减折扣或加 option。
+  // 仅需叠加 markup / markdown 类 bundle（原价 bundle 的税费单独处理）。
+  var total = new Decimal((_ref8 = (_ref9 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref9 !== void 0 ? _ref9 : item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.main_product_original_price) !== null && _ref8 !== void 0 ? _ref8 : 0);
   var _iterator4 = _createForOfIteratorHelper((item === null || item === void 0 ? void 0 : item.bundle) || []),
     _step4;
   try {
@@ -717,7 +702,7 @@ var getMainProductTotal = function getMainProductTotal(item) {
       var bundleItem = _step4.value;
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
         var _ref10, _bundleItem$bundle_se2;
-        // IMPORTANT: 套餐子商品如果应用了 discount，bundle_selling_price和 price 其实都已经是折后价格了，不需要单独再减一次
+        // IMPORTANT: 套餐子商品如果应用了 discount，bundle_selling_price 和 price 其实都已经是折后价格了，不需要单独再减一次
         var bundleItemTotal = new Decimal((_ref10 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
         total = total.add(bundleItemTotal);
       }

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

@@ -1,6 +1,8 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity } from './types';
+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';
 export * from './types';
@@ -29,6 +31,10 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private itemRuleRuntimeConfig;
     /** 最近一次 checkResourceAvailable 从预约规则 link 拉取的商品快照 */
     private enabledReservationRuleProducts;
+    private loginEffectDisposers;
+    private customerLoginRefreshInFlight;
+    private customerLoginRefreshIdInFlight;
+    private static readonly PISELL1_LOGIN_SUCCESS;
     private getScanOrderLoggerContext;
     private serializeError;
     private addScanOrderLog;
@@ -36,7 +42,16 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private logMethodSuccess;
     private logMethodError;
     addLog(params: ScanOrderAddLogParams): Promise<void>;
+    private normalizeCustomerId;
+    private resolveCustomerIdFromLoginPayload;
+    private clearLoginEffectListeners;
+    private registerLoginEffect;
+    private registerCustomerLoginListeners;
+    private refreshOrderMarketingAfterLogin;
     constructor(name?: string, version?: string);
+    /** 与 `otherParams.cacheId` 一致，供宿主在 URL 变化时判断是否需要重新注册模块 */
+    getCacheId(): string | undefined;
+    private destroyRegisteredChildModules;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
     retryInit(): Promise<void>;
@@ -62,14 +77,24 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     restoreOrder(): Promise<import("./types").ScanOrderTempOrder>;
     getOrderProducts(): ScanOrderOrderProduct[];
     getSummary(): Promise<import("./types").ScanOrderSummary>;
+    getDiscountList(): Discount[];
+    scanCode(code: string, customerId?: number): Promise<ScanOrderScanCodeResult>;
+    setDiscountSelected(params: {
+        discountId: number;
+        isSelected: boolean;
+    }): Promise<void>;
+    onCustomerLogin(params: {
+        customerId: number;
+    }): Promise<void>;
     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;