@pisell/pisellos 2.2.261 → 2.2.263

package/dist/solution/BookingTicket/index.js

@@ -1,8 +1,8 @@
 var _excluded = ["id"],
   _excluded2 = ["product_id"],
   _excluded3 = ["product_id"];
-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 _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 _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 _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; }
@@ -549,7 +549,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "scanPromotionCode",
     value: function () {
       var _scanPromotionCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(code, customerId) {
-        var raw;
+        var raw, scannedList, extractedCustomerId, hasOrderCustomer, tempOrder;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -563,26 +563,42 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               return this.store.order.scanCode(code, customerId);
             case 4:
               raw = _context7.sent;
-              if (!raw.isAvailable) {
+              scannedList = raw.scannedDiscountList || [];
+              extractedCustomerId = this.getDiscountCustomerId(scannedList);
+              hasOrderCustomer = Boolean(this.store.order.getOrderCustomer()); // 缺 Holder 等场景 isAvailable=false，但仍需把 Pass 归属客户带入订单，供 Holder 弹窗使用。
+              if (!(!hasOrderCustomer && extractedCustomerId)) {
                 _context7.next = 11;
                 break;
               }
-              _context7.next = 8;
-              return this.hydrateOrderCustomerFromScanDiscounts(raw.scannedDiscountList || []);
-            case 8:
-              _context7.next = 10;
+              _context7.next = 11;
+              return this.hydrateOrderCustomerFromScanDiscounts(scannedList);
+            case 11:
+              if (!raw.isAvailable) {
+                _context7.next = 18;
+                break;
+              }
+              _context7.next = 14;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 10:
+            case 14:
               this.store.order.persistTempOrder();
-            case 11:
+              tempOrder = this.store.order.ensureTempOrder();
+              _context7.next = 18;
+              return this.effectsEmit('onDiscountApplied', {
+                productList: tempOrder.products || [],
+                discountList: this.store.order.getDiscountList(),
+                selectedDiscountList: tempOrder.discount_list || [],
+                tempOrder: tempOrder
+              });
+            case 18:
               return _context7.abrupt("return", {
                 isAvailable: raw.isAvailable,
                 type: raw.type,
-                unavailableReason: raw.unavailableReason
+                unavailableReason: raw.unavailableReason,
+                scannedDiscountList: raw.scannedDiscountList
               });
-            case 12:
+            case 19:
             case "end":
               return _context7.stop();
           }
@@ -641,12 +657,22 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "getDiscountCustomerId",
     value: function getDiscountCustomerId(discounts) {
-      var discount = discounts.find(function (item) {
-        return item.customer_id != null;
-      });
-      var customerId = Number(discount === null || discount === void 0 ? void 0 : discount.customer_id);
-      if (!Number.isFinite(customerId) || customerId <= 0) return null;
-      return customerId;
+      var _iterator = _createForOfIteratorHelper(discounts),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var item = _step.value;
+          var topLevelId = Number(item.customer_id);
+          if (Number.isFinite(topLevelId) && topLevelId > 0) {
+            return topLevelId;
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return null;
     }
   }, {
     key: "resolveCustomerByDiscountCustomerId",
@@ -1501,7 +1527,15 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       void this.store.order.recalculateSummary({
         createIfMissing: true
       }).then(function () {
-        return _this3.store.order.persistTempOrder();
+        var _discountModule$getDi;
+        var tempOrder = _this3.store.order.ensureTempOrder();
+        _this3.store.order.persistTempOrder();
+        return _this3.effectsEmit('onDiscountApplied', {
+          productList: tempOrder.products || [],
+          discountList: (discountModule === null || discountModule === void 0 || (_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [],
+          selectedDiscountList: tempOrder.discount_list || [],
+          tempOrder: tempOrder
+        });
       }).catch(function (error) {
         console.error('Failed to recalculate summary after clearing customer:', error);
       });
@@ -2468,7 +2502,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       var _addAddTimeProductsToBooking = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(input) {
         var _this7 = this,
           _input$bookingPatch;
-        var bookingUid, orderLines, coveredMinutes, bookingTimePatch, result, _iterator, _step, line;
+        var bookingUid, orderLines, coveredMinutes, bookingTimePatch, result, _iterator2, _step2, line;
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
@@ -2508,15 +2542,15 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               }));
             case 11:
               result = [];
-              _iterator = _createForOfIteratorHelper(orderLines);
+              _iterator2 = _createForOfIteratorHelper(orderLines);
               _context30.prev = 13;
-              _iterator.s();
+              _iterator2.s();
             case 15:
-              if ((_step = _iterator.n()).done) {
+              if ((_step2 = _iterator2.n()).done) {
                 _context30.next = 29;
                 break;
               }
-              line = _step.value;
+              line = _step2.value;
               _context30.t0 = result.splice;
               _context30.t1 = result;
               _context30.t2 = [0, result.length];
@@ -2537,10 +2571,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case 31:
               _context30.prev = 31;
               _context30.t7 = _context30["catch"](13);
-              _iterator.e(_context30.t7);
+              _iterator2.e(_context30.t7);
             case 34:
               _context30.prev = 34;
-              _iterator.f();
+              _iterator2.f();
               return _context30.finish(34);
             case 37:
               return _context30.abrupt("return", result);

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

@@ -83,6 +83,8 @@ export interface ILoadProductsParams {
     extension_type?: string[];
     /** 商品发布状态 */
     status?: string;
+    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
+    strategy_context?: Record<string, any>;
 }
 /**
  * 加载商品详情的参数

package/dist/solution/ScanOrder/index.js

@@ -41,10 +41,6 @@ import { composeLinePrice, createUuidV4, getProductSkuOptions, normalizeSubmitCo
 import dayjs from 'dayjs';
 import { ItemRuleEvaluator } from "../../model/strategy/adapter/itemRule";
 export * from "./types";
-function isItemRewardProductDiscount(discount) {
-  var _discount$metadata, _discount$metadata2;
-  return (discount === null || discount === void 0 ? void 0 : discount.type) === 'product' && (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.source) === 'promotion' && (discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.actionType) === 'ITEM_REWARD';
-}
 export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ScanOrderImpl, _BaseModule);
   var _super = _createSuper(ScanOrderImpl);
@@ -1181,7 +1177,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               _iterator3.s();
             case 19:
               if ((_step3 = _iterator3.n()).done) {
-                _context15.next = 36;
+                _context15.next = 33;
                 break;
               }
               product = _step3.value;
@@ -1189,15 +1185,8 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 _context15.next = 23;
                 break;
               }
-              return _context15.abrupt("continue", 34);
+              return _context15.abrupt("continue", 31);
             case 23:
-              if (!(product.discount_list || []).some(isItemRewardProductDiscount)) {
-                _context15.next = 26;
-                break;
-              }
-              product.discount_list = (product.discount_list || []).filter(isItemRewardProductDiscount);
-              return _context15.abrupt("continue", 34);
-            case 26:
               product.discount_list = (product.discount_list || []).filter(function (pd) {
                 var _pd$discount$resource, _pd$discount;
                 var rid = (_pd$discount$resource = (_pd$discount = pd.discount) === null || _pd$discount === void 0 ? void 0 : _pd$discount.resource_id) !== null && _pd$discount$resource !== void 0 ? _pd$discount$resource : pd.id;
@@ -1221,47 +1210,47 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 34:
+            case 31:
               _context15.next = 19;
               break;
-            case 36:
-              _context15.next = 41;
+            case 33:
+              _context15.next = 38;
               break;
-            case 38:
-              _context15.prev = 38;
+            case 35:
+              _context15.prev = 35;
               _context15.t0 = _context15["catch"](17);
               _iterator3.e(_context15.t0);
-            case 41:
-              _context15.prev = 41;
+            case 38:
+              _context15.prev = 38;
               _iterator3.f();
-              return _context15.finish(41);
-            case 44:
+              return _context15.finish(38);
+            case 41:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context15.next = 47;
+              _context15.next = 44;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 47:
+            case 44:
               tempOrder.discount_list = (nextDiscountList || []).filter(function (d) {
                 return d.isSelected;
               });
-              _context15.next = 50;
+              _context15.next = 47;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 50:
+            case 47:
               this.store.order.persistTempOrder();
               this.logMethodSuccess('setDiscountSelected', params);
-              _context15.next = 58;
+              _context15.next = 55;
               break;
-            case 54:
-              _context15.prev = 54;
+            case 51:
+              _context15.prev = 51;
               _context15.t1 = _context15["catch"](1);
               this.logMethodError('setDiscountSelected', _context15.t1);
               throw _context15.t1;
-            case 58:
+            case 55:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[1, 54], [17, 38, 41, 44]]);
+        }, _callee15, this, [[1, 51], [17, 35, 38, 41]]);
       }));
       function setDiscountSelected(_x8) {
         return _setDiscountSelected.apply(this, arguments);

package/dist/solution/ShopDiscount/index.js

@@ -756,7 +756,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
-        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi2, orderId, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
+        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi2, orderId, customerId, prepareConfigResult, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
@@ -777,7 +777,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 order_id: orderId
               } : {}));
             case 5:
-              goodPassList = _context9.sent;
+              prepareConfigResult = _context9.sent;
+              goodPassList = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.discountList) || [];
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
               }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
@@ -789,35 +790,35 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context9.next = 13;
+              _context9.next = 14;
               return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.setOriginalDiscountList(newDiscountList);
-            case 13:
+            case 14:
               // 根据当前预约时间过滤优惠券列表
               filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
-                _context9.next = 20;
+                _context9.next = 21;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context9.next = 20;
+              _context9.next = 21;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
-            case 20:
-              _context9.next = 22;
+            case 21:
+              _context9.next = 23;
               return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
-            case 22:
-              _context9.next = 27;
+            case 23:
+              _context9.next = 28;
               break;
-            case 24:
-              _context9.prev = 24;
+            case 25:
+              _context9.prev = 25;
               _context9.t0 = _context9["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context9.t0);
-            case 27:
+            case 28:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[0, 24]]);
+        }, _callee9, this, [[0, 25]]);
       }));
       function loadPrepareConfig(_x9) {
         return _loadPrepareConfig.apply(this, arguments);

package/dist/solution/VenueBooking/index.js

@@ -51,10 +51,6 @@ import { RegisterAndLoginHooks } from "../RegisterAndLogin/types";
 import Decimal from 'decimal.js';
 export * from "./types";
 var OPEN_DATA_SECTION_CODES = ['basic', 'fulfillment', 'reservation', 'sale', 'menu', 'availability', 'workflow', 'checkout'];
-function isItemRewardProductDiscount(discount) {
-  var _discount$metadata, _discount$metadata2;
-  return (discount === null || discount === void 0 ? void 0 : discount.type) === 'product' && (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.source) === 'promotion' && (discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.actionType) === 'ITEM_REWARD';
-}
 function cloneCustomDepositData(customDepositData) {
   if (!customDepositData || _typeof(customDepositData) !== 'object') return undefined;
   return _objectSpread(_objectSpread({}, customDepositData), {}, {
@@ -2167,7 +2163,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               _iterator14.s();
             case 21:
               if ((_step14 = _iterator14.n()).done) {
-                _context21.next = 38;
+                _context21.next = 35;
                 break;
               }
               product = _step14.value;
@@ -2175,15 +2171,8 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 _context21.next = 25;
                 break;
               }
-              return _context21.abrupt("continue", 36);
+              return _context21.abrupt("continue", 33);
             case 25:
-              if (!(product.discount_list || []).some(isItemRewardProductDiscount)) {
-                _context21.next = 28;
-                break;
-              }
-              product.discount_list = (product.discount_list || []).filter(isItemRewardProductDiscount);
-              return _context21.abrupt("continue", 36);
-            case 28:
               // 1. 把 product.discount_list 和当前选中的 discount 对齐（剔除已取消的券）
               product.discount_list = (product.discount_list || []).filter(function (pd) {
                 var _pd$discount$resource, _pd$discount;
@@ -2208,36 +2197,36 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 36:
+            case 33:
               _context21.next = 21;
               break;
-            case 38:
-              _context21.next = 43;
+            case 35:
+              _context21.next = 40;
               break;
-            case 40:
-              _context21.prev = 40;
+            case 37:
+              _context21.prev = 37;
               _context21.t0 = _context21["catch"](19);
               _iterator14.e(_context21.t0);
-            case 43:
-              _context21.prev = 43;
+            case 40:
+              _context21.prev = 40;
               _iterator14.f();
-              return _context21.finish(43);
-            case 46:
+              return _context21.finish(40);
+            case 43:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context21.next = 49;
+              _context21.next = 46;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 49:
+            case 46:
               tempOrder.discount_list = (nextDiscountList || []).filter(function (d) {
                 return d.isSelected;
               });
               afterApplyTarget = this.store.order.getDiscountList().find(function (d) {
                 return d.id === params.discountId;
               }) || null;
-              _context21.next = 53;
+              _context21.next = 50;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 53:
+            case 50:
               this.store.order.persistTempOrder();
               finalSummary = ((_this$store$order$get = this.store.order.getTempOrder()) === null || _this$store$order$get === void 0 ? void 0 : _this$store$order$get.summary) || null;
               finalProduct = ((_this$store$order$get2 = this.store.order.getTempOrder()) === null || _this$store$order$get2 === void 0 || (_this$store$order$get2 = _this$store$order$get2.products) === null || _this$store$order$get2 === void 0 ? void 0 : _this$store$order$get2[0]) || null;
@@ -2246,16 +2235,16 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return d.id === params.discountId;
               }) || null;
               return _context21.abrupt("return", this.store.order.getDiscountList());
-            case 61:
-              _context21.prev = 61;
+            case 58:
+              _context21.prev = 58;
               _context21.t1 = _context21["catch"](1);
               this.logMethodError('setDiscountSelected', _context21.t1);
               throw _context21.t1;
-            case 65:
+            case 62:
             case "end":
               return _context21.stop();
           }
-        }, _callee21, this, [[1, 61], [19, 40, 43, 46]]);
+        }, _callee21, this, [[1, 58], [19, 37, 40, 43]]);
       }));
       function setDiscountSelected(_x15) {
         return _setDiscountSelected.apply(this, arguments);

package/lib/model/strategy/adapter/dataVariant/adapter.d.ts

@@ -0,0 +1,50 @@
+import type { EvaluationResult, RuntimeContext } from '../../type';
+import type { BusinessAdapter } from '../type';
+import type { DataVariantBusinessData, DataVariantProduct } from './type';
+/**
+ * Data Variant 适配器。
+ *
+ * 负责把智能定价运行态数据转换为 StrategyEngine 能识别的 attributes。
+ */
+export declare class DataVariantAdapter implements BusinessAdapter {
+    name: string;
+    version: string;
+    /**
+     * 准备批量全局上下文。
+     *
+     * 这里只放不依赖单个商品的字段，用于预计算 schedule/channel/orderType 等条件。
+     */
+    prepareContext(businessData: DataVariantBusinessData): RuntimeContext;
+    /**
+     * 准备全局预计算上下文。
+     */
+    prepareGlobalContext(businessData: DataVariantBusinessData): RuntimeContext;
+    /**
+     * 准备单商品上下文。
+     *
+     * 商品级条件只在当前商品 data_variants 引用到对应规则后才评估。
+     */
+    prepareProductContext(businessData: DataVariantBusinessData, product: DataVariantProduct): RuntimeContext;
+    transformResult(result: EvaluationResult): EvaluationResult;
+    formatConfig(result: EvaluationResult, businessData?: DataVariantBusinessData): {
+        result: EvaluationResult;
+        businessData?: DataVariantBusinessData;
+    };
+    /**
+     * 构建 menu_match 使用的轻量商品对象。
+     *
+     * collection_ids 来自商品 collection 字段，避免 operator 读取复杂商品对象。
+     */
+    buildProductValue(product: DataVariantProduct): {
+        id: number;
+        product_variant_id: number;
+        collection_ids: number[];
+    };
+    private toNumber;
+    /**
+     * 归一化客户 id：无效值返回 undefined，有效值统一为 number。
+     */
+    private normalizeCustomerId;
+    private normalizeNumberArray;
+}
+export default DataVariantAdapter;