@pisell/pisellos 2.1.166 → 2.1.168

package/dist/index.d.ts

@@ -7,6 +7,5 @@ export * from './modules';
 export * from './plugins';
 export * from './solution';
 export { PisellOSCore } from './core';
-export { DataVariantEvaluator } from './model/strategy/adapter/dataVariant/evaluator';
 import PisellOSCore from './core';
 export default PisellOSCore;

package/dist/index.js

@@ -12,9 +12,6 @@ export * from "./solution";
 // 导出核心实现
 export { PisellOSCore } from "./core";
 
-// 策略评估器（宿主注入 smart pricing / promotion 等场景使用）
-export { DataVariantEvaluator } from "./model/strategy/adapter/dataVariant/evaluator";
-
 // 导出框架主类
 import PisellOSCore from "./core";
 export default PisellOSCore;

package/dist/model/strategy/adapter/index.d.ts

@@ -5,7 +5,3 @@ export { PromotionEvaluator } from './promotion/evaluator';
 export { PromotionAdapter } from './promotion/adapter';
 export { ItemRuleEvaluator } from './itemRule/evaluator';
 export { ItemRuleAdapter } from './itemRule/adapter';
-export { DataVariantEvaluator } from './dataVariant/evaluator';
-export { DataVariantAdapter } from './dataVariant/adapter';
-export { runDataVariantDemo } from './dataVariant/examples';
-export * from './dataVariant/type';

package/dist/model/strategy/adapter/index.js

@@ -4,8 +4,4 @@ export { WalletPassEvaluator } from "./walletPass/evaluator";
 export { PromotionEvaluator } from "./promotion/evaluator";
 export { PromotionAdapter } from "./promotion/adapter";
 export { ItemRuleEvaluator } from "./itemRule/evaluator";
-export { ItemRuleAdapter } from "./itemRule/adapter";
-export { DataVariantEvaluator } from "./dataVariant/evaluator";
-export { DataVariantAdapter } from "./dataVariant/adapter";
-export { runDataVariantDemo } from "./dataVariant/examples";
-export * from "./dataVariant/type";
+export { ItemRuleAdapter } from "./itemRule/adapter";

package/dist/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

package/dist/modules/Cart/utils/changePrice.js

