@pisell/pisellos 2.2.302 → 2.2.303

package/dist/modules/ProductList/index.js

@@ -29,6 +29,19 @@ import dayjs from 'dayjs';
 import { isProductQueryHandledByOsServer, PRODUCT_QUERY_DATA_VARIANT_RELATIONS, resolveClientDataVariants } from "./clientDataVariants";
 import { isCustomerUserPlatform } from "../../utils/platform";
 export * from "./types";
+function normalizeQuerySet(values) {
+  if (!Array.isArray(values) || values.length === 0) return null;
+  var normalized = values.map(function (value) {
+    return String(value !== null && value !== void 0 ? value : '').trim();
+  }).filter(Boolean);
+  return normalized.length ? new Set(normalized) : null;
+}
+function matchesAny(values, querySet) {
+  if (!querySet) return true;
+  return values.some(function (value) {
+    return querySet.has(String(value !== null && value !== void 0 ? value : '').trim());
+  });
+}
 export var ProductList = /*#__PURE__*/function (_BaseModule) {
   _inherits(ProductList, _BaseModule);
   var _super = _createSuper(ProductList);
@@ -468,26 +481,93 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
       return getProduct;
     }()
   }, {
-    key: "getProductByIds",
+    key: "queryProducts",
     value: function () {
-      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(ids) {
-        var products;
+      var _queryProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+        var params,
+          includeIds,
+          excludeIds,
+          categoryIds,
+          collectionIds,
+          extensionTypes,
+          statuses,
+          channelApplications,
+          codeOrBarcode,
+          products,
+          _args9 = arguments;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context9.next = 2;
-              return this.core.effects.emit("".concat(this.name, ":onGetProductByIds"), this.store.list);
-            case 2:
-              products = this.store.list.filter(function (product) {
-                return ids.includes(product.id);
+              params = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
+              includeIds = normalizeQuerySet(params.includeIds);
+              excludeIds = normalizeQuerySet(params.excludeIds);
+              categoryIds = normalizeQuerySet(params.categoryIds);
+              collectionIds = normalizeQuerySet(params.collectionIds);
+              extensionTypes = normalizeQuerySet(params.extensionTypes);
+              statuses = normalizeQuerySet(params.statuses);
+              channelApplications = normalizeQuerySet(params.channelApplications);
+              codeOrBarcode = typeof params.codeOrBarcode === 'string' ? params.codeOrBarcode.trim() : '';
+              products = (this.store.list || []).filter(function (product) {
+                var _product$id, _product$extension_ty, _product$status;
+                var productId = String((_product$id = product.id) !== null && _product$id !== void 0 ? _product$id : '').trim();
+                if (includeIds && !includeIds.has(productId)) return false;
+                if (excludeIds && excludeIds.has(productId)) return false;
+                if (categoryIds) {
+                  var productCategoryIds = (product.categories || []).flatMap(function (category) {
+                    var _category$pivot;
+                    return [category === null || category === void 0 ? void 0 : category.id, category === null || category === void 0 || (_category$pivot = category.pivot) === null || _category$pivot === void 0 ? void 0 : _category$pivot.product_category_id];
+                  });
+                  if (!matchesAny(productCategoryIds, categoryIds)) return false;
+                }
+                if (collectionIds) {
+                  var productCollectionIds = (product.collection || []).map(function (collection) {
+                    return collection === null || collection === void 0 ? void 0 : collection.id;
+                  });
+                  if (!matchesAny(productCollectionIds, collectionIds)) return false;
+                }
+                if (extensionTypes && !extensionTypes.has(String((_product$extension_ty = product.extension_type) !== null && _product$extension_ty !== void 0 ? _product$extension_ty : '').trim())) return false;
+                if (statuses && !statuses.has(String((_product$status = product.status) !== null && _product$status !== void 0 ? _product$status : '').trim())) return false;
+                if (channelApplications) {
+                  if (!matchesAny(product.channel_application || [], channelApplications)) return false;
+                }
+                if (codeOrBarcode) {
+                  var code = typeof product.code === 'string' ? product.code.trim() : '';
+                  var barcode = typeof product.barcode === 'string' ? product.barcode.trim() : '';
+                  if (code !== codeOrBarcode && barcode !== codeOrBarcode) return false;
+                }
+                return true;
               });
-              return _context9.abrupt("return", products);
-            case 4:
+              return _context9.abrupt("return", cloneDeep(products));
+            case 11:
             case "end":
               return _context9.stop();
           }
         }, _callee9, this);
       }));
