@pisell/pisellos 0.10.69 → 0.10.70

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

@@ -208,8 +208,10 @@ export interface AddAddTimeProductsToBookingInput {
 }
 /** 扫码宿主桥接：SalesSdk 在 pubsub 订阅回调里注入，OS 需要 UI 时直接调用 */
 export interface GlobalScanHostBridge {
-    /** Restrict redemption scans before customer/product side effects. */
-    scanScope?: 'all' | 'product-voucher';
+    /** product-voucher handles voucher codes only; product-voucher-collection also resolves wallet customer vouchers. */
+    scanScope?: 'all' | 'product-voucher' | 'product-voucher-collection';
+    /** A one-shot entry may outlive its page while requests are in flight. */
+    isCurrent?: () => boolean;
     openProductDetail?: (payload: Record<string, any>) => Promise<any | null>;
     openBookingEdit?: (payload: Record<string, any>) => Promise<any | null>;
     confirmDetail?: (input: {
@@ -234,11 +236,13 @@ export interface GlobalScanHostBridge {
      */
     applyPromotionCode?: (code: string, customerId?: number, options?: {
         suppressFailureNotification?: boolean;
+        productVouchersOnly?: boolean;
     }) => Promise<{
         isAvailable?: boolean;
         isAccepted?: boolean;
         type?: string;
         unavailableReason?: string;
+        scannedDiscountList?: Record<string, any>[];
     }>;
     /** 当前订单已有其他客户时，由宿主复用客户组件完成确认及切换。 */
     requestCustomerSwitch?: (customer: ICustomer) => Promise<boolean | null>;
@@ -246,7 +250,7 @@ export interface GlobalScanHostBridge {
     refresh?: () => void;
 }
 /** handleGlobalScanCode 结构化返回 */
-export type GlobalScanHandleResult = {
+export type GlobalScanHandleResult = ({
     status: 'success';
     kind: 'customer' | 'products' | 'promotion';
     meta?: {
@@ -259,5 +263,11 @@ export type GlobalScanHandleResult = {
     status: 'cancelled';
 } | {
     status: 'failed';
-    reason: 'empty_code' | 'not_found' | 'invalid_data' | 'no_bridge';
+    reason: 'empty_code' | 'not_found' | 'invalid_data' | 'no_bridge' | 'entry_resolution_failed';
+}) & {
+    /** product-voucher-collection returns voucher candidates; the caller decides how to use them. */
+    redemption?: {
+        source: 'wallet' | 'scan';
+        vouchers: Record<string, any>[];
+    };
 };

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

@@ -210,7 +210,7 @@ export function applyGlobalScan(_x14, _x15, _x16) {
 }
 function _applyGlobalScan() {
   _applyGlobalScan = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(host, formatted, bridge) {
-    var searchType, data, scanCode, formattedCustomerId, isCrossShopWallet, isWalletPassUnavailableAtStore, _getRealCustomerId, _bridge$onNotify5, currentCustomer, currentCustomerId, _customer, sourceCustomerId, _bridge$onNotify, _bridge$onNotify2, _customerId, _bridge$onNotify3, orderCustomer, switched, _bridge$onNotify4, _promotionResult$isAc, _bridge$onNotify6, snapshot, activeCustomer, bindWalletPassCustomer, trySelectWalletAsset, bindResult, walletSelection, promotionCustomerId, promotionResult, list, _bridge$onNotify12, addedCount, _iterator, _step, _item, outcome, _bridge$onNotify13, _data$order_id, _data$business_code, orderId, _bridge$onNotify14;
+    var searchType, data, scanCode, formattedCustomerId, isCrossShopWallet, isWalletPassUnavailableAtStore, _getRealCustomerId, _bridge$onNotify5, currentCustomer, currentCustomerId, _customer, sourceCustomerId, _bridge$onNotify, _bridge$onNotify2, _customerId, _bridge$onNotify3, orderCustomer, switched, _bridge$onNotify4, _collectionPromotion$, _promotionResult$isAc, _bridge$onNotify6, snapshot, activeCustomer, bindWalletPassCustomer, trySelectWalletAsset, bindResult, collectionPromotion, walletSelection, promotionCustomerId, promotionResult, list, _bridge$onNotify12, addedCount, _iterator, _step, _item, outcome, _bridge$onNotify13, _data$order_id, _data$business_code, orderId, _bridge$onNotify14;
     return _regeneratorRuntime().wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
@@ -321,7 +321,7 @@ function _applyGlobalScan() {
           });
         case 44:
           if (!(searchType === 'walletPass')) {
-            _context6.next = 78;
+            _context6.next = 93;
             break;
           }
           if (!isWalletPassUnavailableAtStore) {
@@ -495,75 +495,111 @@ function _applyGlobalScan() {
           return bindWalletPassCustomer();
         case 54:
           bindResult = _context6.sent;
-          _context6.next = 57;
+          if (!((bridge === null || bridge === void 0 ? void 0 : bridge.scanScope) === 'product-voucher-collection' && bridge.applyPromotionCode)) {
+            _context6.next = 61;
+            break;
+          }
+          _context6.next = 58;
+          return bridge.applyPromotionCode(scanCode, getRealCustomerId(activeCustomer), {
+            suppressFailureNotification: true,
+            productVouchersOnly: true
+          });
+        case 58:
+          _context6.t2 = _context6.sent;
+          _context6.next = 62;
+          break;
+        case 61:
+          _context6.t2 = undefined;
+        case 62:
+          collectionPromotion = _context6.t2;
+          if (!((_collectionPromotion$ = collectionPromotion === null || collectionPromotion === void 0 ? void 0 : collectionPromotion.isAccepted) !== null && _collectionPromotion$ !== void 0 ? _collectionPromotion$ : collectionPromotion === null || collectionPromotion === void 0 ? void 0 : collectionPromotion.isAvailable)) {
+            _context6.next = 65;
+            break;
+          }
+          return _context6.abrupt("return", {
+            status: 'success',
+            kind: 'promotion'
+          });
+        case 65:
+          _context6.next = 67;
           return trySelectWalletAsset();
-        case 57:
+        case 67:
           walletSelection = _context6.sent;
           if (!walletSelection) {
-            _context6.next = 60;
+            _context6.next = 70;
             break;
           }
           return _context6.abrupt("return", walletSelection);
-        case 60:
+        case 70:
           if (bridge !== null && bridge !== void 0 && bridge.applyPromotionCode) {
-            _context6.next = 62;
+            _context6.next = 72;
             break;
           }
           return _context6.abrupt("return", {
             status: 'failed',
             reason: 'no_bridge'
           });
-        case 62:
+        case 72:
           promotionCustomerId = getRealCustomerId(activeCustomer);
+          if (!(collectionPromotion !== null && collectionPromotion !== void 0)) {
+            _context6.next = 77;
+            break;
+          }
+          _context6.t3 = collectionPromotion;
+          _context6.next = 87;
+          break;
+        case 77:
           if (!bindResult.customerBound) {
-            _context6.next = 69;
+            _context6.next = 83;
             break;
           }
-          _context6.next = 66;
+          _context6.next = 80;
           return bridge.applyPromotionCode(scanCode, promotionCustomerId, {
             suppressFailureNotification: true
           });
-        case 66:
-          _context6.t2 = _context6.sent;
-          _context6.next = 72;
+        case 80:
+          _context6.t4 = _context6.sent;
+          _context6.next = 86;
           break;
-        case 69:
-          _context6.next = 71;
+        case 83:
+          _context6.next = 85;
           return bridge.applyPromotionCode(scanCode, promotionCustomerId);
-        case 71:
-          _context6.t2 = _context6.sent;
-        case 72:
-          promotionResult = _context6.t2;
+        case 85:
+          _context6.t4 = _context6.sent;
+        case 86:
+          _context6.t3 = _context6.t4;
+        case 87:
+          promotionResult = _context6.t3;
           if (!((_promotionResult$isAc = promotionResult === null || promotionResult === void 0 ? void 0 : promotionResult.isAccepted) !== null && _promotionResult$isAc !== void 0 ? _promotionResult$isAc : promotionResult === null || promotionResult === void 0 ? void 0 : promotionResult.isAvailable)) {
-            _context6.next = 75;
+            _context6.next = 90;
             break;
           }
           return _context6.abrupt("return", {
             status: 'success',
             kind: 'promotion'
           });
-        case 75:
+        case 90:
           if (!bindResult.customerBound) {
-            _context6.next = 77;
+            _context6.next = 92;
             break;
           }
           return _context6.abrupt("return", {
             status: 'success',
             kind: 'customer'
           });
-        case 77:
+        case 92:
           return _context6.abrupt("return", {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 78:
+        case 93:
           if (!(searchType === 'product' || searchType === 'local_product')) {
-            _context6.next = 111;
+            _context6.next = 126;
             break;
           }
           list = data === null || data === void 0 ? void 0 : data.list;
           if (!(!Array.isArray(list) || list.length === 0)) {
-            _context6.next = 83;
+            _context6.next = 98;
             break;
           }
           bridge === null || bridge === void 0 || (_bridge$onNotify12 = bridge.onNotify) === null || _bridge$onNotify12 === void 0 || _bridge$onNotify12.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
@@ -571,57 +607,57 @@ function _applyGlobalScan() {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 83:
+        case 98:
           addedCount = 0;
           _iterator = _createForOfIteratorHelper(list);
-          _context6.prev = 85;
+          _context6.prev = 100;
           _iterator.s();
-        case 87:
+        case 102:
           if ((_step = _iterator.n()).done) {
-            _context6.next = 99;
+            _context6.next = 114;
             break;
           }
           _item = _step.value;
-          _context6.next = 91;
+          _context6.next = 106;
           return processScannedProductItem(host, _item, scanCode, bridge);
-        case 91:
+        case 106:
           outcome = _context6.sent;
           if (outcome === 'added') {
             addedCount += 1;
           }
           if (!(outcome === 'cancelled')) {
-            _context6.next = 95;
+            _context6.next = 110;
             break;
           }
           return _context6.abrupt("return", {
             status: 'cancelled'
           });
-        case 95:
+        case 110:
           if (!(outcome === 'pending')) {
-            _context6.next = 97;
+            _context6.next = 112;
             break;
           }
           return _context6.abrupt("return", {
             status: 'pending',
             kind: 'requiresDetail'
           });
-        case 97:
-          _context6.next = 87;
+        case 112:
+          _context6.next = 102;
           break;
-        case 99:
-          _context6.next = 104;
+        case 114:
+          _context6.next = 119;
           break;
-        case 101:
-          _context6.prev = 101;
-          _context6.t3 = _context6["catch"](85);
-          _iterator.e(_context6.t3);
-        case 104:
-          _context6.prev = 104;
+        case 116:
+          _context6.prev = 116;
+          _context6.t5 = _context6["catch"](100);
+          _iterator.e(_context6.t5);
+        case 119:
+          _context6.prev = 119;
           _iterator.f();
-          return _context6.finish(104);
-        case 107:
+          return _context6.finish(119);
+        case 122:
           if (!(addedCount > 0)) {
-            _context6.next = 110;
+            _context6.next = 125;
             break;
           }
           bridge === null || bridge === void 0 || (_bridge$onNotify13 = bridge.onNotify) === null || _bridge$onNotify13 === void 0 || _bridge$onNotify13.call(bridge, 'success');
@@ -632,19 +668,19 @@ function _applyGlobalScan() {
               count: addedCount
             }
           });
-        case 110:
+        case 125:
           return _context6.abrupt("return", {
             status: 'failed',
             reason: 'no_bridge'
           });
-        case 111:
+        case 126:
           if (!(searchType === 'order')) {
-            _context6.next = 120;
+            _context6.next = 135;
             break;
           }
           orderId = (_data$order_id = data === null || data === void 0 ? void 0 : data.order_id) !== null && _data$order_id !== void 0 ? _data$order_id : data === null || data === void 0 ? void 0 : data.id;
           if (orderId) {
-            _context6.next = 116;
+            _context6.next = 131;
             break;
           }
           bridge === null || bridge === void 0 || (_bridge$onNotify14 = bridge.onNotify) === null || _bridge$onNotify14 === void 0 || _bridge$onNotify14.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
@@ -652,16 +688,16 @@ function _applyGlobalScan() {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 116:
+        case 131:
           if (bridge !== null && bridge !== void 0 && bridge.openOrder) {
-            _context6.next = 118;
+            _context6.next = 133;
             break;
           }
           return _context6.abrupt("return", {
             status: 'pending',
             kind: 'openOrder'
           });
-        case 118:
+        case 133:
           bridge.openOrder({
             order_id: Number(orderId),
             business_code: (_data$business_code = data === null || data === void 0 ? void 0 : data.business_code) !== null && _data$business_code !== void 0 ? _data$business_code : host.getBusinessCode()
@@ -670,16 +706,16 @@ function _applyGlobalScan() {
             status: 'pending',
             kind: 'openOrder'
           });
-        case 120:
+        case 135:
           return _context6.abrupt("return", {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 121:
+        case 136:
         case "end":
           return _context6.stop();
       }
-    }, _callee6, null, [[10, 16], [30, 37], [85, 101, 104, 107]]);
+    }, _callee6, null, [[10, 16], [30, 37], [100, 116, 119, 122]]);
   }));
   return _applyGlobalScan.apply(this, arguments);
 }

package/dist/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.d.ts

@@ -0,0 +1,10 @@
+import type { GlobalScanHandleResult, GlobalScanHostBridge } from '../../types';
+import { type GlobalScanApplyHost } from './applyGlobalScan';
+import type { GlobalScanFormattedResult } from './formatGlobalScan';
+export interface ProductVoucherCollectionScanHost extends GlobalScanApplyHost {
+    waitForCustomerDiscounts(): Promise<void>;
+    loadCustomerDiscounts(): Promise<Record<string, any>[]>;
+}
+/** Collect voucher candidates after customer binding and coupon loading finish.
+ * Never expand a wristband's result to other orders of the same customer. */
+export declare function applyProductVoucherCollectionScan(host: ProductVoucherCollectionScanHost, formatted: GlobalScanFormattedResult, bridge: GlobalScanHostBridge): Promise<GlobalScanHandleResult>;

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

@@ -0,0 +1,117 @@
+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 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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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); }); }; }
+import { applyGlobalScan } from "./applyGlobalScan";
+/** Collect voucher candidates after customer binding and coupon loading finish.
+ * Never expand a wristband's result to other orders of the same customer. */
+export function applyProductVoucherCollectionScan(_x, _x2, _x3) {
+  return _applyProductVoucherCollectionScan.apply(this, arguments);
+}
+function _applyProductVoucherCollectionScan() {
+  _applyProductVoucherCollectionScan = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(host, formatted, bridge) {
+    var assertCurrent, vouchers, result;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          assertCurrent = function assertCurrent() {
+            var _bridge$isCurrent;
+            if (((_bridge$isCurrent = bridge.isCurrent) === null || _bridge$isCurrent === void 0 ? void 0 : _bridge$isCurrent.call(bridge)) === false) {
+              throw new DOMException('Scan session ended', 'AbortError');
+            }
+          };
+          vouchers = [];
+          assertCurrent();
+          _context2.next = 5;
+          return applyGlobalScan(_objectSpread(_objectSpread({}, host), {}, {
+            setOrderCustomer: function setOrderCustomer(customer) {
+              assertCurrent();
+              host.setOrderCustomer(customer);
+            },
+            addProductToOrder: function addProductToOrder(product, booking) {
+              assertCurrent();
+              return host.addProductToOrder(product, booking);
+            }
+          }), formatted, _objectSpread(_objectSpread({}, bridge), {}, {
+            applyPromotionCode: bridge.applyPromotionCode && ( /*#__PURE__*/function () {
+              var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(code, customerId, options) {
+                var promotion;
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) switch (_context.prev = _context.next) {
+                    case 0:
+                      _context.next = 2;
+                      return host.waitForCustomerDiscounts();
+                    case 2:
+                      assertCurrent();
+                      _context.next = 5;
+                      return bridge.applyPromotionCode(code, customerId, _objectSpread(_objectSpread({}, options), {}, {
+                        productVouchersOnly: true,
+                        suppressFailureNotification: true
+                      }));
+                    case 5:
+                      promotion = _context.sent;
+                      assertCurrent();
+                      // An empty successful search is different from a swallowed request error.
+                      if (Array.isArray(promotion.scannedDiscountList)) {
+                        _context.next = 9;
+                        break;
+                      }
+                      throw new Error('Could not resolve scanned vouchers');
+                    case 9:
+                      vouchers = promotion.scannedDiscountList;
+                      return _context.abrupt("return", promotion);
+                    case 11:
+                    case "end":
+                      return _context.stop();
+                  }
+                }, _callee);
+              }));
+              return function (_x4, _x5, _x6) {
+                return _ref.apply(this, arguments);
+              };
+            }())
+          }));
+        case 5:
+          result = _context2.sent;
+          assertCurrent();
+          if (!(formatted.searchType === 'wallet' && result.status === 'success')) {
+            _context2.next = 13;
+            break;
+          }
+          _context2.next = 10;
+          return host.loadCustomerDiscounts();
+        case 10:
+          vouchers = _context2.sent;
+          assertCurrent();
+          return _context2.abrupt("return", _objectSpread(_objectSpread({}, result), {}, {
+            redemption: {
+              source: 'wallet',
+              vouchers: vouchers
+            }
+          }));
+        case 13:
+          if (!(formatted.searchType === 'walletPass')) {
+            _context2.next = 15;
+            break;
+          }
+          return _context2.abrupt("return", _objectSpread(_objectSpread({}, result), {}, {
+            redemption: {
+              source: 'scan',
+              vouchers: vouchers
+            }
+          }));
+        case 15:
+          return _context2.abrupt("return", result);
+        case 16:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _applyProductVoucherCollectionScan.apply(this, arguments);
+}

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

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

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

