@pisell/pisellos 2.3.21 → 2.3.23

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

@@ -1,3 +1,4 @@
+import type { Discount } from '../../modules/Discount/types';
 import { OrderModule, ProductList, QuotationModule, SalesSummaryModule, ScanOrderLoggerModule as BaseSalesLoggerModule, ScheduleModule } from '../../modules';
 import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderConfig as BaseSalesLoggerProviderConfig, ScanOrderLoggerProviderType as BaseSalesLoggerProviderType } from '../../modules/ScanOrderLogger/types';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
@@ -383,9 +384,11 @@ export interface BaseSalesLoggerRuntimeConfig {
 }
 export interface BaseSalesAddLogParams extends BaseSalesLogInput {
 }
-/** BaseSales.scanPromotionCode 对外的轻量结果（不含 discountList，UI 在 resolve 后调 getDiscountList） */
+/** BaseSales.scanPromotionCode 对外的轻量结果（UI 可用 getDiscountList 或 scannedDiscountList 补 Holder） */
 export interface BaseSalesScanCodeResult {
     isAvailable: boolean;
     type?: 'server' | string;
     unavailableReason?: 'time_limit' | string;
+    /** batchSearch 原始结果；isAvailable=false 时 discountList 可能未写入 store，Holder 补全需读此字段 */
+    scannedDiscountList?: Discount[];
 }

package/dist/solution/BaseSales/types.js

