@pisell/pisellos 2.3.18 → 2.3.20

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

@@ -84,7 +84,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         unavailableReasonKey?: string | null;
         scannedDiscountList?: Discount[];
     }>;
-    applyDiscount(): void;
+    applyDiscount(options?: {
+        reapplyBookingDiscountProductUids?: string[];
+    }): void;
     /**
      * 注入促销评估器。
      *
@@ -461,7 +463,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     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/dist/modules/Order/index.js

@@ -6,12 +6,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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); }); }; }
-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 _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 _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 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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _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; }
@@ -158,9 +158,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               };
               var existed = discountMap.get(key);
               if (existed) {
+                var _existed$limited_rela;
                 existed.amount = Number(existed.amount || 0) + amount;
                 existed.used_par_value = String(Number(existed.used_par_value || 0) + amount);
                 existed.balance = String(Number(existed.balance || 0) + amount);
+                var productIds = Array.isArray((_existed$limited_rela = existed.limited_relation_product_data) === null || _existed$limited_rela === void 0 ? void 0 : _existed$limited_rela.product_ids) ? existed.limited_relation_product_data.product_ids : [];
+                if ((product === null || product === void 0 ? void 0 : product.product_id) !== undefined && (product === null || product === void 0 ? void 0 : product.product_id) !== null && !productIds.includes(product.product_id)) {
+                  existed.limited_relation_product_data = _objectSpread(_objectSpread({}, existed.limited_relation_product_data || {}), {}, {
+                    product_ids: [].concat(_toConsumableArray(productIds), [product.product_id])
+                  });
+                }
                 existed.applicableProductDetails = [].concat(_toConsumableArray(existed.applicableProductDetails || []), [detail]);
                 existed.appliedProductDetails = [].concat(_toConsumableArray(existed.appliedProductDetails || []), [detail]);
                 continue;
@@ -702,7 +709,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     }()
   }, {
     key: "applyDiscount",
-    value: function applyDiscount() {
+    value: function applyDiscount(options) {
       var _this$store$discount9,
         _tempOrder$holder2,
         _this$store$summary2,
@@ -728,6 +735,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           return resolveIsFormSubject(tempOrder, product);
         },
         orderTotalAmount: Number(((_this$store$summary2 = this.store.summary) === null || _this$store$summary2 === void 0 ? void 0 : _this$store$summary2.total_amount) || 0)
+      }, {
+        reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids
       });
       if (result !== null && result !== void 0 && result.productList) {
         var previousProductsByUid = indexOrderProductsByUid(tempOrder.products);
@@ -3908,7 +3917,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyOrderProductUpdateToTempOrder",
     value: function applyOrderProductUpdateToTempOrder(tempOrder, params) {
-      var _targetProduct$metada2, _product_sku, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _metadata7, _nextProduct$metadata, _targetProduct$metada8, _tempOrder$products$p;
+      var _targetProduct$metada2, _product_sku, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _metadata7, _nextProduct$metadata, _targetProduct$metada8, _tempOrder$products$p, _tempOrder$products$p2;
       var product_id = params.product_id,
         product_variant_id = params.product_variant_id,
         updates = params.updates,
@@ -4039,21 +4048,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.products[productIndex] = normalizedProduct;
       this.syncTempOrderHolderFromBookings(tempOrder);
       this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], (_tempOrder$products$p = tempOrder.products[productIndex].metadata) === null || _tempOrder$products$p === void 0 ? void 0 : _tempOrder$products$p.unique_identification_number);
+      return (_tempOrder$products$p2 = tempOrder.products[productIndex].metadata) === null || _tempOrder$products$p2 === void 0 ? void 0 : _tempOrder$products$p2.unique_identification_number;
     }
   }, {
     key: "updateOrderProduct",
     value: function () {
       var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(params) {
-        var tempOrder;
+        var tempOrder, updatedProductUid;
         return _regeneratorRuntime().wrap(function _callee19$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
-              this.applyOrderProductUpdateToTempOrder(tempOrder, params);
+              updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
               _context21.next = 4;
               return this.applyPromotion();
             case 4:
-              this.applyDiscount();
+              this.applyDiscount({
+                reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : undefined
+              });
               this.sanitizeTempOrderProducts(tempOrder);
               _context21.next = 8;
               return this.recalculateSummary({
@@ -4081,7 +4093,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(paramsList) {
         var _this24 = this;
-        var tempOrder;
+        var tempOrder, reapplyBookingDiscountProductUids;
         return _regeneratorRuntime().wrap(function _callee20$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
@@ -4092,11 +4104,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context22.abrupt("return", tempOrder.products);
             case 3:
-              paramsList.forEach(function (params) {
-                _this24.applyOrderProductUpdateToTempOrder(tempOrder, params);
-              });
+              reapplyBookingDiscountProductUids = paramsList.reduce(function (acc, params) {
+                var updatedProductUid = _this24.applyOrderProductUpdateToTempOrder(tempOrder, params);
+                // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
+                if (params.allow_booking_discount_reapply && updatedProductUid) {
+                  acc.push(String(updatedProductUid));
+                }
+                return acc;
+              }, []);
               _context22.next = 6;
-              return this.finalizeAfterProductsMutation(tempOrder);
+              return this.finalizeAfterProductsMutation(tempOrder, {
+                reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
+              });
             case 6:
               this.logInfo('updateOrderProduct success', {
                 paramsList: paramsList
@@ -4225,7 +4244,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeAfterProductsMutation",
     value: (function () {
-      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(tempOrder) {
+      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(tempOrder, options) {
         return _regeneratorRuntime().wrap(function _callee22$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
@@ -4233,7 +4252,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context24.next = 3;
               return this.applyPromotion();
             case 3:
-              this.applyDiscount();
+              this.applyDiscount({
+                reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids
+              });
               this.sanitizeTempOrderProducts(tempOrder);
               _context24.next = 7;
               return this.recalculateSummary({
@@ -4247,7 +4268,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee22, this);
       }));
-      function finalizeAfterProductsMutation(_x26) {
+      function finalizeAfterProductsMutation(_x26, _x27) {
         return _finalizeAfterProductsMutation.apply(this, arguments);
       }
       return finalizeAfterProductsMutation;
@@ -4380,7 +4401,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee23, this, [[11, 22, 25, 28]]);
       }));
-      function removeProductsFromOrder(_x27) {
+      function removeProductsFromOrder(_x28) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -4399,7 +4420,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee24, this);
       }));
-      function removeProductFromOrder(_x28) {
+      function removeProductFromOrder(_x29) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -4511,7 +4532,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee26, this);
       }));
-      function applyLocalPrintOrderNumbers(_x29) {
+      function applyLocalPrintOrderNumbers(_x30) {
         return _applyLocalPrintOrderNumbers.apply(this, arguments);
       }
       return applyLocalPrintOrderNumbers;
@@ -4536,7 +4557,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee27, this);
       }));
-      function submitTempOrder(_x30) {
+      function submitTempOrder(_x31) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -4557,7 +4578,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee28, this);
       }));
-      function submitTempOrderAsync(_x31) {
+      function submitTempOrderAsync(_x32) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -4727,7 +4748,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee29, this, [[26, 33]]);
       }));
-      function runSubmitTempOrder(_x32) {
+      function runSubmitTempOrder(_x33) {
         return _runSubmitTempOrder.apply(this, arguments);
       }
       return runSubmitTempOrder;
@@ -4754,7 +4775,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee30, this);
       }));
-      function markLocalOrderSynced(_x33, _x34) {
+      function markLocalOrderSynced(_x34, _x35) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -4886,7 +4907,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee31, this);
       }));
-      function syncPaymentsToOrder(_x35) {
+      function syncPaymentsToOrder(_x36) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -5006,7 +5027,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee32, this);
       }));
-      function submitOrder(_x36) {
+      function submitOrder(_x37) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -5045,7 +5066,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee33, this);
       }));
-      function cancelOrder(_x37) {
+      function cancelOrder(_x38) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -5089,7 +5110,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee34, this);
       }));
-      function changeBookingStatus(_x38) {
+      function changeBookingStatus(_x39) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -5236,7 +5257,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee35, this, [[4, 18]]);
       }));
-      function createOrderByCheckout(_x39) {
+      function createOrderByCheckout(_x40) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -5261,7 +5282,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee36, this);
       }));
-      function submitSalesOrder(_x40) {
+      function submitSalesOrder(_x41) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -5305,7 +5326,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee37, this);
       }));
-      function sendCustomerPayLink(_x41) {
+      function sendCustomerPayLink(_x42) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -5349,7 +5370,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee38, this);
       }));
-      function getSalesOrderByLookup(_x42) {
+      function getSalesOrderByLookup(_x43) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -5421,7 +5442,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee39, this);
       }));
-      function hydrateTempOrderFromRecord(_x43, _x44) {
+      function hydrateTempOrderFromRecord(_x44, _x45) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -5718,7 +5739,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee40, this);
       }));
-      function getOrderInfo(_x45) {
+      function getOrderInfo(_x46) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;

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

@@ -340,6 +340,19 @@ export interface UpdateOrderProductParams {
      * });
      */
     allow_booking_reprice?: boolean;
