@pisell/pisellos 2.3.40 → 2.3.42

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

@@ -191,210 +191,300 @@ export function applyGlobalScan(_x14, _x15, _x16) {
   return _applyGlobalScan.apply(this, arguments);
 }
 function _applyGlobalScan() {
-  _applyGlobalScan = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(host, formatted, bridge) {
-    var searchType, data, scanCode, _bridge$onNotify2, _bridge$onNotify, _bridge$onNotify4, _bridge$onNotify3, snapshot, scannedCustomerIsWalkIn, result, list, _bridge$onNotify5, addedCount, _iterator, _step, _item, outcome, _bridge$onNotify6, _data$order_id, _data$business_code, orderId, _bridge$onNotify7;
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+  _applyGlobalScan = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(host, formatted, bridge) {
+    var searchType, data, scanCode, _bridge$onNotify2, _bridge$onNotify, _host$refreshWalletAs, _bridge$onNotify5, snapshot, scannedCustomerIsWalkIn, trySelectWalletAsset, _walletSelection, result, walletSelection, _data$id, promotionResult, list, _bridge$onNotify6, addedCount, _iterator, _step, _item, outcome, _bridge$onNotify7, _data$order_id, _data$business_code, orderId, _bridge$onNotify8;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
         case 0:
           searchType = formatted.searchType, data = formatted.data, scanCode = formatted.scanCode;
           if (!(searchType === 'wallet')) {
-            _context4.next = 8;
+            _context5.next = 8;
             break;
           }
           if (data) {
-            _context4.next = 5;
+            _context5.next = 5;
             break;
           }
           bridge === null || bridge === void 0 || (_bridge$onNotify = bridge.onNotify) === null || _bridge$onNotify === void 0 || _bridge$onNotify.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
-          return _context4.abrupt("return", {
+          return _context5.abrupt("return", {
             status: 'failed',
             reason: 'invalid_data'
           });
         case 5:
           host.setOrderCustomer(data);
           bridge === null || bridge === void 0 || (_bridge$onNotify2 = bridge.onNotify) === null || _bridge$onNotify2 === void 0 || _bridge$onNotify2.call(bridge, 'success', 'pisell2.text.add-client-success');
-          return _context4.abrupt("return", {
+          return _context5.abrupt("return", {
             status: 'success',
             kind: 'customer'
           });
         case 8:
           if (!(searchType === 'walletPass')) {
-            _context4.next = 26;
+            _context5.next = 42;
             break;
           }
-          if (data) {
-            _context4.next = 12;
-            break;
-          }
-          bridge === null || bridge === void 0 || (_bridge$onNotify3 = bridge.onNotify) === null || _bridge$onNotify3 === void 0 || _bridge$onNotify3.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
-          return _context4.abrupt("return", {
-            status: 'failed',
-            reason: 'invalid_data'
-          });
-        case 12:
           snapshot = host.getOrderCustomerSnapshot();
           scannedCustomerIsWalkIn = isWalkInCustomer(data);
+          trySelectWalletAsset = /*#__PURE__*/function () {
+            var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+              var _bridge$onNotify4;
+              var walletResult, _bridge$onNotify3;
+              return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                while (1) switch (_context4.prev = _context4.next) {
+                  case 0:
+                    if (host.scanWalletAsset) {
+                      _context4.next = 2;
+                      break;
+                    }
+                    return _context4.abrupt("return", null);
+                  case 2:
+                    _context4.next = 4;
+                    return host.scanWalletAsset(scanCode).catch(function (error) {
+                      console.warn('[GlobalScan] Wallet asset lookup failed', error);
+                      return null;
+                    });
+                  case 4:
+                    walletResult = _context4.sent;
+                    if (walletResult) {
+                      _context4.next = 7;
+                      break;
+                    }
+                    return _context4.abrupt("return", null);
+                  case 7:
+                    if (!(walletResult.type !== 'normalCode' || !walletResult.asset)) {
+                      _context4.next = 9;
+                      break;
+                    }
+                    return _context4.abrupt("return", null);
+                  case 9:
+                    if (!walletResult.selected) {
+                      _context4.next = 12;
+                      break;
+                    }
+                    bridge === null || bridge === void 0 || (_bridge$onNotify3 = bridge.onNotify) === null || _bridge$onNotify3 === void 0 || _bridge$onNotify3.call(bridge, 'success');
+                    return _context4.abrupt("return", {
+                      status: 'success',
+                      kind: 'promotion'
+                    });
+                  case 12:
+                    // 已识别为 Wallet 支付资产但当前不可用：保留禁用展示，不回退优惠码。
+                    bridge === null || bridge === void 0 || (_bridge$onNotify4 = bridge.onNotify) === null || _bridge$onNotify4 === void 0 || _bridge$onNotify4.call(bridge, 'fail', 'pisell2.text.goodpass.code-invalid-cart');
+                    return _context4.abrupt("return", {
+                      status: 'failed',
+                      reason: 'invalid_data'
+                    });
+                  case 14:
+                  case "end":
+                    return _context4.stop();
+                }
+              }, _callee4);
+            }));
+            return function trySelectWalletAsset() {
+              return _ref2.apply(this, arguments);
+            };
+          }();
           if (!(isWalkInCustomer(snapshot) || scannedCustomerIsWalkIn)) {
-            _context4.next = 23;
+            _context5.next = 26;
+            break;
+          }
+          _context5.next = 15;
+          return trySelectWalletAsset();
+        case 15:
+          _walletSelection = _context5.sent;
+          if (!_walletSelection) {
+            _context5.next = 18;
             break;
           }
+          return _context5.abrupt("return", _walletSelection);
+        case 18:
           if (bridge !== null && bridge !== void 0 && bridge.applyPromotionCode) {
-            _context4.next = 17;
+            _context5.next = 20;
             break;
           }
-          return _context4.abrupt("return", {
+          return _context5.abrupt("return", {
             status: 'failed',
             reason: 'no_bridge'
           });
-        case 17:
-          _context4.next = 19;
+        case 20:
+          _context5.next = 22;
           return bridge.applyPromotionCode(scanCode);
-        case 19:
-          result = _context4.sent;
+        case 22:
+          result = _context5.sent;
           if (!(result !== null && result !== void 0 && result.isAvailable)) {
-            _context4.next = 22;
+            _context5.next = 25;
             break;
           }
-          return _context4.abrupt("return", {
+          return _context5.abrupt("return", {
             status: 'success',
             kind: 'promotion'
           });
-        case 22:
-          return _context4.abrupt("return", {
+        case 25:
+          return _context5.abrupt("return", {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 23:
+        case 26:
           host.setOrderCustomer(data);
-          bridge === null || bridge === void 0 || (_bridge$onNotify4 = bridge.onNotify) === null || _bridge$onNotify4 === void 0 || _bridge$onNotify4.call(bridge, 'success', 'pisell2.text.add-client-success');
-          return _context4.abrupt("return", {
+          _context5.next = 29;
+          return (_host$refreshWalletAs = host.refreshWalletAssets) === null || _host$refreshWalletAs === void 0 ? void 0 : _host$refreshWalletAs.call(host, {
+            preserveSelection: false
+          });
+        case 29:
+          _context5.next = 31;
+          return trySelectWalletAsset();
+        case 31:
+          walletSelection = _context5.sent;
+          if (!walletSelection) {
+            _context5.next = 34;
+            break;
+          }
+          return _context5.abrupt("return", walletSelection);
+        case 34:
+          if (!(bridge !== null && bridge !== void 0 && bridge.applyPromotionCode)) {
+            _context5.next = 40;
+            break;
+          }
+          _context5.next = 37;
+          return bridge.applyPromotionCode(scanCode, Number((_data$id = data === null || data === void 0 ? void 0 : data.id) !== null && _data$id !== void 0 ? _data$id : data === null || data === void 0 ? void 0 : data.customer_id) || undefined);
+        case 37:
+          promotionResult = _context5.sent;
+          if (!(promotionResult !== null && promotionResult !== void 0 && promotionResult.isAvailable)) {
+            _context5.next = 40;
+            break;
+          }
+          return _context5.abrupt("return", {
+            status: 'success',
+            kind: 'promotion'
+          });
+        case 40:
+          bridge === null || bridge === void 0 || (_bridge$onNotify5 = bridge.onNotify) === null || _bridge$onNotify5 === void 0 || _bridge$onNotify5.call(bridge, 'success', 'pisell2.text.add-client-success');
+          return _context5.abrupt("return", {
             status: 'success',
             kind: 'customer'
           });
-        case 26:
+        case 42:
           if (!(searchType === 'product' || searchType === 'local_product')) {
-            _context4.next = 59;
+            _context5.next = 75;
             break;
           }
           list = data === null || data === void 0 ? void 0 : data.list;
           if (!(!Array.isArray(list) || list.length === 0)) {
-            _context4.next = 31;
+            _context5.next = 47;
             break;
           }
-          bridge === null || bridge === void 0 || (_bridge$onNotify5 = bridge.onNotify) === null || _bridge$onNotify5 === void 0 || _bridge$onNotify5.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
-          return _context4.abrupt("return", {
+          bridge === null || bridge === void 0 || (_bridge$onNotify6 = bridge.onNotify) === null || _bridge$onNotify6 === void 0 || _bridge$onNotify6.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
+          return _context5.abrupt("return", {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 31:
+        case 47:
           addedCount = 0;
           _iterator = _createForOfIteratorHelper(list);
-          _context4.prev = 33;
+          _context5.prev = 49;
           _iterator.s();
-        case 35:
+        case 51:
           if ((_step = _iterator.n()).done) {
-            _context4.next = 47;
+            _context5.next = 63;
             break;
           }
           _item = _step.value;
-          _context4.next = 39;
+          _context5.next = 55;
           return processScannedProductItem(host, _item, scanCode, bridge);
-        case 39:
-          outcome = _context4.sent;
+        case 55:
+          outcome = _context5.sent;
           if (outcome === 'added') {
             addedCount += 1;
           }
           if (!(outcome === 'cancelled')) {
-            _context4.next = 43;
+            _context5.next = 59;
             break;
           }
-          return _context4.abrupt("return", {
+          return _context5.abrupt("return", {
             status: 'cancelled'
           });
-        case 43:
+        case 59:
           if (!(outcome === 'pending')) {
-            _context4.next = 45;
+            _context5.next = 61;
             break;
           }
-          return _context4.abrupt("return", {
+          return _context5.abrupt("return", {
             status: 'pending',
             kind: 'requiresDetail'
           });
-        case 45:
-          _context4.next = 35;
+        case 61:
+          _context5.next = 51;
           break;
-        case 47:
-          _context4.next = 52;
+        case 63:
+          _context5.next = 68;
           break;
-        case 49:
-          _context4.prev = 49;
-          _context4.t0 = _context4["catch"](33);
-          _iterator.e(_context4.t0);
-        case 52:
-          _context4.prev = 52;
+        case 65:
+          _context5.prev = 65;
+          _context5.t0 = _context5["catch"](49);
+          _iterator.e(_context5.t0);
+        case 68:
+          _context5.prev = 68;
           _iterator.f();
-          return _context4.finish(52);
-        case 55:
+          return _context5.finish(68);
+        case 71:
           if (!(addedCount > 0)) {
-            _context4.next = 58;
+            _context5.next = 74;
             break;
           }
-          bridge === null || bridge === void 0 || (_bridge$onNotify6 = bridge.onNotify) === null || _bridge$onNotify6 === void 0 || _bridge$onNotify6.call(bridge, 'success');
-          return _context4.abrupt("return", {
+          bridge === null || bridge === void 0 || (_bridge$onNotify7 = bridge.onNotify) === null || _bridge$onNotify7 === void 0 || _bridge$onNotify7.call(bridge, 'success');
+          return _context5.abrupt("return", {
             status: 'success',
             kind: 'products',
             meta: {
               count: addedCount
             }
           });
-        case 58:
-          return _context4.abrupt("return", {
+        case 74:
+          return _context5.abrupt("return", {
             status: 'failed',
             reason: 'no_bridge'
           });
-        case 59:
+        case 75:
           if (!(searchType === 'order')) {
-            _context4.next = 68;
+            _context5.next = 84;
             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) {
-            _context4.next = 64;
+            _context5.next = 80;
             break;
           }
-          bridge === null || bridge === void 0 || (_bridge$onNotify7 = bridge.onNotify) === null || _bridge$onNotify7 === void 0 || _bridge$onNotify7.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
-          return _context4.abrupt("return", {
+          bridge === null || bridge === void 0 || (_bridge$onNotify8 = bridge.onNotify) === null || _bridge$onNotify8 === void 0 || _bridge$onNotify8.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
+          return _context5.abrupt("return", {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 64:
+        case 80:
           if (bridge !== null && bridge !== void 0 && bridge.openOrder) {
-            _context4.next = 66;
+            _context5.next = 82;
             break;
           }
-          return _context4.abrupt("return", {
+          return _context5.abrupt("return", {
             status: 'pending',
             kind: 'openOrder'
           });
-        case 66:
+        case 82:
           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()
           });
-          return _context4.abrupt("return", {
+          return _context5.abrupt("return", {
             status: 'pending',
             kind: 'openOrder'
           });
-        case 68:
-          return _context4.abrupt("return", {
+        case 84:
+          return _context5.abrupt("return", {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 69:
+        case 85:
         case "end":
-          return _context4.stop();
+          return _context5.stop();
       }
-    }, _callee4, null, [[33, 49, 52, 55]]);
+    }, _callee5, null, [[49, 65, 68, 71]]);
   }));
   return _applyGlobalScan.apply(this, arguments);
 }

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

@@ -2,11 +2,9 @@ import { RequestPlugin } from '../../../../plugins';
 /**
  * 处理全局扫码
  * @param request 请求插件
- * @param localSearch 本地商品搜索
- * @param channel 当前销售渠道
  * @returns 处理结果
  */
-export declare const handleGlobalScan: (request: RequestPlugin, localSearch: (v: string) => any[], channel?: string) => (scanResult: {
+export declare const handleGlobalScan: (request: RequestPlugin, localSearch: (v: string) => any[]) => (scanResult: {
     type: string;
     value: string;
 }) => Promise<any>;

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

@@ -1,10 +1,4 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _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 _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 _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 _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; }
 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); }); }; }
@@ -156,18 +150,16 @@ var handleScanFn = function handleScanFn(getRequestList, localSearch) {
 /**
  * 处理全局扫码
  * @param request 请求插件
- * @param localSearch 本地商品搜索
- * @param channel 当前销售渠道
  * @returns 处理结果
  */
-export var handleGlobalScan = function handleGlobalScan(request, localSearch, channel) {
+export var handleGlobalScan = function handleGlobalScan(request, localSearch) {
   var getRequestList = function getRequestList(value) {
     var requestList = [];
     // 如果value是已WL开头的，则认为是钱包识别码
     if (value.startsWith('WL')) {
       requestList = [searchWallet(request, value)];
     } else {
-      requestList = [].concat(_toConsumableArray(channel === 'kiosk' ? [] : [searchOrder(request, value)]), [searchWalletPass(request, value), searchWallet(request, value), searchProduct(request, value)]);
+      requestList = [searchOrder(request, value), searchWalletPass(request, value), searchWallet(request, value), searchProduct(request, value)];
     }
     return requestList;
   };

package/dist/solution/BookingTicket/utils/weighingProductSku.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 将规格弹窗的称重结果写入订单行权威字段 product_sku。
+ * 商品目录已有的 SKU 字段会保留，本次称重结果只覆盖运行态称重字段。
+ */
+export declare function buildProductSkuFromCacheItem(cacheItem: Record<string, any> | null | undefined): Record<string, any> | undefined;

package/dist/solution/BookingTicket/utils/weighingProductSku.js

@@ -0,0 +1,45 @@
+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 _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); }
+var WEIGHT_UNIT_MAP = {
+  KILOGRAMS: 'kg',
+  GRAMS: 'g',
+  POUNDS: 'lb',
+  OUNCES: 'oz'
+};
+function isRecord(value) {
+  return Boolean(value) && _typeof(value) === 'object' && !Array.isArray(value);
+}
+
+/**
+ * 将规格弹窗的称重结果写入订单行权威字段 product_sku。
+ * 商品目录已有的 SKU 字段会保留，本次称重结果只覆盖运行态称重字段。
+ */
+export function buildProductSkuFromCacheItem(cacheItem) {
+  var _cacheItem$_extend, _cacheItem$_extend2, _weighing$unit_weight, _weighing$tare$label, _weighing$tare, _weighing$tare$value, _weighing$tare2, _weighing$weight, _weighing$net_weight;
+  var currentSku = isRecord(cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.product_sku) ? cacheItem.product_sku : undefined;
+  var weighing = isRecord(cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.weighing) ? cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.weighing : undefined;
+  var hasRuntimeWeighingSku = Number((currentSku === null || currentSku === void 0 ? void 0 : currentSku.open_sold_weight) || 0) === 1 && ((currentSku === null || currentSku === void 0 ? void 0 : currentSku.weight) !== undefined || (currentSku === null || currentSku === void 0 ? void 0 : currentSku.net_weight) !== undefined || (currentSku === null || currentSku === void 0 ? void 0 : currentSku.weight_source) !== undefined);
+  var isWeighingSku = Number((currentSku === null || currentSku === void 0 ? void 0 : currentSku.open_sold_weight) || 0) === 1;
+
+  // 普通商品维持旧转换行为，不把目录侧完整 SKU 引入订单行。
+  if (!isWeighingSku && !weighing) return undefined;
+  // 新版 SkuDetailModal 已直接生成 product_sku；_extend.weighing 只作为旧调用方回退。
+  if (hasRuntimeWeighingSku) return _objectSpread({}, currentSku);
+  if (!weighing) return currentSku ? _objectSpread({}, currentSku) : undefined;
+  return _objectSpread(_objectSpread({}, currentSku || {}), {}, {
+    open_sold_weight: 1,
+    unit_data_snapshot: weighing.scalePriceProduct,
+    unit: WEIGHT_UNIT_MAP[String(weighing.unit)] || weighing.unit,
+    unit_weight: (_weighing$unit_weight = weighing.unit_weight) !== null && _weighing$unit_weight !== void 0 ? _weighing$unit_weight : '1.000',
+    unit_price: weighing.unit_price,
+    weight_source: weighing.mode,
+    tare_name: (_weighing$tare$label = (_weighing$tare = weighing.tare) === null || _weighing$tare === void 0 ? void 0 : _weighing$tare.label) !== null && _weighing$tare$label !== void 0 ? _weighing$tare$label : '',
+    tare_weight: (_weighing$tare$value = (_weighing$tare2 = weighing.tare) === null || _weighing$tare2 === void 0 ? void 0 : _weighing$tare2.value) !== null && _weighing$tare$value !== void 0 ? _weighing$tare$value : 0,
+    weight: (_weighing$weight = weighing.weight) !== null && _weighing$weight !== void 0 ? _weighing$weight : 0,
+    net_weight: (_weighing$net_weight = weighing.net_weight) !== null && _weighing$net_weight !== void 0 ? _weighing$net_weight : 0
+  });
+}

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

@@ -83,6 +83,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getBookingAppointmentStatus;
     private isBookingIncludedInStats;
     private getBookingOrderPaymentStatus;
+    private isUnpaidBooking;
     private countBookingOrders;
     private countCompletedBookings;
     private groupBookingsByResource;

package/dist/solution/Sales/index.js

@@ -29,6 +29,7 @@ import dayjs from 'dayjs';
 import { BaseModule } from "../../modules/BaseModule";
 import { SalesHooks } from "./types";
 export * from "./types";
+var UNPAID_PAYMENT_STATUSES = new Set(['unpaid', 'partially_paid', 'payment_processing']);
 
 /**
  * Sales 解决方案基础骨架
@@ -415,6 +416,11 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _booking$order$paymen, _booking$order;
       return String((_booking$order$paymen = (_booking$order = booking.order) === null || _booking$order === void 0 ? void 0 : _booking$order.payment_status) !== null && _booking$order$paymen !== void 0 ? _booking$order$paymen : '');
     }
+  }, {
+    key: "isUnpaidBooking",
+    value: function isUnpaidBooking(booking) {
+      return UNPAID_PAYMENT_STATUSES.has(this.getBookingOrderPaymentStatus(booking));
+    }
   }, {
     key: "countBookingOrders",
     value: function countBookingOrders(bookings) {
@@ -895,9 +901,11 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
               completedBookingList = matchedBookingList.filter(function (booking) {
                 return _this7.getBookingAppointmentStatus(booking) === 'completed';
-              });
+              }); // const unpaidBookingList = matchedBookingList.filter(
+              //   (booking) => this.getBookingOrderPaymentStatus(booking) === 'unpaid' || this.getBookingOrderPaymentStatus(booking) === 'payment_processing',
+              // );
               unpaidBookingList = matchedBookingList.filter(function (booking) {
-                return _this7.getBookingOrderPaymentStatus(booking) === 'unpaid' || _this7.getBookingOrderPaymentStatus(booking) === 'payment_processing';
+                return _this7.isUnpaidBooking(booking);
               });
               bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList));
               completedBookings = completedBookingList.map(function (booking) {