@@ -37,4 +37,4 @@ export function createBaseSalesHook(moduleName, hookName) {
 
 /** `/order/resource/occupy-detail` 单条 `occupy_details[i]` */
 
-/** BaseSales.scanPromotionCode 对外的轻量结果（不含 discountList，UI 在 resolve 后调 getDiscountList） */
+/** BaseSales.scanPromotionCode 对外的轻量结果（UI 可用 getDiscountList 或 scannedDiscountList 补 Holder） */

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -30,6 +30,17 @@ function toPriceString(value) {
   if (!Number.isFinite(parsedValue)) return fallback;
   return parsedValue.toFixed(2);
 }
+function isBlankValue(value) {
+  return value === undefined || value === null || typeof value === 'string' && value.trim() === '';
+}
+function firstNonBlank() {
+  for (var _len = arguments.length, values = new Array(_len), _key = 0; _key < _len; _key++) {
+    values[_key] = arguments[_key];
+  }
+  return values.find(function (value) {
+    return !isBlankValue(value);
+  });
+}
 function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems)) return [];
   return optionItems.map(function (optionItem) {
@@ -199,7 +210,7 @@ export function transformBaseProductToOrderProduct(params) {
     metadata: metadata,
     note: payload.note != null ? String(payload.note) : '',
     product_title: productTitle,
-    product_cover: sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.cover,
+    product_cover: firstNonBlank(matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.cover, sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.cover),
     _origin: _objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
       callbackData: payload
     })

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -358,7 +358,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/BookingTicket/index.js

@@ -1,8 +1,8 @@
 var _excluded = ["id"],
   _excluded2 = ["product_id"],
   _excluded3 = ["product_id"];
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
@@ -549,7 +549,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "scanPromotionCode",
     value: function () {
       var _scanPromotionCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(code, customerId) {
-        var raw;
+        var raw, scannedList, extractedCustomerId, hasOrderCustomer;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -563,26 +563,34 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               return this.store.order.scanCode(code, customerId);
             case 4:
               raw = _context7.sent;
-              if (!raw.isAvailable) {
+              scannedList = raw.scannedDiscountList || [];
+              extractedCustomerId = this.getDiscountCustomerId(scannedList);
+              hasOrderCustomer = Boolean(this.store.order.getOrderCustomer()); // 缺 Holder 等场景 isAvailable=false，但仍需把 Pass 归属客户带入订单，供 Holder 弹窗使用。
+              if (!(!hasOrderCustomer && extractedCustomerId)) {
                 _context7.next = 11;
                 break;
               }
-              _context7.next = 8;
-              return this.hydrateOrderCustomerFromScanDiscounts(raw.scannedDiscountList || []);
-            case 8:
-              _context7.next = 10;
+              _context7.next = 11;
+              return this.hydrateOrderCustomerFromScanDiscounts(scannedList);
+            case 11:
+              if (!raw.isAvailable) {
+                _context7.next = 15;
+                break;
+              }
+              _context7.next = 14;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 10:
+            case 14:
               this.store.order.persistTempOrder();
-            case 11:
+            case 15:
               return _context7.abrupt("return", {
                 isAvailable: raw.isAvailable,
                 type: raw.type,
-                unavailableReason: raw.unavailableReason
+                unavailableReason: raw.unavailableReason,
+                scannedDiscountList: raw.scannedDiscountList
               });
-            case 12:
+            case 16:
             case "end":
               return _context7.stop();
           }
@@ -641,12 +649,22 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "getDiscountCustomerId",
     value: function getDiscountCustomerId(discounts) {
-      var discount = discounts.find(function (item) {
-        return item.customer_id != null;
-      });
-      var customerId = Number(discount === null || discount === void 0 ? void 0 : discount.customer_id);
-      if (!Number.isFinite(customerId) || customerId <= 0) return null;
-      return customerId;
+      var _iterator = _createForOfIteratorHelper(discounts),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var item = _step.value;
+          var topLevelId = Number(item.customer_id);
+          if (Number.isFinite(topLevelId) && topLevelId > 0) {
+            return topLevelId;
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return null;
     }
   }, {
     key: "resolveCustomerByDiscountCustomerId",
@@ -2468,7 +2486,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       var _addAddTimeProductsToBooking = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(input) {
         var _this7 = this,
           _input$bookingPatch;
-        var bookingUid, orderLines, coveredMinutes, bookingTimePatch, result, _iterator, _step, line;
+        var bookingUid, orderLines, coveredMinutes, bookingTimePatch, result, _iterator2, _step2, line;
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
@@ -2508,15 +2526,15 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               }));
             case 11:
               result = [];
-              _iterator = _createForOfIteratorHelper(orderLines);
+              _iterator2 = _createForOfIteratorHelper(orderLines);
               _context30.prev = 13;
-              _iterator.s();
+              _iterator2.s();
             case 15:
-              if ((_step = _iterator.n()).done) {
+              if ((_step2 = _iterator2.n()).done) {
                 _context30.next = 29;
                 break;
               }
-              line = _step.value;
+              line = _step2.value;
               _context30.t0 = result.splice;
               _context30.t1 = result;
               _context30.t2 = [0, result.length];
@@ -2537,10 +2555,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case 31:
               _context30.prev = 31;
               _context30.t7 = _context30["catch"](13);
-              _iterator.e(_context30.t7);
+              _iterator2.e(_context30.t7);
             case 34:
               _context30.prev = 34;
-              _iterator.f();
+              _iterator2.f();
               return _context30.finish(34);
             case 37:
               return _context30.abrupt("return", result);

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

@@ -276,6 +276,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     private buildTempOrderCustomer;
     private isCustomerBoundDiscount;
+    private shouldKeepCustomerBoundDiscountAfterCustomerChange;
     private productHasCustomerBoundDiscount;
     private shouldSkipDiscountCalculation;
     private clearCustomerBoundDiscounts;
@@ -463,7 +464,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: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -445,9 +445,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       ...orderId ? { order_id: orderId } : {}
     }));
     if (discountList) {
-      const currentEditDiscounts = (((_c = this.store.discount) == null ? void 0 : _c.getDiscountList()) || []).filter((discount) => discount == null ? void 0 : discount.isEditMode);
+      const currentDiscountList = ((_c = this.store.discount) == null ? void 0 : _c.getDiscountList()) || [];
+      const currentEditDiscounts = currentDiscountList.filter((discount) => discount == null ? void 0 : discount.isEditMode);
+      const currentScanDiscounts = currentDiscountList.filter((discount) => discount == null ? void 0 : discount.isScan);
+      const currentScanDiscountIds = new Set(
+        currentScanDiscounts.map((discount) => discount == null ? void 0 : discount.id)
+      );
       const runtimeDiscountIds = /* @__PURE__ */ new Set();
       const runtimeDiscounts = discountList.filter((discount) => {
+        if (currentScanDiscountIds.has(discount == null ? void 0 : discount.id))
+          return false;
         if (runtimeDiscountIds.has(discount == null ? void 0 : discount.id))
           return false;
         runtimeDiscountIds.add(discount == null ? void 0 : discount.id);
@@ -455,6 +462,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       });
       const mergedDiscountList = [
         ...currentEditDiscounts,
+        ...currentScanDiscounts,
         ...runtimeDiscounts
       ];
       await ((_d = this.store.discount) == null ? void 0 : _d.setOriginalDiscountList(mergedDiscountList));
@@ -2214,6 +2222,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const type = (discount == null ? void 0 : discount.type) ?? (discount == null ? void 0 : discount.tag);
     return type === "good_pass" || type === "discount_card" || type === "product_discount_card";
   }