@@ -23,8 +23,8 @@ function _updateAllCartItemPrice() {
           _iterator = _createForOfIteratorHelper(cartItems);
           _context2.prev = 1;
           _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-            var _item$_productOrigin, _bundle;
-            var item, targetProduct, cartProduct, productInfo, bundle, _productInfo$variant;
+            var _item$_productOrigin$, _item$_productOrigin, _item$_origin, _targetProduct$varian, _ref, _targetVariant$price, _ref2, _targetVariant$base_p, _item$_productOrigin2, _bundle;
+            var item, targetProduct, cartProduct, productInfo, variantId, targetVariant, bundle, _productInfo$variant;
             return _regeneratorRuntime().wrap(function _loop$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
@@ -40,10 +40,17 @@ function _updateAllCartItemPrice() {
                   if (!productInfo) {
                     productInfo = item._productOrigin;
                   }
-                  bundle = item._bundleOrigin;
-                  productInfo.price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.price;
-                  productInfo.base_price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.base_price;
-                  productInfo.product_variant_id = (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.product_variant_id;
+
+                  // 查找选择的规格id
+                  variantId = (_item$_productOrigin$ = item === null || item === void 0 || (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.product_variant_id) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : item === null || item === void 0 || (_item$_origin = item._origin) === null || _item$_origin === void 0 || (_item$_origin = _item$_origin.product) === null || _item$_origin === void 0 ? void 0 : _item$_origin.product_variant_id;
+                  targetVariant = targetProduct === null || targetProduct === void 0 || (_targetProduct$varian = targetProduct.variant) === null || _targetProduct$varian === void 0 ? void 0 : _targetProduct$varian.find(function (variant) {
+                    return Number(variant.id) === Number(variantId);
+                  });
+                  bundle = item._bundleOrigin; // productInfo.price = targetProduct?.price;
+                  // productInfo.base_price = targetProduct?.base_price;
+                  productInfo.price = (_ref = (_targetVariant$price = targetVariant === null || targetVariant === void 0 ? void 0 : targetVariant.price) !== null && _targetVariant$price !== void 0 ? _targetVariant$price : targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.price) !== null && _ref !== void 0 ? _ref : productInfo.price;
+                  productInfo.base_price = (_ref2 = (_targetVariant$base_p = targetVariant === null || targetVariant === void 0 ? void 0 : targetVariant.base_price) !== null && _targetVariant$base_p !== void 0 ? _targetVariant$base_p : targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.base_price) !== null && _ref2 !== void 0 ? _ref2 : productInfo.base_price;
+                  productInfo.product_variant_id = (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 ? void 0 : _item$_productOrigin2.product_variant_id;
                   bundle = (_bundle = bundle) === null || _bundle === void 0 ? void 0 : _bundle.map(function (n) {
                     var _targetProduct$bundle;
                     // 更新 bundle 的价格
@@ -75,8 +82,8 @@ function _updateAllCartItemPrice() {
                   // 如果有返回variant，则把对应variant的数据也补充进去
                   if (targetProduct !== null && targetProduct !== void 0 && targetProduct.variant) {
                     productInfo.variant = (_productInfo$variant = productInfo.variant) === null || _productInfo$variant === void 0 ? void 0 : _productInfo$variant.map(function (n) {
-                      var _targetProduct$varian;
-                      var targetVariant = (_targetProduct$varian = targetProduct.variant) === null || _targetProduct$varian === void 0 ? void 0 : _targetProduct$varian.find(function (m) {
+                      var _targetProduct$varian2;
+                      var targetVariant = (_targetProduct$varian2 = targetProduct.variant) === null || _targetProduct$varian2 === void 0 ? void 0 : _targetProduct$varian2.find(function (m) {
                         return m.id === n.id;
                       });
                       if (targetVariant) {
@@ -99,7 +106,7 @@ function _updateAllCartItemPrice() {
                     bundle: bundle,
                     options: item._optionsOrigin
                   });
-                case 15:
+                case 17:
                 case "end":
                   return _context.stop();
               }

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Discount, DiscountModuleAPI, DiscountWithReason, DiscountPrepareConfigResult } from './types';
+import { Discount, DiscountModuleAPI, DiscountWithReason } from './types';
 export declare class DiscountModule extends BaseModule implements Module, DiscountModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -22,12 +22,9 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
-        with_available_wallet_flag?: 0 | 1;
-        with_available_wallet_pass_flag?: 0 | 1;
         request_timezone: string;
         order_id?: number;
-    }): Promise<DiscountPrepareConfigResult>;
-    private extractAvailableWalletIds;
+    }): Promise<Discount[]>;
     batchSearch(code: string, options?: {
         customerId?: number;
         orderId?: number;

package/dist/modules/Discount/index.js

@@ -163,10 +163,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
             case 2:
               prepareConfig = _context4.sent;
               goodPassList = this.filterEnabledDiscountList([].concat(_toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []), _toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data2 = prepareConfig.data) === null || _prepareConfig$data2 === void 0 ? void 0 : _prepareConfig$data2.discount_card_list) || []))) || []; // this.setDiscountList(goodPassList);
-              return _context4.abrupt("return", {
-                discountList: goodPassList,
-                availableWalletIds: this.extractAvailableWalletIds(prepareConfig === null || prepareConfig === void 0 ? void 0 : prepareConfig.data)
-              });
+              return _context4.abrupt("return", goodPassList);
             case 5:
             case "end":
               return _context4.stop();
@@ -178,23 +175,6 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       return loadPrepareConfig;
     }()
-  }, {
-    key: "extractAvailableWalletIds",
-    value: function extractAvailableWalletIds(data) {
-      var availableWalletList = Array.isArray(data === null || data === void 0 ? void 0 : data.avaiable_wallet_list) ? data.avaiable_wallet_list : Array.isArray(data === null || data === void 0 ? void 0 : data.available_wallet_list) ? data.available_wallet_list : [];
-      var availableWalletPassList = Array.isArray(data === null || data === void 0 ? void 0 : data.available_wallet_pass_list) ? data.available_wallet_pass_list : [];
-      var walletIds = availableWalletList.map(function (item) {
-        return Number(item === null || item === void 0 ? void 0 : item.wallet_id);
-      }).filter(function (id) {
-        return Number.isFinite(id) && id > 0;
-      });
-      var walletPassProductIds = availableWalletPassList.map(function (item) {
-        return Number(item === null || item === void 0 ? void 0 : item.product_id);
-      }).filter(function (id) {
-        return Number.isFinite(id) && id > 0;
-      });
-      return Array.from(new Set([].concat(_toConsumableArray(walletIds), _toConsumableArray(walletPassProductIds))));
-    }
   }, {
     key: "batchSearch",
     value: function () {

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

@@ -68,10 +68,6 @@ export interface DiscountWithReason {
     discountList: Discount[];
     unavailableReasonKey: DiscountFilterRejectKey | null;
 }
-export interface DiscountPrepareConfigResult {
-    discountList: Discount[];
-    availableWalletIds: number[];
-}
 interface ExtensionData {
     id: number;
     shop_id: number;

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

@@ -42,7 +42,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         action?: 'create';
     }): Promise<void>;
     getDiscountList(): Discount[];
-    getAvailableWalletIds(): number[];
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         discountList: Discount[];

package/dist/modules/Order/index.js

@@ -66,9 +66,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!this.store.tempOrder) {
                 this.store.tempOrder = null;
               }
-              if (!Array.isArray(this.store.availableWalletIds)) {
-                this.store.availableWalletIds = [];
-              }
               this.request = this.core.getPlugin('request');
               this.window = this.core.getPlugin('window');
               otherParams = options.otherParams || {};
@@ -79,15 +76,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.restoreTempOrderFromStorage();
               appPlugin = this.core.getPlugin('app');
               if (appPlugin) {
-                _context.next = 15;
+                _context.next = 14;
                 break;
               }
               throw new Error('Order 模块需要 app 插件支持');
-            case 15:
+            case 14:
               app = appPlugin.getApp();
               this.logger = app.logger;
               this.logInfo('OrderModule initialized successfully');
-            case 18:
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -188,7 +185,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
         var _this$store$discount, _this$store$tempOrder;
-        var prepareConfig, discountList, _this$store$discount2;
+        var discountList, _this$store$discount2;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -199,21 +196,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
-                with_available_wallet_flag: 1,
-                with_available_wallet_pass_flag: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               });
             case 2:
-              prepareConfig = _context2.sent;
-              discountList = prepareConfig === null || prepareConfig === void 0 ? void 0 : prepareConfig.discountList;
-              this.store.availableWalletIds = (prepareConfig === null || prepareConfig === void 0 ? void 0 : prepareConfig.availableWalletIds) || [];
+              discountList = _context2.sent;
               if (discountList) {
                 (_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 || _this$store$discount2.setDiscountList(discountList);
               }
               if ((_this$store$tempOrder = this.store.tempOrder) !== null && _this$store$tempOrder !== void 0 && (_this$store$tempOrder = _this$store$tempOrder.products) !== null && _this$store$tempOrder !== void 0 && _this$store$tempOrder.length) {
                 this.applyDiscount();
               }
-            case 7:
+            case 5:
             case "end":
               return _context2.stop();
           }
@@ -230,11 +223,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _this$store$discount3;
       return ((_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.getDiscountList()) || [];
     }
-  }, {
-    key: "getAvailableWalletIds",
-    value: function getAvailableWalletIds() {
-      return this.store.availableWalletIds || [];
-    }
   }, {
     key: "scanCode",
     value: function () {

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

@@ -15,7 +15,6 @@ export interface OrderState {
     discountList: any[];
     discount: DiscountModule | null;
     rules: RulesModule | null;
-    availableWalletIds?: number[];
 }
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 identity_key / 选项指纹等 */
 export interface UpdateProductInOrderParams {
@@ -249,6 +248,5 @@ export interface OrderModuleAPI {
         action?: 'create';
     }) => Promise<void>;
     getDiscountList: () => Discount[];
-    getAvailableWalletIds: () => number[];
     applyDiscount: () => void;
 }

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

@@ -11,7 +11,7 @@ export declare class ProductList extends BaseModule implements Module {
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     storeChange(path?: string, value?: any): Promise<void>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, with_extra, }: {
+    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
@@ -22,8 +22,6 @@ export declare class ProductList extends BaseModule implements Module {
         menu_list_ids?: number[];
         with_count?: string[];
         with_schedule?: number;
-        /** 追加到默认 with 字段（如 dataVariants） */
-        with_extra?: string[];
     }): Promise<any>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];

package/dist/modules/ProductList/index.js

@@ -1,10 +1,4 @@
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _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 _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); }); }; }
@@ -91,11 +85,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$menu_list_ids, menu_list_ids, paramsCustomerId, _ref$with_count, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, _ref$with_extra, with_extra, userPlugin, customer_id, _userPlugin$get, productsData, sortedList;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$menu_list_ids, menu_list_ids, paramsCustomerId, _ref$with_count, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, userPlugin, customer_id, _userPlugin$get, productsData, sortedList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule, _ref$with_extra = _ref.with_extra, with_extra = _ref$with_extra === void 0 ? [] : _ref$with_extra;
+              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule;
               // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
               // if (!schedule_ids?.length) {
               //   const schedule_ids_data = this.store.schedule