+      function queryProducts() {
+        return _queryProducts.apply(this, arguments);
+      }
+      return queryProducts;
+    }()
+  }, {
+    key: "getProductByIds",
+    value: function () {
+      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(ids) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
+            case 0:
+              _context10.next = 2;
+              return this.core.effects.emit("".concat(this.name, ":onGetProductByIds"), this.store.list);
+            case 2:
+              return _context10.abrupt("return", this.queryProducts({
+                includeIds: ids
+              }));
+            case 3:
+            case "end":
+              return _context10.stop();
+          }
+        }, _callee10, this);
+      }));
       function getProductByIds(_x8) {
         return _getProductByIds.apply(this, arguments);
       }
@@ -496,10 +576,10 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProduct",
     value: function () {
-      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(products) {
+      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(products) {
         var _this6 = this;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               // list 需要根据 id 去重
               if (!this.store.list) {
@@ -522,9 +602,9 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               this.core.effects.emit("".concat(this.name, ":changed"), this.store.list);
             case 4:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
       function addProduct(_x9) {
         return _addProduct.apply(this, arguments);
@@ -534,16 +614,16 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "selectProducts",
     value: function () {
-      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(products) {
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(products) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               this.store.selectProducts = products;
             case 1:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
       function selectProducts(_x10) {
         return _selectProducts.apply(this, arguments);

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

@@ -15,6 +15,16 @@ export interface ProductListLoadProductsParams {
     /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
     strategy_context?: Record<string, any>;
 }
+export interface ProductListStoreQueryParams {
+    includeIds?: Array<number | string>;
+    excludeIds?: Array<number | string>;
+    categoryIds?: Array<number | string>;
+    collectionIds?: Array<number | string>;
+    extensionTypes?: string[];
+    statuses?: ProductData['status'][];
+    channelApplications?: string[];
+    codeOrBarcode?: string;
+}
 export interface ProductListData {
     list: ProductData[];
     selectProducts: ProductData[];

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

@@ -14,6 +14,11 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     setRulesList(rulesList: Rules[]): Promise<void>;
     getRulesList(): Rules[];
     getWalletPassEvaluator(): import("../..").WalletPassEvaluator | undefined;
+    private normalizeHolderRecordIds;
+    /**
+     * 特定 form Holder 卡只授权给绑定同一 Holder Record 的商品行。
+     * required/isNeedHolder 仅控制是否强制选择 Holder，不参与优惠资格。
+     */
     private checkHolderMatch;
     isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, orderTotalAmount, holders, isFormSubject, }: {
         oldDiscountList: Discount[];

package/dist/modules/Rules/index.js

@@ -1,6 +1,5 @@
 var _excluded = ["_original_add_price"],
   _excluded2 = ["_original_price", "_original_add_price"];
-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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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; }
@@ -12,6 +11,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 _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); }); }; }
@@ -109,24 +109,39 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var _this$window$getWalle, _this$window;
       return (_this$window$getWalle = (_this$window = this.window).getWalletPassEvaluator) === null || _this$window$getWalle === void 0 ? void 0 : _this$window$getWalle.call(_this$window);
     }
+  }, {
+    key: "normalizeHolderRecordIds",
+    value: function normalizeHolderRecordIds(value) {
+      var records = Array.isArray(value) ? value : [value];
+      return Array.from(new Set(records.map(function (record) {
+        if (record && _typeof(record) === 'object') {
+          return record.form_record_id;
+        }
+        return record;
+      }).filter(function (record) {
+        return record !== undefined && record !== null && record !== '' && record !== 0 && record !== '0';
+      }).map(String)));
+    }
 
-    // 商品不需要holder,则不需要判断，直接返回true，商品需要holder但是还没填写，那么暂时不使用带有holder的券，直到填写才去匹配
+    /**
+     * 特定 form Holder 卡只授权给绑定同一 Holder Record 的商品行。
+     * required/isNeedHolder 仅控制是否强制选择 Holder，不参与优惠资格。
+     */
   }, {
     key: "checkHolderMatch",
     value: function checkHolderMatch(discount, product, holders) {
       var _discount$holder;
       // 非表单类型 holder 视为匹配
       if (((_discount$holder = discount.holder) === null || _discount$holder === void 0 ? void 0 : _discount$holder.holder_type) !== 'form') return true;
-      // 主预约holder, 目前（20251124）默认只考虑单个holder的情况
-      // 旧版 holders[0].form_record_id 新版 holders[0]
-      var orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id || holders[0] : undefined;
-      var productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
-      // 商品不需要选holder，则不对比holder，直接返回true，
-      if (!product.isNeedHolder) return true;
-      // 商品需要holder，但父预约及商品都无holder，返回false
-      if (!orderHolderId && !productHolderId) return false;
-      // 最终直接匹配 holder 是否相同
-      return (productHolderId || orderHolderId) === discount.holder.holder_id;
+      var discountHolderIds = this.normalizeHolderRecordIds(discount.holder.holder_id);
+      if (!discountHolderIds.length) return false;
+      var productHolderIds = this.normalizeHolderRecordIds(product.holder_id);
+      var candidateHolderIds = productHolderIds.length ? productHolderIds : this.normalizeHolderRecordIds(holders);
+      if (!candidateHolderIds.length) return false;
+      var discountHolderIdSet = new Set(discountHolderIds);
+      return candidateHolderIds.some(function (holderId) {
+        return discountHolderIdSet.has(holderId);
+      });
     }
 
     // 判断discountList 是否可以对当前productList生效
@@ -1369,11 +1384,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }))]);
             }
           } else {
-            var _flatItem$bundleItem8, _flatItem$bundleItem9;
+            var _flatItem$bundleItem8, _flatItem$bundleItem9, _flatItem$bundleItem$;
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
               discount_list: isManualDiscount ? _this4.resolveDiscountListForManualOverride(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || []) : _this4.filterDiscountListByType(((_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.discount_list) || [], 'promotion'),
-              price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
+              price: flatItem.bundleItem.price,
+              bundle_selling_price: (_flatItem$bundleItem$ = flatItem.bundleItem.bundle_selling_price) !== null && _flatItem$bundleItem$ !== void 0 ? _flatItem$bundleItem$ : isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
           }

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

@@ -30,6 +30,7 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
         taxRate?: number;
         shopDiscount?: string | number;
         channel?: string;
+        virtualSettlementMode?: boolean;
     }): Promise<{
         tax_title: string;
         tax_rate: number | undefined;

package/dist/modules/SalesSummary/index.js

@@ -213,11 +213,11 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
         var _this$otherParams2, _this$store$surcharge, _ref;
-        var _params$products, products, isPriceIncludeTax, taxRate, shopDiscount, channel, summaryChannel, taxConfig, fatherModuleName, scheduleModuleName, summarySchedule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary, summaryWithTaxMeta;
+        var _params$products, products, isPriceIncludeTax, taxRate, shopDiscount, channel, _params$virtualSettle, virtualSettlementMode, summaryChannel, taxConfig, fatherModuleName, scheduleModuleName, summarySchedule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary, summaryWithTaxMeta;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _params$products = params.products, products = _params$products === void 0 ? [] : _params$products, isPriceIncludeTax = params.isPriceIncludeTax, taxRate = params.taxRate, shopDiscount = params.shopDiscount, channel = params.channel;
+              _params$products = params.products, products = _params$products === void 0 ? [] : _params$products, isPriceIncludeTax = params.isPriceIncludeTax, taxRate = params.taxRate, shopDiscount = params.shopDiscount, channel = params.channel, _params$virtualSettle = params.virtualSettlementMode, virtualSettlementMode = _params$virtualSettle === void 0 ? false : _params$virtualSettle;
               summaryChannel = channel || this.resolveChannel();
               if (!(summaryChannel !== this.surchargeListChannel)) {
                 _context4.next = 5;
@@ -257,7 +257,8 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
                 surchargeList: this.store.surchargeList,
                 scheduleById: scheduleById,
                 isInScheduleByDate: ScheduleModule.isInScheduleByDate,
-                shopDiscount: shopDiscount
+                shopDiscount: shopDiscount,
+                virtualSettlementMode: virtualSettlementMode
               });
               summaryWithTaxMeta = _objectSpread(_objectSpread({}, summary), {}, {
                 tax_title: taxConfig.taxTitle || '',

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

@@ -64,5 +64,6 @@ export interface SalesSummaryModuleAPI {
         taxRate?: number;
         shopDiscount?: string | number;
         channel?: string;
+        virtualSettlementMode?: boolean;
     }): Promise<SalesSummaryData>;
 }

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