+  shouldKeepCustomerBoundDiscountAfterCustomerChange(discount) {
+    return Boolean((discount == null ? void 0 : discount.isScan) || (discount == null ? void 0 : discount.isEditMode));
+  }
   productHasCustomerBoundDiscount(product) {
     if (((product == null ? void 0 : product.discount_list) || []).some((discount) => this.isCustomerBoundDiscount(discount))) {
       return true;
@@ -2269,12 +2280,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const currentDiscounts = ((_a = discountModule.getDiscountList) == null ? void 0 : _a.call(discountModule)) || [];
     const currentOriginalDiscounts = ((_b = discountModule.getOriginalDiscountList) == null ? void 0 : _b.call(discountModule)) || [];
     const nextDiscounts = currentDiscounts.filter((discount) => {
-      if (discount == null ? void 0 : discount.isEditMode)
+      if (this.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount))
         return true;
       return !this.isCustomerBoundDiscount(discount);
     });
     const nextOriginalDiscounts = currentOriginalDiscounts.filter((discount) => {
-      if (discount == null ? void 0 : discount.isEditMode)
+      if (this.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount))
         return true;
       return !this.isCustomerBoundDiscount(discount);
     });
@@ -2986,6 +2997,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return bundle;
       return {
         ...bundle,
+        ...(bundle.cover === void 0 || bundle.cover === null || bundle.cover === "") && previous.cover !== void 0 && previous.cover !== null && previous.cover !== "" ? { cover: previous.cover } : {},
         price: previous.price,
         custom_price: previous.custom_price,
         bundle_payment_price: previous.bundle_payment_price,

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

@@ -67,8 +67,8 @@ export declare function sumOptionUnitPrice(options?: Array<{
 /**
  * 仅基于 tempOrder.products 重算整单定金。
  *
- * 对齐 Checkout relation_products 分支：商品定金先按商品规则计算，
- * 再扣减商品券/折扣卡抵扣金额；tempOrder.bookings 不参与这里的计算。
+ * 商品折扣在进入定金计算前已体现在商品行价格字段中，
+ * 因此这里只按商品定金规则汇总，不再扣减 discount_list；tempOrder.bookings 不参与这里的计算。
  */
 export declare function calculateOrderProductsDeposit(products?: OrderProduct[], options?: {
     productsByUid?: Record<string, Record<string, any>>;

package/lib/modules/Order/utils.js

@@ -286,9 +286,6 @@ function calculateOrderProductsDeposit(products = [], options) {
     if (!(deposit == null ? void 0 : deposit.total) || Number(deposit.total) <= 0)
       continue;
     total = total.plus(deposit.total);
-    for (const discount of product.discount_list || []) {
-      total = total.minus((discount == null ? void 0 : discount.amount) || 0);
-    }
     for (const protocol of deposit.protocols || []) {
       if (!protocolMap.has(protocol.id))
         protocolMap.set(protocol.id, protocol);
@@ -495,13 +492,17 @@ function createDefaultOrderRulesHooks() {
       const current = currentByIdentity.get(getBundleIdentity(bundle));
       if (!current)
         return bundle;
+      const bundleWithDisplayFields = {
+        ...bundle,
+        ...isEmptyOrderProductDisplayValue(bundle.cover) && !isEmptyOrderProductDisplayValue(current.cover) ? { cover: current.cover } : {}
+      };
       const isProductPriceBundle = (bundle.price_type_ext ?? current.price_type_ext) === "product_price";
       if (!isProductPriceBundle)
-        return bundle;
+        return bundleWithDisplayFields;
       const sourcePrice = current.price ?? current.custom_price ?? current.original_price ?? current.bundle_selling_price;
       const originalPrice = current.original_price ?? current.product_price ?? current.price ?? current.custom_price ?? sourcePrice;
       return {
-        ...bundle,
+        ...bundleWithDisplayFields,
         ...sourcePrice !== void 0 ? { price: sourcePrice } : {},
         ...originalPrice !== void 0 ? { original_price: originalPrice } : {},
         ...current.original_total !== void 0 ? { original_total: current.original_total } : {}
@@ -745,6 +746,7 @@ function formatSubmitBundleItems(bundle) {
       bundle_group_id: (rawBundle == null ? void 0 : rawBundle.bundle_group_id) ?? (rawBundle == null ? void 0 : rawBundle.group_id),
       bundle_id: (rawBundle == null ? void 0 : rawBundle.bundle_id) ?? (rawBundle == null ? void 0 : rawBundle.id),
       bundle_product_id: (rawBundle == null ? void 0 : rawBundle.bundle_product_id) ?? (rawBundle == null ? void 0 : rawBundle._bundle_product_id),
+      cover: rawBundle.cover,
       metadata: {
         ...submitMetadata,
         ...hasSubmitBundleDiscounts && bundleMapId !== void 0 ? { custom_product_bundle_map_id: bundleMapId } : {},

package/lib/server/index.d.ts

@@ -448,6 +448,7 @@ declare class Server {
     private collectSalesDetailProductIds;
     private buildSalesDetailProductSnapshotMap;
     private withProductCatalogSnapshots;
+    private withBundleCatalogSnapshots;
     private withSalesDetailProductSnapshots;
     private withPendingSyncProductTitles;
     private buildProductTitleSnapshot;

package/lib/server/index.js

@@ -3236,13 +3236,20 @@ var Server = class {
   collectSalesDetailProductIds(order) {
     const products = Array.isArray(order == null ? void 0 : order.products) ? order.products : [];
     const productIds = /* @__PURE__ */ new Set();
-    products.forEach((product) => {
-      const rawProductId = (product == null ? void 0 : product.product_id) ?? (product == null ? void 0 : product.id);
+    const addProductId = (rawProductId) => {
       if (rawProductId === void 0 || rawProductId === null || rawProductId === "")
         return;
       const productId = Number(rawProductId);
       if (Number.isFinite(productId))
         productIds.add(productId);
+    };
+    products.forEach((product) => {
+      addProductId((product == null ? void 0 : product.product_id) ?? (product == null ? void 0 : product.id));
+      if (Array.isArray(product == null ? void 0 : product.product_bundle)) {
+        product.product_bundle.forEach((bundle) => {
+          addProductId((bundle == null ? void 0 : bundle.bundle_product_id) ?? (bundle == null ? void 0 : bundle._bundle_product_id) ?? (bundle == null ? void 0 : bundle.product_id));
+        });
+      }
     });
     return Array.from(productIds);
   }
@@ -3290,6 +3297,36 @@ var Server = class {
       } : {}
     };
   }
+  withBundleCatalogSnapshots(product, snapshotMap) {
+    if (!Array.isArray(product == null ? void 0 : product.product_bundle))
+      return product;
+    let hasChanged = false;
+    const productBundle = product.product_bundle.map((bundle) => {
+      if (!bundle || typeof bundle !== "object")
+        return bundle;
+      const rawProductId = (bundle == null ? void 0 : bundle.bundle_product_id) ?? (bundle == null ? void 0 : bundle._bundle_product_id) ?? (bundle == null ? void 0 : bundle.product_id);
+      if (rawProductId === void 0 || rawProductId === null || rawProductId === "")
+        return bundle;
+      const productId = Number(rawProductId);
+      if (!Number.isFinite(productId))
+        return bundle;
+      const snapshot = snapshotMap[String(productId)];
+      const shouldFillCover = (bundle.cover === void 0 || bundle.cover === null || bundle.cover === "") && (snapshot == null ? void 0 : snapshot.cover) !== void 0 && snapshot.cover !== null && snapshot.cover !== "";
+      if (!shouldFillCover)
+        return bundle;
+      hasChanged = true;
+      return {
+        ...bundle,
+        cover: snapshot.cover
+      };
+    });
+    if (!hasChanged)
+      return product;
+    return {
+      ...product,
+      product_bundle: productBundle
+    };
+  }
   async withSalesDetailProductSnapshots(order) {
     const products = Array.isArray(order == null ? void 0 : order.products) ? order.products : null;
     if (!(products == null ? void 0 : products.length))
@@ -3299,7 +3336,8 @@ var Server = class {
       return order;
     let hasChanged = false;
     const enrichedProducts = products.map((product) => {
-      const nextProduct = this.withProductCatalogSnapshots(product, snapshotMap);
+      const productWithBundleSnapshots = this.withBundleCatalogSnapshots(product, snapshotMap);
+      const nextProduct = this.withProductCatalogSnapshots(productWithBundleSnapshots, snapshotMap);
       if (nextProduct !== product)
         hasChanged = true;
       return nextProduct;

package/lib/server/modules/order/types.d.ts

@@ -63,6 +63,8 @@ export interface OrderProductBundleItem {
     bundle_group_id?: number;
     /** 套餐商品 ID */
     bundle_id?: number;
+    /** 套餐子商品封面图 */
+    cover?: string | null;
     /** 套餐商品规格 ID */
     bundle_variant_id?: number;
     /** 数量 */

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

@@ -52,6 +52,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private salesDetailLoadInFlight;
     private serverOrderChangeUnsubscribe;
     private serverOrderChangeHydrateInFlight;
+    private serverOrderChangeSyncEnabled;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -73,6 +74,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      */
     private logError;
     private isCurrentSalesOrderRecord;
+    setServerOrderChangeSyncEnabled(enabled: boolean): void;
     private syncCurrentSalesDetailFromServerOrderChange;
     private registerServerOrderChangeSync;
     private hydrateOrderPaymentNames;
@@ -191,6 +193,16 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         discountList: Discount[];
     }>;
     getDiscountList(): Discount[];
+    /** 读取 Discount 模块原始券列表（未经过 bookingTime 等过滤）。 */
+    getOriginalDiscountList(): Discount[];
+    /**
+     * 同步写入 Discount 模块的 discountList / originalDiscountList。
+     * 供 Holder 补全等场景在 OS store 层更新 machinecode holder 字段。
+     */
+    replaceDiscountStoreLists(params: {
+        discountList: Discount[];
+        originalDiscountList?: Discount[];
+    }): Promise<void>;
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     setDiscountSelected(params: {
         discountId: number;

package/lib/solution/BaseSales/index.js

@@ -193,6 +193,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.salesDetailLoadInFlight = false;
     this.serverOrderChangeUnsubscribe = null;
     this.serverOrderChangeHydrateInFlight = null;
+    this.serverOrderChangeSyncEnabled = false;
   }
   /**
    * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -266,9 +267,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     ].filter(Boolean);
     return currentRecords.some((record) => isSameBaseSalesOrderRecord(record, order));
   }
+  setServerOrderChangeSyncEnabled(enabled) {
+    this.serverOrderChangeSyncEnabled = enabled;
+  }
   async syncCurrentSalesDetailFromServerOrderChange(payload) {
     const changedOrders = Array.isArray(payload) ? payload : Array.isArray(payload == null ? void 0 : payload.changedOrders) ? payload.changedOrders : (payload == null ? void 0 : payload.data) && typeof payload.data === "object" ? [payload.data] : [];
-    if (this.salesDetailLoadInFlight || this.serverOrderChangeHydrateInFlight)
+    if (!this.serverOrderChangeSyncEnabled || this.salesDetailLoadInFlight || this.serverOrderChangeHydrateInFlight)
       return;
     const changedOrder = changedOrders.find(
       (order) => this.isCurrentSalesOrderRecord(order)
@@ -1305,6 +1309,30 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       return [];
     return this.store.order.getDiscountList();
   }
+  /** 读取 Discount 模块原始券列表（未经过 bookingTime 等过滤）。 */
+  getOriginalDiscountList() {
+    var _a, _b;
+    if (!this.store.order)
+      return [];
+    const discountModule = (_a = this.store.order.store) == null ? void 0 : _a.discount;
+    return ((_b = discountModule == null ? void 0 : discountModule.getOriginalDiscountList) == null ? void 0 : _b.call(discountModule)) || [];
+  }
+  /**
+   * 同步写入 Discount 模块的 discountList / originalDiscountList。
+   * 供 Holder 补全等场景在 OS store 层更新 machinecode holder 字段。
+   */
+  async replaceDiscountStoreLists(params) {
+    var _a;
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    const discountModule = (_a = this.store.order.store) == null ? void 0 : _a.discount;
+    if (!discountModule)
+      return;
+    if (params.originalDiscountList) {
+      await discountModule.setOriginalDiscountList(params.originalDiscountList);
+    }
+    await discountModule.setDiscountList(params.discountList);
+  }
   async scanPromotionCode(code, customerId) {
     try {
       if (!this.store.order)
@@ -1317,7 +1345,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       return {
         isAvailable: raw.isAvailable,
         type: raw.type,
-        unavailableReason: raw.unavailableReason
+        unavailableReason: raw.unavailableReason,
+        scannedDiscountList: raw.scannedDiscountList
       };
     } catch (error) {
       throw error;

package/lib/solution/BaseSales/types.d.ts

@@ -1,3 +1,4 @@
+import type { Discount } from '../../modules/Discount/types';
 import { OrderModule, ProductList, QuotationModule, SalesSummaryModule, ScanOrderLoggerModule as BaseSalesLoggerModule, ScheduleModule } from '../../modules';
 import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderConfig as BaseSalesLoggerProviderConfig, ScanOrderLoggerProviderType as BaseSalesLoggerProviderType } from '../../modules/ScanOrderLogger/types';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
@@ -383,9 +384,11 @@ export interface BaseSalesLoggerRuntimeConfig {
 }
 export interface BaseSalesAddLogParams extends BaseSalesLogInput {
 }
-/** BaseSales.scanPromotionCode 对外的轻量结果（不含 discountList，UI 在 resolve 后调 getDiscountList） */
+/** BaseSales.scanPromotionCode 对外的轻量结果（UI 可用 getDiscountList 或 scannedDiscountList 补 Holder） */
 export interface BaseSalesScanCodeResult {
     isAvailable: boolean;
     type?: 'server' | string;
     unavailableReason?: 'time_limit' | string;
+    /** batchSearch 原始结果；isAvailable=false 时 discountList 可能未写入 store，Holder 补全需读此字段 */
+    scannedDiscountList?: Discount[];
 }

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -50,6 +50,12 @@ function toPriceString(value, fallback = "0.00") {
     return fallback;
   return parsedValue.toFixed(2);
 }
+function isBlankValue(value) {
+  return value === void 0 || value === null || typeof value === "string" && value.trim() === "";
+}
+function firstNonBlank(...values) {
+  return values.find((value) => !isBlankValue(value));
+}
 function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems))
     return [];
@@ -237,7 +243,7 @@ function transformBaseProductToOrderProduct(params) {
     metadata,
     note: payload.note != null ? String(payload.note) : "",
     product_title: productTitle,
-    product_cover: sourceProduct == null ? void 0 : sourceProduct.cover,
+    product_cover: firstNonBlank(matchedVariant == null ? void 0 : matchedVariant.cover, sourceProduct == null ? void 0 : sourceProduct.cover),
     _origin: {
       ...sourceProduct || {},
       callbackData: payload

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -358,7 +358,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *