@pisell/pisellos 2.2.204 → 2.2.205

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

@@ -192,18 +192,17 @@ export function applyGlobalScan(_x14, _x15, _x16) {
 }
 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, result, list, _bridge$onNotify5, addedCount, _iterator, _step, _item, outcome, _bridge$onNotify6, _data$order_id, orderId, _bridge$onNotify7;
+    var searchType, data, scanCode, _bridge$onNotify2, _bridge$onNotify, _bridge$onNotify4, _bridge$onNotify3, snapshot, 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) {
         case 0:
           searchType = formatted.searchType, data = formatted.data, scanCode = formatted.scanCode;
-          debugger;
           if (!(searchType === 'wallet')) {
-            _context4.next = 9;
+            _context4.next = 8;
             break;
           }
           if (data) {
-            _context4.next = 6;
+            _context4.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');
@@ -211,20 +210,20 @@ function _applyGlobalScan() {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 6:
+        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", {
             status: 'success',
             kind: 'customer'
           });
-        case 9:
+        case 8:
           if (!(searchType === 'walletPass')) {
-            _context4.next = 26;
+            _context4.next = 25;
             break;
           }
           if (data) {
-            _context4.next = 13;
+            _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');
@@ -232,53 +231,53 @@ function _applyGlobalScan() {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 13:
+        case 12:
           snapshot = host.getOrderCustomerSnapshot();
           if (!isWalkInCustomer(snapshot)) {
-            _context4.next = 23;
+            _context4.next = 22;
             break;
           }
           if (bridge !== null && bridge !== void 0 && bridge.applyPromotionCode) {
-            _context4.next = 17;
+            _context4.next = 16;
             break;
           }
           return _context4.abrupt("return", {
             status: 'failed',
             reason: 'no_bridge'
           });
-        case 17:
-          _context4.next = 19;
+        case 16:
+          _context4.next = 18;
           return bridge.applyPromotionCode(scanCode);
-        case 19:
+        case 18:
           result = _context4.sent;
           if (!(result !== null && result !== void 0 && result.isAvailable)) {
-            _context4.next = 22;
+            _context4.next = 21;
             break;
           }
           return _context4.abrupt("return", {
             status: 'success',
             kind: 'promotion'
           });
-        case 22:
+        case 21:
           return _context4.abrupt("return", {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 23:
+        case 22:
           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", {
             status: 'success',
             kind: 'customer'
           });
-        case 26:
+        case 25:
           if (!(searchType === 'product' || searchType === 'local_product')) {
-            _context4.next = 59;
+            _context4.next = 58;
             break;
           }
           list = data === null || data === void 0 ? void 0 : data.list;
           if (!(!Array.isArray(list) || list.length === 0)) {
-            _context4.next = 31;
+            _context4.next = 30;
             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');
@@ -286,57 +285,57 @@ function _applyGlobalScan() {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 31:
+        case 30:
           addedCount = 0;
           _iterator = _createForOfIteratorHelper(list);
-          _context4.prev = 33;
+          _context4.prev = 32;
           _iterator.s();
-        case 35:
+        case 34:
           if ((_step = _iterator.n()).done) {
-            _context4.next = 47;
+            _context4.next = 46;
             break;
           }
           _item = _step.value;
-          _context4.next = 39;
+          _context4.next = 38;
           return processScannedProductItem(host, _item, scanCode, bridge);
-        case 39:
+        case 38:
           outcome = _context4.sent;
           if (outcome === 'added') {
             addedCount += 1;
           }
           if (!(outcome === 'cancelled')) {
-            _context4.next = 43;
+            _context4.next = 42;
             break;
           }
           return _context4.abrupt("return", {
             status: 'cancelled'
           });
-        case 43:
+        case 42:
           if (!(outcome === 'pending')) {
-            _context4.next = 45;
+            _context4.next = 44;
             break;
           }
           return _context4.abrupt("return", {
             status: 'pending',
             kind: 'requiresDetail'
           });
-        case 45:
-          _context4.next = 35;
+        case 44:
+          _context4.next = 34;
           break;
-        case 47:
-          _context4.next = 52;
+        case 46:
+          _context4.next = 51;
           break;
-        case 49:
-          _context4.prev = 49;
-          _context4.t0 = _context4["catch"](33);
+        case 48:
+          _context4.prev = 48;
+          _context4.t0 = _context4["catch"](32);
           _iterator.e(_context4.t0);
-        case 52:
-          _context4.prev = 52;
+        case 51:
+          _context4.prev = 51;
           _iterator.f();
-          return _context4.finish(52);
-        case 55:
+          return _context4.finish(51);
+        case 54:
           if (!(addedCount > 0)) {
-            _context4.next = 58;
+            _context4.next = 57;
             break;
           }
           bridge === null || bridge === void 0 || (_bridge$onNotify6 = bridge.onNotify) === null || _bridge$onNotify6 === void 0 || _bridge$onNotify6.call(bridge, 'success');
@@ -347,19 +346,19 @@ function _applyGlobalScan() {
               count: addedCount
             }
           });
-        case 58:
+        case 57:
           return _context4.abrupt("return", {
             status: 'failed',
             reason: 'no_bridge'
           });
-        case 59:
+        case 58:
           if (!(searchType === 'order')) {
-            _context4.next = 68;
+            _context4.next = 67;
             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;
+            _context4.next = 63;
             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');
@@ -367,34 +366,34 @@ function _applyGlobalScan() {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 64:
+        case 63:
           if (bridge !== null && bridge !== void 0 && bridge.openOrder) {
-            _context4.next = 66;
+            _context4.next = 65;
             break;
           }
           return _context4.abrupt("return", {
             status: 'pending',
             kind: 'openOrder'
           });
-        case 66:
+        case 65:
           bridge.openOrder({
             order_id: Number(orderId),
-            business_code: host.getBusinessCode()
+            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", {
             status: 'pending',
             kind: 'openOrder'
           });
-        case 68:
+        case 67:
           return _context4.abrupt("return", {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 69:
+        case 68:
         case "end":
           return _context4.stop();
       }
-    }, _callee4, null, [[33, 49, 52, 55]]);
+    }, _callee4, null, [[32, 48, 51, 54]]);
   }));
   return _applyGlobalScan.apply(this, arguments);
 }

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

