@pisell/pisellos 2.2.243 → 2.2.244

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

@@ -135,8 +135,6 @@ export interface PaymentItem {
     origin_amount?: string;
     /** 订单支付类型 */
     order_payment_type?: 'normal' | 'deposit';
-    /** 支付时间 (格式: YYYY-MM-DD HH:mm:ss) */
-    payment_time?: string;
     /** 本支付项是否已成功同步到后端 */
     isSynced?: boolean;
     /** 最近一次同步失败信息（存在则代表同步失败过） */

package/dist/modules/Payment/utils.js

@@ -11,7 +11,7 @@ export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
  * @param list
  */
 export var formatWalletPassList2PreparePayments = function formatWalletPassList2PreparePayments(list) {
-  var formatted = (list || []).map(function (item) {
+  return (list || []).map(function (item) {
     return {
       voucher_id: item.id || 0,
       amount: Number(item.edit_current_amount || getAvailableMaxAmount(item)) || 0,
@@ -20,7 +20,6 @@ export var formatWalletPassList2PreparePayments = function formatWalletPassList2
       wallet_pass_use_value: item.wallet_pass_use_value || undefined
     };
   });
-  return formatted;
 };
 
 /**

package/dist/modules/Payment/walletpass.js

@@ -416,19 +416,12 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "getUserIdentificationCodeListAsync",
     value: function () {
       var _getUserIdentificationCodeListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
-        var _newParams$products, _newParams$prepare_pa, _this$walletParams2, newParams, response, sortedData;
+        var _newParams$prepare_pa, _this$walletParams2, newParams, response, sortedData;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               _context5.prev = 0;
               newParams = _objectSpread(_objectSpread({}, this.walletParams), params);
-              if ((_newParams$products = newParams.products) !== null && _newParams$products !== void 0 && _newParams$products.length) {
-                _context5.next = 5;
-                break;
-              }
-              this.paymentModule.logInfo('[WalletPass] 商品列表为空，跳过获取用户识别码列表');
-              return _context5.abrupt("return", []);
-            case 5:
               this.paymentModule.logInfo('[WalletPass] 开始获取用户识别码列表', {
                 customer_id: newParams.customer_id,
                 available: newParams.available,
@@ -436,9 +429,9 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
                 payment_order_id: (_this$walletParams2 = this.walletParams) === null || _this$walletParams2 === void 0 ? void 0 : _this$walletParams2.payment_order_id
               });
-              _context5.next = 8;
+              _context5.next = 5;
               return this.paymentModule.request.post('/machinecode/prepare/deduction', newParams);
-            case 8:
+            case 5:
               response = _context5.sent;
               // 对获取到的数据进行排序，将错误码为 500100、500200、500300 的项目排到最后
               sortedData = sortUserIdentificationCodeList((response === null || response === void 0 ? void 0 : response.data) || []);
@@ -459,19 +452,19 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 })
               });
               return _context5.abrupt("return", this.userIdentificationCodes);
-            case 16:
-              _context5.prev = 16;
+            case 13:
+              _context5.prev = 13;
               _context5.t0 = _context5["catch"](0);
               this.paymentModule.logError('[WalletPass] 获取用户识别码列表失败', _context5.t0, {
                 customer_id: params.customer_id,
                 available: params.available
               });
               return _context5.abrupt("return", []);
-            case 20:
+            case 17:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 16]]);
+        }, _callee5, this, [[0, 13]]);
       }));
       function getUserIdentificationCodeListAsync(_x5) {
         return _getUserIdentificationCodeListAsync.apply(this, arguments);

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

@@ -1,6 +1,5 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { ProductListLoadProductsParams } from './types';
 import { ProductData } from '../Product/types';
 export * from './types';
 export declare class ProductList extends BaseModule implements Module {
@@ -11,22 +10,19 @@ export declare class ProductList extends BaseModule implements Module {
     private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
-    /**
-     * 更新运行态参数，供父级解决方案 setOtherParams 后同步查询上下文。
-     *
-     * @example
-     * productList.updateOtherParams({ channel: 'pos' });
-     */
-    updateOtherParams(params: Record<string, any>): void;
     storeChange(path?: string, value?: any): Promise<void>;
-    /**
-     * 获取加时商品列表。
-     *
-     * @example
-     * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
-     */
-    getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<any>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, }?: ProductListLoadProductsParams, options?: {
+    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[];
+        schedule_date?: string;
+        cacheId?: string;
+        customer_id?: number;
+        menu_list_ids?: number[];
+        schedule_datetime?: string;
+        with_count?: string[];
+        with_schedule?: number;
+    }, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
     }): Promise<any>;

