@pisell/pisellos 2.2.203 → 2.2.205

package/dist/solution/BookingTicket/utils/scan/index.js

@@ -1,3 +1,4 @@
+var _class;
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -24,6 +25,7 @@ var Scan = /*#__PURE__*/function () {
     _defineProperty(this, "listenerConfig", new Map());
     this.solution = solution;
     this.watchKey = watchKey;
+    Scan.scanInstances.add(this);
 
     // 初始化扫码监听
     // this.initPeripheralsListener();
@@ -31,18 +33,23 @@ var Scan = /*#__PURE__*/function () {
 
   /**
    * 初始化外设扫码结果监听
+   *
+   * @example
+   * scan.initPeripheralsListener();
    */
   _createClass(Scan, [{
     key: "initPeripheralsListener",
     value: function initPeripheralsListener() {
-      var _this$solution,
-        _this$solution$mountF,
-        _this = this;
+      var _this$solution, _this$solution$mountF;
+      if (Scan.peripheralsListenerMounted) return;
+      Scan.peripheralsListenerMounted = true;
       (_this$solution = this.solution) === null || _this$solution === void 0 || (_this$solution = _this$solution.window) === null || _this$solution === void 0 || (_this$solution = _this$solution.interaction) === null || _this$solution === void 0 || (_this$solution = _this$solution.utils) === null || _this$solution === void 0 || (_this$solution$mountF = _this$solution.mountFunction) === null || _this$solution$mountF === void 0 || _this$solution$mountF.call(_this$solution, 'global', 'peripheralsResult', function (strVal) {
         try {
           var _result = JSON.parse(strVal);
           console.log('nativeScannerResult>>>>>>>', _result);
-          _this.handleScan(_result);
+          Scan.scanInstances.forEach(function (instance) {
+            instance.handleScan(_result);
+          });
         } catch (err) {
           console.error(err);
         }
@@ -61,8 +68,9 @@ var Scan = /*#__PURE__*/function () {
       if (lastEnableEventKey) {
         var listenerConfig = this.listenerConfig.get(lastEnableEventKey);
         if (listenerConfig) {
+          var taskUuid = this.generateUuid();
           listenerConfig.task.addTask({
-            uuid: this.generateUuid(),
+            uuid: taskUuid,
             type: lastEnableEventKey,
             actionParams: {
               scanResult: result
@@ -91,7 +99,7 @@ var Scan = /*#__PURE__*/function () {
   }, {
     key: "addListener",
     value: function addListener(event, scanCallback) {
-      var _this2 = this;
+      var _this = this;
       // 订阅事件
       watch.subscribe(this.watchKey, event);
       // 创建任务
@@ -100,7 +108,7 @@ var Scan = /*#__PURE__*/function () {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
         }
-        return _this2.scanTaskAction.apply(_this2, [event.key].concat(args));
+        return _this.scanTaskAction.apply(_this, [event.key].concat(args));
       });
 
       // 创建监听配置
@@ -110,7 +118,7 @@ var Scan = /*#__PURE__*/function () {
       });
       return {
         remove: function remove() {
-          _this2.removeListener(event);
+          _this.removeListener(event);
         }
       };
     }
@@ -136,6 +144,7 @@ var Scan = /*#__PURE__*/function () {
     key: "removeAllListeners",
     value: function removeAllListeners() {
       var _this$listenerConfig, _this$listenerConfig$2, _this$listenerConfig2, _this$listenerConfig3;
+      Scan.scanInstances.delete(this);
       watch.clearEvent(this.watchKey);
       (_this$listenerConfig = this.listenerConfig) === null || _this$listenerConfig === void 0 || (_this$listenerConfig$2 = _this$listenerConfig.forEach) === null || _this$listenerConfig$2 === void 0 || _this$listenerConfig$2.call(_this$listenerConfig, function (item) {
         var _item$task;
@@ -291,4 +300,7 @@ var Scan = /*#__PURE__*/function () {
   }]);
   return Scan;
 }();
+_class = Scan;
+_defineProperty(Scan, "scanInstances", new Set());
+_defineProperty(Scan, "peripheralsListenerMounted", false);
 export { Scan as default };

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

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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

@@ -250,6 +250,28 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
     private shouldMergeProductToOrder;
+    /**
+     * 预约商品加车后的统一收尾：促销、折扣、summary 重算与持久化（批量拆行时只调用一次）。
+     *
+     * @example
+     * await this.finalizeProductOrderMutation(tempOrder);
+     */
+    private finalizeProductOrderMutation;
+    /**
+     * 向 tempOrder 追加一条商品行（及可选 booking），不触发 summary 重算。
+     * 带 booking 且 num>1 时由 `addProductToOrder` 拆成多次本方法调用（每次 num=1）。
+     *
+     * @example
+     * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
+     */
+    private appendProductLineToTempOrder;
+    /**
+     * 添加商品行。带 booking 时强制独立行；num>1 时拆成多条 num=1 的 product+booking（对齐 BookingByStep / ticketBooking addService）。
+     *
+     * @example
+     * await order.addProductToOrder({ product_id: 1, num: 3 }, { start_time: '10:00' });
+     * // → tempOrder.products 新增 3 行，每行 num=1，bookings 3 条
+     */
     addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput): Promise<OrderProduct[]>;
     private hasGoodPassDiscount;
     private getBundleRuntimeIdentity;
@@ -257,6 +279,21 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateOrderProduct(params: UpdateOrderProductParams): Promise<OrderProduct[]>;
     updateOrderProductQuantity(params: UpdateOrderProductQuantityParams): Promise<OrderProduct[]>;
     updateOrderBooking(params: UpdateOrderBookingParams): any[];
+    /**
+     * 商品行写路径收尾：促销 → 折扣 → 清洗 → summary → 持久化。
+     * 批量删除等多行变更场景只应调用一次，避免 N 次 applyPromotion。
+     *
+     * @example
+     * await this.finalizeAfterProductsMutation(tempOrder);
+     */
+    private finalizeAfterProductsMutation;
+    /**
+     * 批量按 identity 删除购物车行，末尾仅一次促销重算。
+     *
+     * @example
+     * await order.removeProductsFromOrder([identityA, identityB]);
+     */
+    removeProductsFromOrder(identities: OrderProductIdentity[]): Promise<OrderProduct[]>;
     removeProductFromOrder(identity: OrderProductIdentity): Promise<OrderProduct[]>;
     /**
      * 仅清空购物车行（products / bookings），不重置整单。
@@ -287,7 +324,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -518,13 +518,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * - 不主动调用 applyDiscount / recalculateSummary，调用方负责跟进。
    */
   async applyPromotion() {
-    if (this.isApplyingPromotion)
+    if (this.isApplyingPromotion) {
       return;
-    if (!this.promotionEvaluator)
+    }
+    if (!this.promotionEvaluator) {
       return;
+    }
     const tempOrder = this.store.tempOrder;
-    if (!tempOrder)
+    if (!tempOrder) {
       return;
+    }
     this.isApplyingPromotion = true;
     try {
       const result = (0, import_cartPromotion.processCartPromotion)(
@@ -1968,9 +1971,29 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return true;
   }
   // ─── TempOrder: 商品 CRUD ───
-  async addProductToOrder(product, booking) {
+  /**
+   * 预约商品加车后的统一收尾：促销、折扣、summary 重算与持久化（批量拆行时只调用一次）。
+   *
+   * @example
+   * await this.finalizeProductOrderMutation(tempOrder);
+   */
+  async finalizeProductOrderMutation(tempOrder) {
+    await this.ensureEditDiscountConfigForProductChange(tempOrder);
+    await this.applyPromotion();
+    this.applyDiscount();
+    this.sanitizeTempOrderProducts(tempOrder);
+    await this.recalculateSummary({ createIfMissing: true });
+    this.persistTempOrder();
+  }
+  /**
+   * 向 tempOrder 追加一条商品行（及可选 booking），不触发 summary 重算。
+   * 带 booking 且 num>1 时由 `addProductToOrder` 拆成多次本方法调用（每次 num=1）。
+   *
+   * @example
+   * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
+   */
+  async appendProductLineToTempOrder(tempOrder, product, booking) {
     var _a;
-    const tempOrder = this.ensureTempOrder();
     const linked = booking ? this.createLinkedProductAndBooking({ product, booking }) : null;
     const productToAdd = (linked == null ? void 0 : linked.product) || product;
     const incomingFingerprint = (0, import_utils3.buildProductLineFingerprint)(
@@ -1991,6 +2014,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
       if (this.hasGoodPassDiscount(item))
         return false;
+      if (item.order_detail_id !== void 0 && item.order_detail_id !== null)
+        return false;
       if (item.product_id !== productToAdd.product_id)
         return false;
       if (item.product_variant_id !== productToAdd.product_variant_id)
@@ -2092,12 +2117,38 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (linked) {
       tempOrder.bookings = [...tempOrder.bookings || [], linked.booking];
     }
-    await this.ensureEditDiscountConfigForProductChange(tempOrder);
-    await this.applyPromotion();
-    this.applyDiscount();
-    this.sanitizeTempOrderProducts(tempOrder);
-    await this.recalculateSummary({ createIfMissing: true });
-    this.persistTempOrder();
+  }
+  /**
+   * 添加商品行。带 booking 时强制独立行；num>1 时拆成多条 num=1 的 product+booking（对齐 BookingByStep / ticketBooking addService）。
+   *
+   * @example
+   * await order.addProductToOrder({ product_id: 1, num: 3 }, { start_time: '10:00' });
+   * // → tempOrder.products 新增 3 行，每行 num=1，bookings 3 条
+   */
+  async addProductToOrder(product, booking) {
+    const tempOrder = this.ensureTempOrder();
+    if (booking) {
+      const productRecord = product;
+      const splitCount = (0, import_utils3.getSafeProductNum)(
+        productRecord.num ?? productRecord.product_quantity ?? 1
+      );
+      if (splitCount > 1) {
+        for (let i = 0; i < splitCount; i += 1) {
+          const singleLine = (0, import_lodash_es.cloneDeep)(productRecord);
+          singleLine.num = 1;
+          delete singleLine.product_quantity;
+          await this.appendProductLineToTempOrder(
+            tempOrder,
+            singleLine,
+            (0, import_lodash_es.cloneDeep)(booking)
+          );
+        }
+        await this.finalizeProductOrderMutation(tempOrder);
+        return tempOrder.products;
+      }
+    }
+    await this.appendProductLineToTempOrder(tempOrder, product, booking);
+    await this.finalizeProductOrderMutation(tempOrder);
     return tempOrder.products;
   }
   hasGoodPassDiscount(product) {
@@ -2395,11 +2446,34 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.persistTempOrder();
     return tempOrder.bookings;
   }
-  async removeProductFromOrder(identity) {
+  /**
+   * 商品行写路径收尾：促销 → 折扣 → 清洗 → summary → 持久化。
+   * 批量删除等多行变更场景只应调用一次，避免 N 次 applyPromotion。
+   *
+   * @example
+   * await this.finalizeAfterProductsMutation(tempOrder);
+   */
+  async finalizeAfterProductsMutation(tempOrder) {
+    await this.applyPromotion();
+    this.applyDiscount();
+    this.sanitizeTempOrderProducts(tempOrder);
+    await this.recalculateSummary({ createIfMissing: true });
+    this.persistTempOrder();
+  }
+  /**
+   * 批量按 identity 删除购物车行，末尾仅一次促销重算。
+   *
+   * @example
+   * await order.removeProductsFromOrder([identityA, identityB]);
+   */
+  async removeProductsFromOrder(identities) {
     const tempOrder = this.ensureTempOrder();
+    if (!identities.length) {
+      return tempOrder.products;
+    }
     const removedProducts = [];
     tempOrder.products = tempOrder.products.filter((item) => {
-      const shouldRemove = (0, import_utils3.isIdentityMatch)(item, identity);
+      const shouldRemove = identities.some((identity) => (0, import_utils3.isIdentityMatch)(item, identity));
       if (shouldRemove)
         removedProducts.push(item);
       return !shouldRemove;
@@ -2407,13 +2481,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     for (const product of removedProducts) {
       this.removeLinkedBookingsForProduct(tempOrder, product);
     }
-    await this.applyPromotion();
-    this.applyDiscount();
-    this.sanitizeTempOrderProducts(tempOrder);
-    await this.recalculateSummary({ createIfMissing: true });
-    this.persistTempOrder();
+    await this.finalizeAfterProductsMutation(tempOrder);
     return tempOrder.products;
   }
+  async removeProductFromOrder(identity) {
+    return this.removeProductsFromOrder([identity]);
+  }
   /**
    * 仅清空购物车行（products / bookings），不重置整单。
    * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
@@ -2518,6 +2591,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         submittedOrderId,
         (resultRecord == null ? void 0 : resultRecord.data) || resultRecord || {}
       );
+    } else {
+      this.store.syncState = "submitted";
     }
     return result;
   }
@@ -2836,7 +2911,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         hasOrderId: !!orderData.order_id,
         smallTicketDataFlag: orderData.small_ticket_data_flag
       });
-      const response = await this.request.post("/shop/order/checkout", orderData, {
+      const response = await this.request.post("/order/checkout", orderData, {
         osServer: true,
         customToast: () => {
         }

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

@@ -612,6 +612,8 @@ export interface OrderModuleAPI {
     updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
     removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
+    /** 批量删除购物车行，末尾仅触发一次促销重算与 summary 刷新 */
+    removeProductsFromOrder: (identities: OrderProductIdentity[]) => Promise<OrderProduct[]>;
     /** @deprecated no-op；OrderModule 不再负责 tempOrder localStorage 持久化。 */
     persistTempOrder: () => void;
     /**

package/lib/modules/Payment/index.d.ts

@@ -25,9 +25,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     private dbManager;
     private logger;
     private voucherUpdateLockByOrderUuid;
-    private payMethodMemoryCache;
-    private payMethodListInFlight;
-    private isRefreshingPaymentMethods;
     protected otherParams: any;
     cash: CashPayment;
     eftpos: EftposPayment;
@@ -57,20 +54,10 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      *
      */
     private registerNetworkHandlers;
-    private filterPayMethods;
     /**
      * 获取支付方式列表
      */
     getPayMethodListAsync(): Promise<PaymentMethod[]>;
-    private loadPayMethodListAsync;
-    /**
-     * 后台刷新支付方式列表
-     */
-    private refreshPaymentMethodsInBackground;
-    /**
-     * 检查支付方式列表是否有变化
-     */
-    private hasPaymentMethodsChanged;
     /**
      * 获取订单列表
      */

package/lib/modules/Payment/index.js

@@ -76,9 +76,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.defaultVersion = "1.0.0";
     // LoggerManager 实例
     this.voucherUpdateLockByOrderUuid = /* @__PURE__ */ new Map();
-    this.payMethodMemoryCache = null;
-    this.payMethodListInFlight = null;
-    this.isRefreshingPaymentMethods = false;
     this.otherParams = {};
     this.cash = new import_cash.CashPaymentImpl(this);
     this.eftpos = new import_eftpos.EftposPaymentImpl(this);
@@ -213,66 +210,18 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       }
     });
   }
-  async filterPayMethods(payMethods) {
-    payMethods = payMethods.filter((method) => method.status === 1 && method.disable === 0);
-    const walletPassMethod = payMethods.find((method) => method.code === "WALLET_PASS");
-    if (walletPassMethod) {
-      payMethods.forEach((method) => {
-        if (method.code === "PRODUCTVOUCHER" || method.code === "GIFTCARD" || method.code === "POINTCARD") {
-          method.channel_application = walletPassMethod.channel_application;
-        }
-      });
-    } else {
-      payMethods = payMethods.filter((method) => method.code !== "PRODUCTVOUCHER" && method.code !== "GIFTCARD" && method.code !== "POINTCARD");
-    }
-    return payMethods;
-  }
   /**
    * 获取支付方式列表
    */
   async getPayMethodListAsync() {
-    var _a;
     this.logInfo("Starting getPayMethodListAsync");
-    if ((_a = this.payMethodMemoryCache) == null ? void 0 : _a.length) {
-      return this.payMethodMemoryCache;
-    }
-    if (this.payMethodListInFlight) {
-      return this.payMethodListInFlight;
-    }
-    this.payMethodListInFlight = this.loadPayMethodListAsync().finally(() => {
-      this.payMethodListInFlight = null;
-    });
-    return this.payMethodListInFlight;
-  }
-  async loadPayMethodListAsync() {
     try {
-      let cachedMethods = [];
-      try {
-        cachedMethods = await this.dbManager.getAll("pay_method");
-      } catch (dbError) {
-        console.warn("[PaymentModule] pay_method 表不存在，将从服务器获取数据");
-      }
-      const hasCache = cachedMethods.length > 0;
-      if (hasCache) {
-        this.payMethodMemoryCache = cachedMethods;
-        this.refreshPaymentMethodsInBackground(cachedMethods);
-        return cachedMethods;
-      }
-      const response = await this.request.get("/pay/custom-payment/all");
-      response.data = await this.filterPayMethods(response.data);
-      const payMethods = response.data || [];
-      this.payMethodMemoryCache = payMethods;
-      try {
-        for (const method of payMethods) {
-          await this.dbManager.update("pay_method", method);
-        }
-      } catch (dbError) {
-        console.warn("[PaymentModule] 无法缓存支付方式，pay_method 表不存在");
-      }
-      await this.core.effects.emit(
-        `${this.name}:onPaymentMethodsLoaded`,
-        payMethods
-      );
+      const response = await this.request.get("/pay/custom-payment/all", {
+        filterPaymentMethods: true
+      }, {
+        osServer: true
+      });
+      const payMethods = (response == null ? void 0 : response.data) || response || [];
       this.logInfo("getPayMethodListAsync completed successfully", {
         payMethods
       });
@@ -283,98 +232,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       return [];
     }
   }
-  /**
-   * 后台刷新支付方式列表
-   */
-  async refreshPaymentMethodsInBackground(cachedMethods) {
-    if (this.isRefreshingPaymentMethods)
-      return;
-    this.isRefreshingPaymentMethods = true;
-    this.logInfo("Starting refreshPaymentMethodsInBackground", {
-      cachedMethodsCount: cachedMethods.length
-    });
-    try {
-      console.log("[PaymentModule] 后台刷新支付方式列表...");
-      const response = await this.request.get("/pay/custom-payment/all");
-      response.data = await this.filterPayMethods(response.data);
-      const newPayMethods = response.data || [];
-      this.payMethodMemoryCache = newPayMethods;
-      const hasChanges = this.hasPaymentMethodsChanged(
-        cachedMethods,
-        newPayMethods
-      );
-      if (hasChanges) {
-        console.log("[PaymentModule] 支付方式列表已更新");
-        this.logInfo("Payment methods updated in background", {
-          oldCount: cachedMethods.length,
-          newCount: newPayMethods.length
-        });
-        try {
-          for (const method of cachedMethods) {
-            await this.dbManager.delete("pay_method", method.id);
-          }
-          for (const method of newPayMethods) {
-            await this.dbManager.update("pay_method", method);
-          }
-        } catch (dbError) {
-          console.warn("[PaymentModule] 无法更新支付方式缓存", dbError);
-        }
-        const eventData = {
-          oldMethods: cachedMethods,
-          newMethods: newPayMethods
-        };
-        await this.core.effects.emit(
-          `${this.name}:onPaymentMethodsChanged`,
-          eventData
-        );
-      } else {
-        console.log("[PaymentModule] 支付方式列表无变化");
-      }
-    } catch (error) {
-      console.error("[PaymentModule] 后台刷新支付方式失败", error);
-    } finally {
-      this.isRefreshingPaymentMethods = false;
-    }
-  }
-  /**
-   * 检查支付方式列表是否有变化
-   */
-  hasPaymentMethodsChanged(oldMethods, newMethods) {
-    if (oldMethods.length !== newMethods.length) {
-      return true;
-    }
-    const oldMethodsMap = new Map(
-      oldMethods.map((method) => [method.id, method])
-    );
-    for (const newMethod of newMethods) {
-      const oldMethod = oldMethodsMap.get(newMethod.id);
-      if (!oldMethod) {
-        return true;
-      }
-      if (oldMethod.code !== newMethod.code || oldMethod.name !== newMethod.name || oldMethod.type !== newMethod.type || oldMethod.description !== newMethod.description || oldMethod.status !== newMethod.status || oldMethod.disable !== newMethod.disable || oldMethod.is_surcharge !== newMethod.is_surcharge || oldMethod.fixed !== newMethod.fixed || oldMethod.percentage !== newMethod.percentage || oldMethod.enabled !== newMethod.enabled || JSON.stringify(oldMethod.channel_application || []) !== JSON.stringify(newMethod.channel_application || []) || JSON.stringify(oldMethod.companies || []) !== JSON.stringify(newMethod.companies || []) || JSON.stringify(oldMethod.metadata || {}) !== JSON.stringify(newMethod.metadata || {})) {
-        console.log(`[PaymentModule] 支付方式 ${newMethod.id} (${newMethod.code}) 发生变化:`, {
-          id: newMethod.id,
-          changes: {
-            code: oldMethod.code !== newMethod.code ? { old: oldMethod.code, new: newMethod.code } : void 0,
-            name: oldMethod.name !== newMethod.name ? { old: oldMethod.name, new: newMethod.name } : void 0,
-            type: oldMethod.type !== newMethod.type ? { old: oldMethod.type, new: newMethod.type } : void 0,
-            description: oldMethod.description !== newMethod.description ? { old: oldMethod.description, new: newMethod.description } : void 0,
-            status: oldMethod.status !== newMethod.status ? { old: oldMethod.status, new: newMethod.status } : void 0,
-            disable: oldMethod.disable !== newMethod.disable ? { old: oldMethod.disable, new: newMethod.disable } : void 0,
-            is_surcharge: oldMethod.is_surcharge !== newMethod.is_surcharge ? { old: oldMethod.is_surcharge, new: newMethod.is_surcharge } : void 0,
-            fixed: oldMethod.fixed !== newMethod.fixed ? { old: oldMethod.fixed, new: newMethod.fixed } : void 0,
-            percentage: oldMethod.percentage !== newMethod.percentage ? { old: oldMethod.percentage, new: newMethod.percentage } : void 0,
-            enabled: oldMethod.enabled !== newMethod.enabled ? { old: oldMethod.enabled, new: newMethod.enabled } : void 0,
-            channel_application: JSON.stringify(oldMethod.channel_application || []) !== JSON.stringify(newMethod.channel_application || []) ? { old: oldMethod.channel_application, new: newMethod.channel_application } : void 0,
-            companies: JSON.stringify(oldMethod.companies || []) !== JSON.stringify(newMethod.companies || []) ? { old: oldMethod.companies, new: newMethod.companies } : void 0,
-            metadata: JSON.stringify(oldMethod.metadata || {}) !== JSON.stringify(newMethod.metadata || {}) ? { old: oldMethod.metadata, new: newMethod.metadata } : void 0
-          }
-        });
-        return true;
-      }
-    }
-    return false;
-  }
   /**
    * 获取订单列表
    */

package/lib/plugins/request.d.ts

@@ -69,6 +69,7 @@ export interface RequestOptions {
     customToast?: () => void;
     cache?: CacheProps;
     osServer?: boolean;
+    prefix?: boolean;
     callback?: (res: any) => void;
     subscriberId?: string;
 }

package/lib/server/index.d.ts

@@ -4,6 +4,7 @@ import { QuotationModule } from './modules/quotation';
 import { ScheduleModuleEx } from './modules/schedule';
 import { ResourceModule } from './modules/resource';
 import { FloorPlanModule } from './modules/floor-plan';
+import { PaymentServerModule } from './modules/payment';
 import { PisellCore, ServerModuleConfig, InitializeServerOptions } from '../types';
 import type { RouteHandler, HttpMethod, RouteDefinition, Router, ModuleRegistryConfig, RequestSetting } from './types';
 import { OrderModule } from './modules/order';
@@ -23,6 +24,9 @@ declare class Server {
     resource?: ResourceModule;
     order?: OrderModule;
     floor_plan?: FloorPlanModule;
+    payment?: PaymentServerModule;
+    private paymentRouteModule?;
+    private paymentRouteModuleInFlight?;
     /** GET 前缀路由（最长前缀优先匹配） */
     private prefixRouterGet;
     router: Router;
@@ -167,6 +171,8 @@ declare class Server {
      * @private
      */
     private registerServerRoutes;
+    private getPaymentRouteModule;
+    private handlePaymentMethods;
     /**
      * 根据 subscriberId 移除商品查询订阅者
      */