@@ -14,12 +14,17 @@ declare enum ScanResultType {
     NativeScanner = "nativeScanner"
 }
 export default class Scan {
+    private static scanInstances;
+    private static peripheralsListenerMounted;
     private solution;
     private watchKey;
     private listenerConfig;
     constructor(solution: BookingTicketImpl, watchKey: string);
     /**
      * 初始化外设扫码结果监听
+     *
+     * @example
+     * scan.initPeripheralsListener();
      */
     initPeripheralsListener(): void;
     /**

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

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

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

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

package/lib/modules/Order/index.js

@@ -2014,6 +2014,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
       if (this.hasGoodPassDiscount(item))
         return false;
+      if (item.order_detail_id !== void 0 && item.order_detail_id !== null)
+        return false;
       if (item.product_id !== productToAdd.product_id)
         return false;
       if (item.product_variant_id !== productToAdd.product_variant_id)
@@ -2589,6 +2591,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         submittedOrderId,
         (resultRecord == null ? void 0 : resultRecord.data) || resultRecord || {}
       );
+    } else {
+      this.store.syncState = "submitted";
     }
     return result;
   }
@@ -2907,7 +2911,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         hasOrderId: !!orderData.order_id,
         smallTicketDataFlag: orderData.small_ticket_data_flag
       });
-      const response = await this.request.post("/shop/order/checkout", orderData, {
+      const response = await this.request.post("/order/checkout", orderData, {
         osServer: true,
         customToast: () => {
         }

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

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