package/dist/modules/ProductList/index.js

@@ -1,6 +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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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); }); }; }
@@ -19,7 +17,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
 import { cloneDeep } from 'lodash-es';
-import dayjs from 'dayjs';
 export * from "./types";
 export var ProductList = /*#__PURE__*/function (_BaseModule) {
   _inherits(ProductList, _BaseModule);
@@ -67,17 +64,6 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
-    /**
-     * 更新运行态参数，供父级解决方案 setOtherParams 后同步查询上下文。
-     *
-     * @example
-     * productList.updateOtherParams({ channel: 'pos' });
-     */
-  }, {
-    key: "updateOtherParams",
-    value: function updateOtherParams(params) {
-      this.otherParams = params || {};
-    }
   }, {
     key: "storeChange",
     value: function () {
@@ -95,75 +81,16 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
       }
       return storeChange;
     }()
-    /**
-     * 获取加时商品列表。
-     *
-     * @example
-     * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
-     */
-  }, {
-    key: "getAddTimeProducts",
-    value: (function () {
-      var _getAddTimeProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var params,
-          _args3 = arguments;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              params = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
-              return _context3.abrupt("return", this.loadProducts(_objectSpread(_objectSpread({
-                schedule_date: dayjs().format('YYYY-MM-DD'),
-                status: 'published'
-              }, params), {}, {
-                extension_type: ['product_add_time']
-              })));
-            case 2:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function getAddTimeProducts() {
-        return _getAddTimeProducts.apply(this, arguments);
-      }
-      return getAddTimeProducts;
-    }())
   }, {
     key: "loadProducts",
     value: function () {
-      var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref, options) {
         var _this$otherParams;
-        var _ref,
-          _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,
-          extension_type,
-          _ref$status,
-          status,
-          options,
-          userPlugin,
-          customer_id,
-          _userPlugin$get,
-          productsData,
-          sortedList,
-          _args4 = arguments;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        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 = _args4.length > 0 && _args4[0] !== undefined ? _args4[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, extension_type = _ref.extension_type, _ref$status = _ref.status, status = _ref$status === void 0 ? 'published' : _ref$status;
-              options = _args4.length > 1 ? _args4[1] : undefined;
+              _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
@@ -184,13 +111,13 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 console.error(error);
               }
               // 如果没传schedule_date，则从
-              _context4.next = 7;
+              _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'],
-                status: status,
+                status: 'published',
                 num: 500,
                 skip: 1,
                 customer_id: customer_id,
@@ -205,16 +132,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 application_code: (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel,
                 is_eject: 1,
                 with_schedule: with_schedule,
-                schedule_datetime: schedule_datetime,
-                extension_type: extension_type
+                schedule_datetime: schedule_datetime
               }, {
                 osServer: true,
                 callback: options === null || options === void 0 ? void 0 : options.callback,
                 subscriberId: options === null || options === void 0 ? void 0 : options.subscriberId,
                 customToast: function customToast() {}
               });
-            case 7:
-              productsData = _context4.sent;
+            case 6:
+              productsData = _context3.sent;
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
               }); // if (sortedList.length) {
@@ -225,14 +151,14 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               //   })
               // }
               this.addProduct(sortedList);
-              return _context4.abrupt("return", sortedList);
-            case 11:
+              return _context3.abrupt("return", sortedList);
+            case 10:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, this);
+        }, _callee3, this);
       }));