@@ -479,7 +479,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/BookingTicket/index.js

@@ -30,6 +30,7 @@ var _handleScan = require("./utils/scan/handleScan");
 var _scanCache = _interopRequireDefault(require("./utils/scan/scanCache"));
 var _formatGlobalScan = require("./utils/scan/formatGlobalScan");
 var _applyGlobalScan = require("./utils/scan/applyGlobalScan");
+var _applyProductVoucherCollectionScan = require("./utils/scan/applyProductVoucherCollectionScan");
 var _cartView = require("./utils/cartView");
 var _addProductDecision = require("./utils/addProductDecision");
 var _buildCacheItemFromOrderLine = require("../../modules/BookingContext/utils/buildCacheItemFromOrderLine");
@@ -1847,7 +1848,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
           reason: 'not_found'
         };
       }
-      const result = await (0, _applyGlobalScan.applyGlobalScan)({
+      const host = {
         setOrderCustomer: customer => {
           beforeScanCommit();
           this.setOrderCustomer(customer);
@@ -1868,10 +1869,29 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
           beforeScanCommit();
           return this.scanWalletAsset(scanCode);
         }
-      }, formatted, guardedBridge);
+      };
+      const result = guardedBridge?.scanScope === 'product-voucher-collection' ? await (0, _applyProductVoucherCollectionScan.applyProductVoucherCollectionScan)({
+        ...host,
+        waitForCustomerDiscounts: () => this.orderCustomerDiscountRefreshInFlight || Promise.resolve(),
+        loadCustomerDiscounts: async () => {
+          const customerId = Number(this.getOrderCustomer()?.customer_id || 0);
+          if (customerId <= 1) return [];
+          await this.refreshDiscountConfigAfterOrderCustomerChange(customerId);
+          return this.getDiscountList();
+        }
+      }, formatted, guardedBridge) : await (0, _applyGlobalScan.applyGlobalScan)(host, formatted, guardedBridge);
       bridge?.refresh?.();
       return result;
     } catch (error) {
+      if (bridge?.scanScope === 'product-voucher-collection') {
+        if (bridge.isCurrent?.() === false) return {
+          status: 'cancelled'
+        };
+        return {
+          status: 'failed',
+          reason: 'entry_resolution_failed'
+        };
+      }
       console.error('[BookingTicket] handleGlobalScanCode failed', error);
       bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
       return {