@@ -8,4 +8,5 @@ export declare function calculateSalesSummary(params: {
     scheduleById?: Record<string, any>;
     isInScheduleByDate?: any;
     shopDiscount?: string | number;
+    virtualSettlementMode?: boolean;
 }): SalesSummaryData;

package/dist/modules/SalesSummary/utils.js

@@ -1039,12 +1039,32 @@ export function calculateSalesSummary(params) {
     _params$scheduleById = params.scheduleById,
     scheduleById = _params$scheduleById === void 0 ? {} : _params$scheduleById,
     isInScheduleByDate = params.isInScheduleByDate,
-    shopDiscount = params.shopDiscount;
+    shopDiscount = params.shopDiscount,
+    _params$virtualSettle = params.virtualSettlementMode,
+    virtualSettlementMode = _params$virtualSettle === void 0 ? false : _params$virtualSettle;
   if (!(products !== null && products !== void 0 && products.length)) return createEmptySalesSummary();
   var summaryProducts = products.filter(function (product) {
     return !isGeneratedVoucherProduct(product);
   });
   if (!summaryProducts.length) return createEmptySalesSummary();
+  if (virtualSettlementMode) {
+    var _productQuantity = summaryProducts.reduce(function (sum, item) {
+      return sum + getSafeNum(item.num);
+    }, 0);
+    var _productAmount = summaryProducts.reduce(function (sum, item) {
+      return sum.plus(toDecimal(item.selling_price).times(getSafeNum(item.num)));
+    }, new Decimal(0));
+    var amount = toFixed2(_productAmount);
+    return _objectSpread(_objectSpread({}, createEmptySalesSummary()), {}, {
+      product_quantity: _productQuantity,
+      product_original_amount: amount,
+      product_amount: amount,
+      product_expect_amount: amount,
+      expect_amount: amount,
+      total_amount: amount,
+      is_price_include_tax: isPriceIncludeTax
+    });
+  }
   var productQuantity = summaryProducts.reduce(function (sum, item) {
     return sum + getSafeNum(item.num);
   }, 0);

package/dist/plugins/request.d.ts

@@ -70,6 +70,7 @@ export interface RequestOptions {
     cache?: CacheProps;
     cacheUpdateChange?: (data: any) => void;
     osServer?: boolean;
+    isNocobase?: boolean;
     prefix?: boolean;
     callback?: (res: any) => void;
     subscriberId?: string;
@@ -125,7 +126,7 @@ declare class RequestPluginImpl implements RequestPlugin {
     /**
      * GET 请求
      */
-    get<T = any>(url: string, options?: RequestOptions): Promise<T>;
+    get<T = any>(url: string, dataOrOptions?: any, options?: RequestOptions): Promise<T>;
     /**
      * POST 请求
      */

package/dist/plugins/request.js

@@ -147,8 +147,10 @@ var RequestPluginImpl = /*#__PURE__*/function () {
   }, {
     key: "get",
     value: function get(url) {
-      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      return this.request(_objectSpread(_objectSpread({}, options), {}, {
+      var dataOrOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var options = arguments.length > 2 ? arguments[2] : undefined;
+      var requestOptions = options !== null && options !== void 0 ? options : dataOrOptions;
+      return this.request(_objectSpread(_objectSpread({}, requestOptions), {}, {
         url: url,
         method: 'GET'
       }));

package/dist/server/index.d.ts

@@ -421,6 +421,7 @@ declare class Server {
     private shouldUseLocalOrderQuery;
     /**
      * 预约查询是否走本地：
+     * - 日历周/月/资源视图通过 compact_fields 显式标识，始终走远端；
      * - 当 sales_time_between 的开始和结束都不是今天时，走远端；
      * - 其余情况走本地。
      */
@@ -514,12 +515,22 @@ declare class Server {
     private buildCheckoutTaskIdempotencyKey;
     private isBlankCheckoutValue;
     private isLocalCheckoutOrderId;
+    private normalizePrintInvoiceLayoutConfig;
+    private extractInvoiceLayoutConfig;
+    private normalizePrintInvoiceTemplateSettings;
+    private extractInvoiceTemplateSettings;
     private applyCheckoutFulfillmentBuzzer;
     private buildCheckoutResourceIdentifierBuzzer;
     private getCheckoutResourceIdentifier;
     private stringifyCheckoutResourceIdentifier;
     private normalizeCheckoutSubmitData;
     private ensureCheckoutOrderNumbers;
+    /**
+     * Notes 允许在本地草稿阶段暂存空订单目标；checkout 的统一出口负责用最终
+     * shop_order_number 完成绑定并校验，保证后端请求、pending、设备任务和打印
+     * 都使用同一份完整快照。
+     */
+    private finalizeCheckoutSalesNotes;
     private dispatchCheckoutSyncTask;
     private dispatchPrintOtherReceiptTask;
     private buildPrintOtherReceiptIdempotencyKey;
@@ -527,7 +538,10 @@ declare class Server {
     private dispatchLocalReceiptPrint;
     private shouldLookupLocalPrintOrder;
     private getLocalPrintOrderLookup;
+    private mergeLocalPrintOrderInput;
     private handleLocalPrintOrder;
+    private normalizeRequestedReceiptLocales;
+    private handleLocalOrderReceiptSnapshot;
     private handleMachinecodeBatchMeta;
     private resolveMachinecodeBatchMetadataLookup;
     private syncMachinecodeRedeemStatusToLocalOrder;
@@ -536,6 +550,11 @@ declare class Server {
     private handleOrderDraftSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
+    /**
+     * Checkout 与本地小票必须消费同一份规范化子项快照。
+     * 商品/预约只折叠持久化 ID 或协议 UID 相同的行；支付额外兼容 payment_number。
+     */
+    private normalizeCheckoutCollections;
     /**
      * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
      */
@@ -565,6 +584,8 @@ declare class Server {
     private shouldLookupPaymentMethodNameByCode;
     private enrichPaymentNamesByCode;
     private withLocalSmallTicketData;
+    private normalizeRemoteSalesOrderErrorCode;
+    private fetchAndPersistSalesOrderByLookup;
     private handleOrderSalesDetail;
     /**
      * 解析 order_ids 入参，兼容 url query / data 字段、字符串(csv) / 数组两种形态。