-      function loadProducts() {
+      function loadProducts(_x5, _x6) {
         return _loadProducts.apply(this, arguments);
       }
       return loadProducts;
@@ -240,13 +166,13 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadProductsPrice",
     value: function () {
-      var _loadProductsPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref2) {
+      var _loadProductsPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref2) {
         var _ref2$ids, ids, customer_id, schedule_date, channel, productsData;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _ref2$ids = _ref2.ids, ids = _ref2$ids === void 0 ? [] : _ref2$ids, customer_id = _ref2.customer_id, schedule_date = _ref2.schedule_date, channel = _ref2.channel;
-              _context5.next = 3;
+              _context4.next = 3;
               return this.request.post("/product/query/price", {
                 ids: ids,
                 customer_id: customer_id,
@@ -256,15 +182,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 useCache: true
               });
             case 3:
-              productsData = _context5.sent;
-              return _context5.abrupt("return", productsData.data);
+              productsData = _context4.sent;
+              return _context4.abrupt("return", productsData.data);
             case 5:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5, this);
+        }, _callee4, this);
       }));
-      function loadProductsPrice(_x5) {
+      function loadProductsPrice(_x7) {
         return _loadProductsPrice.apply(this, arguments);
       }
       return loadProductsPrice;
@@ -272,19 +198,19 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProducts",
     value: function () {
-      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context6.next = 2;
+              _context5.next = 2;
               return this.core.effects.emit("".concat(this.name, ":onGetProducts"), this.store.list);
             case 2:
-              return _context6.abrupt("return", cloneDeep(this.store.list));
+              return _context5.abrupt("return", cloneDeep(this.store.list));
             case 3:
             case "end":
-              return _context6.stop();
+              return _context5.stop();
           }
-        }, _callee6, this);
+        }, _callee5, this);
       }));
       function getProducts() {
         return _getProducts.apply(this, arguments);
@@ -294,25 +220,25 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProduct",
     value: function () {
-      var _getProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id) {
+      var _getProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id) {
         var product;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context7.next = 2;
+              _context6.next = 2;
               return this.core.effects.emit("".concat(this.name, ":onGetProduct"), this.store.list);
             case 2:
               product = this.store.list.find(function (product) {
                 return product.id === id;
               });
-              return _context7.abrupt("return", product ? cloneDeep(product) : undefined);
+              return _context6.abrupt("return", product ? cloneDeep(product) : undefined);
             case 4:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
-        }, _callee7, this);
+        }, _callee6, this);
       }));
-      function getProduct(_x6) {
+      function getProduct(_x8) {
         return _getProduct.apply(this, arguments);
       }
       return getProduct;
@@ -320,25 +246,25 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProductByIds",
     value: function () {
-      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(ids) {
+      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(ids) {
         var products;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context8.next = 2;
+              _context7.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);
               });
-              return _context8.abrupt("return", products);
+              return _context7.abrupt("return", products);
             case 4:
             case "end":
-              return _context8.stop();
+              return _context7.stop();
           }
-        }, _callee8, this);
+        }, _callee7, this);
       }));
-      function getProductByIds(_x7) {
+      function getProductByIds(_x9) {
         return _getProductByIds.apply(this, arguments);
       }
       return getProductByIds;
@@ -346,10 +272,10 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProduct",
     value: function () {
-      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(products) {
+      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(products) {
         var _this2 = this;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               // list 需要根据 id 去重
               if (!this.store.list) {
@@ -372,11 +298,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               this.core.effects.emit("".concat(this.name, ":changed"), this.store.list);
             case 4:
             case "end":
-              return _context9.stop();
+              return _context8.stop();
           }
-        }, _callee9, this);
+        }, _callee8, this);
       }));
-      function addProduct(_x8) {
+      function addProduct(_x10) {
         return _addProduct.apply(this, arguments);
       }
       return addProduct;
@@ -384,18 +310,18 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "selectProducts",
     value: function () {
-      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(products) {
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(products) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               this.store.selectProducts = products;
             case 1:
             case "end":
-              return _context10.stop();
+              return _context9.stop();
           }
-        }, _callee10, this);
+        }, _callee9, this);
       }));