@@ -115,13 +109,13 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               } catch (error) {
                 console.error(error);
               }
-              _context3.prev = 4;
-              _context3.next = 7;
+              // 如果没传schedule_date，则从
+              _context3.next = 6;
               return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 0,
                 exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item'],
-                with: ['category', 'collection', 'resourceRelation'].concat(_toConsumableArray(with_extra)),
+                with: ['category', 'collection', 'resourceRelation'],
                 status: 'published',
                 num: 500,
                 skip: 1,
@@ -130,21 +124,20 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 ids: product_ids,
                 collection: collection,
                 front_end_cache_id: cacheId,
+                menu_list_ids: menu_list_ids,
                 with_count: with_count,
                 // client_schedule_ids: schedule_ids,
                 schedule_date: schedule_date,
-                schedule_datetime: schedule_datetime,
                 // application_code: this.otherParams?.channel === 'online_store' ? 'online-store' : this.otherParams?.channel,
                 application_code: 'online-store',
                 with_schedule: with_schedule,
-                is_eject: 1,
-                menu_list_ids: menu_list_ids,
-                open_deposit: 1
+                schedule_datetime: schedule_datetime,
+                is_eject: 1
               }, {
                 useCache: true,
                 customToast: function customToast() {}
               });
-            case 7:
+            case 6:
               productsData = _context3.sent;
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
@@ -157,15 +150,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               // }
               this.addProduct(sortedList);
               return _context3.abrupt("return", sortedList);