+    /**
+     * Change time 重报价后，允许当前预约商品行重新应用已选编辑态折扣卡。
+     *
+     * @example
+     * await order.updateOrderProduct({
+     *   product_id: 1,
+     *   product_variant_id: 0,
+     *   updates: { discount_list: [] },
+     *   booking: { duration: 2 },
+     *   allow_booking_discount_reapply: true,
+     * });
+     */
+    allow_booking_discount_reapply?: boolean;
 }
 /** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
 export interface UpdateOrderProductQuantityParams extends OrderProductIdentity {

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -1,8 +1,7 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, UnavailableReason } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, RulesCalcDiscountOptions, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
-import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 import { WindowPlugin } from '../../plugins';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
@@ -45,12 +44,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         }[];
         isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
-    }, options?: {
-        isSelected?: boolean;
-        discountId?: number;
-        selectedList?: SetDiscountSelectedParams[];
-        scan?: boolean;
-    }): DiscountResult;
+    }, options?: RulesCalcDiscountOptions): DiscountResult;
     /**
      * 检查优惠是否符合 PackageSubItemUsageRules 配置
      * @param discount 优惠券

package/dist/modules/Rules/index.js

@@ -335,6 +335,32 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }) && productList.find(function (n) {
         return !n.booking_id;
       });
+      var reapplyBookingDiscountProductUids = new Set(((options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids) || []).filter(function (uid) {
+        return uid !== undefined && uid !== null && uid !== '';
+      }).map(String));
+      var getOriginProductUid = function getOriginProductUid(originProduct) {
+        var _originProduct$metada, _originProduct$metada2;
+        var uid = (_originProduct$metada = originProduct === null || originProduct === void 0 || (_originProduct$metada2 = originProduct.metadata) === null || _originProduct$metada2 === void 0 ? void 0 : _originProduct$metada2.unique_identification_number) !== null && _originProduct$metada !== void 0 ? _originProduct$metada : originProduct === null || originProduct === void 0 ? void 0 : originProduct.unique_identification_number;
+        if (uid === undefined || uid === null || uid === '') return undefined;
+        return String(uid);
+      };
+      var shouldReapplyBookingDiscount = function shouldReapplyBookingDiscount(originProduct, selectedDiscount) {
+        if (!selectedDiscount) return false;
+        var uid = getOriginProductUid(originProduct);
+        if (!uid || !reapplyBookingDiscountProductUids.has(uid)) return false;
+        var discountType = selectedDiscount.tag || selectedDiscount.type;
+        return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ['good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
+      };
+      var resolveReapplyEditModeDiscountPercent = function resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount) {
+        var _discount2;
+        if (!shouldReapplyBookingDiscount(originProduct, selectedDiscount)) return undefined;
+        var discountType = (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.tag) || (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.type);
+        if (discountType !== 'discount_card' && discountType !== 'product_discount_card') {
+          return undefined;
+        }
+        var percent = Number((_discount2 = selectedDiscount.discount) === null || _discount2 === void 0 ? void 0 : _discount2.percent);
+        return Number.isFinite(percent) ? percent : undefined;
+      };
       var editModeDiscount = [];
       var addModeDiscount = [];
       discountList.forEach(function (discount) {
@@ -363,11 +389,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         });
       }
-
-      // 过滤掉手动取消false的优惠券，但仅用于应用优惠逻辑
-      var filteredDiscountList = addModeDiscount.filter(function (discount) {
-        return !discount.isManualSelect;
-      });
       var hasDiscountInput = editModeDiscount.length > 0 || addModeDiscount.length > 0 || Boolean(options === null || options === void 0 ? void 0 : options.discountId) || Boolean(options === null || options === void 0 || (_options$selectedList = options.selectedList) === null || _options$selectedList === void 0 ? void 0 : _options$selectedList.length) || Boolean(options === null || options === void 0 ? void 0 : options.scan);
       if (!hasDiscountInput) {
         return {
@@ -375,6 +396,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           productList: productList
         };
       }
+      var canUseEditModeDiscountForReapply = function canUseEditModeDiscountForReapply(discount) {
+        var discountType = discount.tag || discount.type;
+        return reapplyBookingDiscountProductUids.size > 0 && discount.isEditMode === true && discount.isSelected === true && ['good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
+      };
+
+      // 过滤掉手动取消false的优惠券，但仅用于应用优惠逻辑。
+      // Change time 重报价需要把已选编辑态折扣卡重新放入候选，再由目标 uid 限定作用范围。
+      var filteredDiscountList = [].concat(_toConsumableArray(addModeDiscount.filter(function (discount) {
+        return !discount.isManualSelect;
+      })), _toConsumableArray(editModeDiscount.filter(canUseEditModeDiscountForReapply)));
 
       // 🔥 扁平化商品列表：将 bundle 子商品展开为虚拟商品
       var flattenProductsWithBundle = function flattenProductsWithBundle(productList) {
@@ -1056,7 +1087,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _product$discount_lis3, _product$discount_lis4;
           // 🔥 检查策略可用性（针对 good_pass 和折扣卡）
           var discountType = discount.tag || discount.type;
-          if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType)) {
+          var currentOriginUid = getOriginProductUid(originProduct);
+          var isReapplyEditModeDiscountForProduct = discount.isEditMode && reapplyBookingDiscountProductUids.size > 0 && currentOriginUid && reapplyBookingDiscountProductUids.has(String(currentOriginUid)) && discount.isSelected === true;
+          if (discount.isEditMode && reapplyBookingDiscountProductUids.size > 0) {
+            var uid = currentOriginUid;
+            if (!uid || !reapplyBookingDiscountProductUids.has(uid)) return false;
+            if (!discount.isSelected) return false;
+          }
+          if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType) && !isReapplyEditModeDiscountForProduct) {
             var _discount$config2;
             // 如果策略检查后没有config，说明不可用
             if (discount.config === undefined || !(discount !== null && discount !== void 0 && (_discount$config2 = discount.config) !== null && _discount$config2 !== void 0 && _discount$config2.isAvailable)) {
@@ -1284,7 +1322,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           return;
         }
-        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan) && !isEditModeAddNewProduct) {
+        var shouldReapplyBookingDiscountForProduct = shouldReapplyBookingDiscount(originProduct, selectedDiscount);
+        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan) && !isEditModeAddNewProduct && !shouldReapplyBookingDiscountForProduct) {
           return;
         }
 
@@ -1325,7 +1364,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _originProduct4, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2;
+            var _originProduct4, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2, _reapplyDiscountPerce;
             // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
@@ -1363,11 +1402,18 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var productDiscountDifference = void 0;
             var discountedOptions = product.options;
             var optionDiscountAmount = 0;
+            var reapplyDiscountPercent = void 0;
             if (isOrderLevel && productAllocation) {
               // order_level：使用预计算的分摊金额
               amount = productAllocation.discountAmount;
               productDiscountDifference = productAllocation.difference;
               mainProductSellingPrice = Math.max(new Decimal(product.price).minus(amount).toNumber(), 0);
+            } else if (resolveReapplyEditModeDiscountPercent(originProduct, _selectedDiscount) !== undefined) {
+              // Change time 重套编辑态折扣卡时，历史 par_value 不是运行时折扣口径，优先使用后端快照里的 percent。
+              var percent = resolveReapplyEditModeDiscountPercent(originProduct, _selectedDiscount);
+              reapplyDiscountPercent = new Decimal(percent).toFixed(2);
+              mainProductSellingPrice = new Decimal(product.price || 0).mul(new Decimal(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
+              amount = new Decimal(product.price).minus(mainProductSellingPrice).toNumber();
             } else {
               // item_level 或其他类型：使用原有逻辑
               mainProductSellingPrice = getDiscountAmount(_selectedDiscount, product.price, product.price);
@@ -1400,7 +1446,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: _selectedDiscount.format_title,
                 original_amount: product.price,
                 product_id: originProduct.id || originProduct.product_id,
-                percent: _selectedDiscount.par_value,
+                percent: (_reapplyDiscountPerce = reapplyDiscountPercent) !== null && _reapplyDiscountPerce !== void 0 ? _reapplyDiscountPerce : _selectedDiscount.par_value,
                 discount_product_id: _selectedDiscount.product_id
               },
               // 前端使用的num数量，为了计算优惠金额

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

@@ -1,4 +1,5 @@
 import { Discount } from '../Discount/types';
+import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 export declare enum UnavailableReason {
     TimeLimit = "time_limit",
     ProductNotApplicable = "product_not_applicable",
@@ -23,6 +24,14 @@ export interface DiscountResult {
     discountList: any[];
 }
 export type RulesFormSubject = boolean | ((product: any) => boolean);
+export interface RulesCalcDiscountOptions {
+    isSelected?: boolean;
+    discountId?: number;
+    selectedList?: SetDiscountSelectedParams[];
+    scan?: boolean;
+    /** Change time 重报价目标行：允许已选编辑态折扣卡重新应用到这些 booking 商品。 */
+    reapplyBookingDiscountProductUids?: string[];
+}
 export interface RulesModuleAPI {
     setRulesList: (rulesList: Rules[]) => Promise<void>;
     clear: () => Promise<void>;
@@ -34,7 +43,7 @@ export interface RulesModuleAPI {
         }[];
         isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
-    }) => DiscountResult;
+    }, options?: RulesCalcDiscountOptions) => DiscountResult;
 }
 type ProductDetail = {
     isClient?: boolean;

package/dist/server/modules/order/index.js

@@ -448,9 +448,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var appPlugin = this.core.getPlugin('app');
       var app = appPlugin === null || appPlugin === void 0 ? void 0 : appPlugin.getApp();
       if (app) {
-        var _this$store$createdAt;
         var coreData = app.data.store.getStore().getDataByModel('core');
-        if (!((_this$store$createdAt = this.store.createdAtQuery) !== null && _this$store$createdAt !== void 0 && _this$store$createdAt.sales_time_between) && coreData !== null && coreData !== void 0 && coreData.core) {
+        if (coreData !== null && coreData !== void 0 && coreData.core) {
           var today = dayjs();
           if (coreData !== null && coreData !== void 0 && coreData.core.operating_day_boundary) {
             var operatingDayBoundary = coreData.core.operating_day_boundary;

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

@@ -49,6 +49,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private queuedAutoPaymentSync;
     private autoPaymentSyncFlushing;
     private autoPaymentSyncTimer;
+    private salesDetailLoadInFlight;
+    private serverOrderChangeUnsubscribe;
+    private serverOrderChangeHydrateInFlight;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -69,6 +72,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * 记录错误日志
      */
     private logError;
+    private isCurrentSalesOrderRecord;
+    private syncCurrentSalesDetailFromServerOrderChange;
+    private registerServerOrderChangeSync;
     private hydrateOrderPaymentNames;
     get payment(): PaymentModule | undefined;
     private getCurrentOrderCustomerId;