-      function selectProducts(_x9) {
+      function selectProducts(_x11) {
         return _selectProducts.apply(this, arguments);
       }
       return selectProducts;

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

@@ -1,18 +1,4 @@
 import { ProductData } from '../Product/types';
-export interface ProductListLoadProductsParams {
-    category_ids?: number[];
-    product_ids?: number[];
-    collection?: number | string[];
-    schedule_date?: string;
-    cacheId?: string;
-    customer_id?: number;
-    menu_list_ids?: number[];
-    schedule_datetime?: string;
-    with_count?: string[];
-    with_schedule?: number;
-    extension_type?: string[];
-    status?: string;
-}
 export interface ProductListData {
     list: ProductData[];
     selectProducts: ProductData[];

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

@@ -47,6 +47,7 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Map<string, string | null>;
     setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
+    private filterQuotationsByCustomer;
     private isQuotationVisibleForCustomer;
     private hasValidCustomerId;
     private isQuotationActiveAt;

package/dist/modules/Quotation/index.js

@@ -78,22 +78,22 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               query = {};
               if (params !== null && params !== void 0 && params.channel) query.channel = params.channel;
+              if (params !== null && params !== void 0 && params.customer_id) query.customer_id = String(params.customer_id);
               if ((params === null || params === void 0 ? void 0 : params.channel) === 'online_store') {
                 query.channel = 'online-store';
               }
-              _context2.next = 5;
+              _context2.next = 6;
               return this.request.get('/quotation/available', query, {
-                useCache: false,
-                osServer: true
+                useCache: false
               });
-            case 5:
+            case 6:
               res = _context2.sent;
-              list = (res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [];
+              list = this.filterQuotationsByCustomer((res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [], params === null || params === void 0 ? void 0 : params.customer_id);
               list.sort(function (a, b) {
                 return a.sort - b.sort;
               });
               this.store.list = list;
-            case 9:
+            case 10:
             case "end":
               return _context2.stop();
           }
@@ -130,10 +130,8 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var quotation = _step.value;
-          var visible = this.isQuotationVisibleForCustomer(quotation, customer_id);
-          if (!visible) continue;
-          var active = this.isQuotationActiveAt(quotation, datetime);
-          if (!active) continue;
+          if (!this.isQuotationVisibleForCustomer(quotation, customer_id)) continue;
+          if (!this.isQuotationActiveAt(quotation, datetime)) continue;
           var match = this.findProductData(quotation.product_data, productId, variantId);
           if (!match) continue;
           if (match.value === 0) continue;
@@ -220,6 +218,14 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function setScheduleResolver(resolver) {
       this.scheduleResolver = resolver;
     }
+  }, {
+    key: "filterQuotationsByCustomer",
+    value: function filterQuotationsByCustomer(list, customerId) {
+      var _this2 = this;
+      return list.filter(function (quotation) {
+        return _this2.isQuotationVisibleForCustomer(quotation, customerId);
+      });
+    }
   }, {
     key: "isQuotationVisibleForCustomer",
     value: function isQuotationVisibleForCustomer(quotation, customerId) {
@@ -240,27 +246,18 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     key: "isQuotationActiveAt",
     value: function isQuotationActiveAt(quotation, datetime) {
       var _quotation$schedule,
-        _this2 = this;
+        _this3 = this;
       if (!((_quotation$schedule = quotation.schedule) !== null && _quotation$schedule !== void 0 && _quotation$schedule.length)) return false;
-      var scheduleItems = [];
-      quotation.schedule.forEach(function (s) {
-        var _this2$scheduleResolv;
-        var full = (_this2$scheduleResolv = _this2.scheduleResolver) === null || _this2$scheduleResolv === void 0 ? void 0 : _this2$scheduleResolv.call(_this2, s.id);
-        if (full) {
-          scheduleItems.push(full);
-          return;
-        }
-        if (_this2.scheduleResolver) {
-          return;
-        }
-        var fallbackSchedule = _objectSpread(_objectSpread({}, s), {}, {
+      var scheduleItems = quotation.schedule.map(function (s) {
+        var _this3$scheduleResolv;
+        var full = (_this3$scheduleResolv = _this3.scheduleResolver) === null || _this3$scheduleResolv === void 0 ? void 0 : _this3$scheduleResolv.call(_this3, s.id);
+        if (full) return full;
+        return _objectSpread(_objectSpread({}, s), {}, {
           repeat_type: s.repeat_type || 'none',
           repeat_rule: s.repeat_rule || null,
           time_slot: s.time_slot || []
         });
-        scheduleItems.push(fallbackSchedule);
       });
-      if (!scheduleItems.length) return false;
       return getDateIsInSchedule(datetime, scheduleItems);
     }
   }, {

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

@@ -32,10 +32,6 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         unavailableReason?: UnavailableReason;
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
-    /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
-    excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
-    /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
-    resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];