-            case 13:
-              _context3.prev = 13;
-              _context3.t0 = _context3["catch"](4);
-              return _context3.abrupt("return", _context3.t0);
-            case 16:
+            case 10:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[4, 13]]);
+        }, _callee3, this);
       }));
       function loadProducts(_x5) {
         return _loadProducts.apply(this, arguments);

package/dist/modules/Schedule/getDateIsInSchedule.js

@@ -6,11 +6,6 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import dayjs from "dayjs";
-import isSameOrAfter from "dayjs/plugin/isSameOrAfter";
-import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
-dayjs.extend(isSameOrAfter);
-dayjs.extend(isSameOrBefore);
-
 // 获取时间是否在日程范围内
 export var getDateIsInSchedule = function getDateIsInSchedule(dateTime, scheduleList) {
   if (!dateTime || !scheduleList || scheduleList.length === 0) {

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

@@ -310,7 +310,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 5 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -329,7 +329,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/dist/solution/ScanOrder/index.js

@@ -857,7 +857,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         var tempOrder = this.store.order.ensureTempOrder();
         tempOrder.metadata = _objectSpread(_objectSpread({}, tempOrder.metadata || {}), {}, {
           shop_service_data: _objectSpread(_objectSpread({}, (tempOrder.metadata || {}).shop_service_data || {}), {}, {
-            service_type: ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) === 'dine_in' ? 'dine_in' : '',
+            service_type: ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) === 'dine_in' ? 'dine_in' : 'take_away',
             pickup_reference_mode: mode
           })
         });

package/dist/solution/ShopDiscount/index.js

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

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

@@ -3,7 +3,6 @@ import { BaseModule } from '../../modules/BaseModule';
 import { VenueBookingAddLogParams, VenueBookingSlotConfig, VenueDateSummaryItem, VenueSlotSelection, VenueTimeSlotGrid } from './types';
 import type { ScanOrderOrderProduct, ScanOrderOrderProductIdentity } from '../ScanOrder/types';
 import type { UpdateProductInOrderParams } from '../../modules/Order/types';
-import type { ScheduleItem } from '../../modules/Schedule/types';
 import type { OpenDataAvailabilityResult } from '../../modules/OpenData';
 import type { ProductData } from '../../modules/Product/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
@@ -37,17 +36,10 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private loginEffectDisposers;
     private customerLoginRefreshInFlight;
     private customerLoginRefreshIdInFlight;
-    /** 最近一次确认登录的客户；登录事件与 user 插件更新之间可能存在时序差。 */
-    private smartPricingCustomerId;
     private loadAllProductsInFlight;
     private productsLoaded;
     private loadOpenDataConfigInFlight;
     private static readonly OPEN_DATA_CACHE_TTL;
-    /** 按日期缓存 slot 智能定价 Map，避免同周重复 resolveProducts */
-    private slotPriceMapCache;
-    /** loadProducts 后缓存的全量商品（venue + addon），供分段算价复用 */
-    private smartPricingProductCatalog;
-    private static readonly PISELL1_LOGIN_SUCCESS;
     private getLoggerContext;
     private safeStringify;
     private pickErrorMessage;
@@ -76,22 +68,6 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
-    /** 清除 slot 价格分段缓存（商品重载 / 登录后 customerId 变化时调用） */
-    private clearSlotPriceMapCache;
-    /** 读取当前登录 customerId */
-    private resolveCustomerIdForSmartPricing;
-    private resolveAvailableWalletIdsForSmartPricing;
-    /** 读取 schedule 全量列表，供智能定价 schedule_match 使用 */
-    private getScheduleListForSmartPricing;
-    /** 构建智能定价上下文，对齐 OS Server buildProductFormatterContext */
-    private buildSmartPricingContext;
-    /** venue + addon 全量商品，供智能定价评估 */
-    private getAllProductsForSmartPricing;
-    private getSlotPriceMapCacheKey;
-    /**
-     * 按 schedule 分段构建 slot 价格 Map，带实例级缓存。
-     */
-    private buildSlotPriceMapForDate;
     loadAllProducts(): Promise<{
         venueProducts: ProductData[];
         addonProducts: ProductData[];
@@ -164,7 +140,8 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     setSlotConfig(config: Partial<VenueBookingSlotConfig>): void;
     getSlotConfig(): VenueBookingSlotConfig;
     loadSchedules(): Promise<void>;
-    getScheduleListByIds(ids: number[]): ScheduleItem[];
+    private injectScheduleResolverToQuotation;
+    getScheduleListByIds(ids: number[]): import("../../modules/Schedule/types").ScheduleItem[];
     getTempOrder(): import("./types").ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): string;
     updateTempOrderContactsInfo(contactsInfo: any[]): any[];
@@ -172,12 +149,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     onCustomerLogin(params: {
         customerId: number;
     }): Promise<void>;
-    private recalculateOrderPricesFromSmartPricing;
-    /**
-     * DataVariant 重算价格后，同步刷新订单展示、Rules 与 Summary 共用的价格口径。
-     * Rules 会在本轮结束后根据当前客户的 discountList 重新写入实际折扣。
-     */
-    private resetProductPriceForSmartPricing;
+    private recalculateOrderPricesFromQuotation;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         discountList: import("../../modules/Discount").Discount[];
@@ -192,15 +164,6 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         discountId: number;
         isSelected: boolean;
     }): Promise<import("../../modules/Discount").Discount[]>;
-    /**
-     * 统一 VenueBooking 折扣后的订单行价。
-     *
-     * Rules 的 `discount_list.amount` 是已经按适用规则计算出的每件优惠额；它是这里唯一
-     * 的折扣金额来源。使用智能定价写入的 source_product_price 减去该金额，再同步
-     * selling_price 与 Summary 使用的 main_product_selling_price，避免 UI 的购物车行价、
-     * 小计和提交订单各自读取到不同的价格字段。
-     */
-    private normalizeDiscountedOrderPrices;
     addNewOrder(): Promise<import("./types").ScanOrderTempOrder>;
     getOrderProducts(): ScanOrderOrderProduct[];
     getSummary(): Promise<import("./types").ScanOrderSummary>;