@pisell/private-materials 6.3.139 → 6.3.140

package/es/components/scanOrder/components/Cart/index.js

@@ -1,4 +1,8 @@
 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 _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 _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); }); }; }
@@ -8,14 +12,17 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useState, useCallback } from 'react';
 import { Button } from '@pisell/materials';
 import { locales } from '@pisell/utils';
 import ShoppingCart from "../../../shoppingCart";
 import { useScanOrderContext } from "../../context";
+import useEngineContext from "../../../../hooks/useEngineContext";
 import SubTotal from "../../../subTotal";
+import VoucherCard from "../Voucher";
 import "./index.less";
 export default function Cart(props) {
+  var _engineContext$appHel, _engineContext$engine, _businessUtils$getApp, _businessUtils$getApp2;
   var open = props.open,
     onCancel = props.onCancel,
     onNext = props.onNext,
@@ -32,6 +39,13 @@ export default function Cart(props) {
     runModuleAction = _useScanOrderContext.runModuleAction,
     refreshViewModel = _useScanOrderContext.refreshViewModel,
     scanOrderModule = _useScanOrderContext.scanOrderModule;
+  var engineContext = useEngineContext();
+  var businessUtils = engineContext === null || engineContext === void 0 || (_engineContext$appHel = engineContext.appHelper) === null || _engineContext$appHel === void 0 || (_engineContext$appHel = _engineContext$appHel.utils) === null || _engineContext$appHel === void 0 ? void 0 : _engineContext$appHel.businessUtils;
+  var locale = (engineContext === null || engineContext === void 0 || (_engineContext$engine = engineContext.engine) === null || _engineContext$engine === void 0 || (_engineContext$engine = _engineContext$engine.props) === null || _engineContext$engine === void 0 ? void 0 : _engineContext$engine.locale) || 'en';
+  // 是否安装商品券/折扣卡应用（与 venueBooking Cart 保持一致的判定）
+  var hasGoodPassApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp = businessUtils.getAppByModal) !== null && _businessUtils$getApp !== void 0 && _businessUtils$getApp.call(businessUtils, 'goodpass'));
+  var hasDiscountCardApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp2 = businessUtils.getAppByModal) !== null && _businessUtils$getApp2 !== void 0 && _businessUtils$getApp2.call(businessUtils, 'discountcard'));
+  var showVoucher = hasGoodPassApp || hasDiscountCardApp;
   var isVisible = embedded || open;
   if (!isVisible) return null;
   var _useState = useState(null),
@@ -39,31 +53,28 @@ export default function Cart(props) {
     dineInConfig = _useState2[0],
     setDineInConfig = _useState2[1];
   // 去读 pisellos 内的配置
-  var getConfig = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _otherParams$dineInCo;
-      var otherParams, dineInConfig;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return runModuleAction('getOtherParams');
-          case 2:
-            otherParams = _context.sent;
-            console.log('otherParams >>>>> ', otherParams);
-            dineInConfig = (_otherParams$dineInCo = otherParams === null || otherParams === void 0 ? void 0 : otherParams.dineInConfig) !== null && _otherParams$dineInCo !== void 0 ? _otherParams$dineInCo : {};
-            setDineInConfig(dineInConfig);
-          case 6:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function getConfig() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-  getConfig();
+  var getConfig = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _otherParams$dineInCo;
+    var otherParams, dineInConfig;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return runModuleAction('getOtherParams');
+        case 2:
+          otherParams = _context.sent;
+          console.log('otherParams >>>>> ', otherParams);
+          dineInConfig = (_otherParams$dineInCo = otherParams === null || otherParams === void 0 ? void 0 : otherParams.dineInConfig) !== null && _otherParams$dineInCo !== void 0 ? _otherParams$dineInCo : {};
+          setDineInConfig(dineInConfig);
+        case 6:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), [runModuleAction]);
+  useEffect(function () {
+    getConfig();
+  }, []);
 
   // 是否显示给商品添加备注
   var isShowNote = useMemo(function () {
@@ -90,10 +101,23 @@ export default function Cart(props) {
     var rawTaxRate = Number((_tempSummary$tax_rate = tempSummary === null || tempSummary === void 0 ? void 0 : tempSummary.tax_rate) !== null && _tempSummary$tax_rate !== void 0 ? _tempSummary$tax_rate : summary === null || summary === void 0 ? void 0 : summary.tax_rate);
     var normalizedTaxRate = Number.isNaN(rawTaxRate) ? 0 : rawTaxRate > 1 ? rawTaxRate / 100 : rawTaxRate;
     var isPriceIncludeTax = Boolean((_ref8 = (_tempSummary$is_price = tempSummary === null || tempSummary === void 0 ? void 0 : tempSummary.is_price_include_tax) !== null && _tempSummary$is_price !== void 0 ? _tempSummary$is_price : tempSummary === null || tempSummary === void 0 ? void 0 : tempSummary.isPriceIncludeTax) !== null && _ref8 !== void 0 ? _ref8 : summary === null || summary === void 0 ? void 0 : summary.is_price_include_tax);
+
+    /** 将 surcharges 数组映射为 SubTotalItem，amount > 0 才展示（与 venueBooking Cart 一致） */
+    var surchargeItems = ((summary === null || summary === void 0 ? void 0 : summary.surcharges) || []).filter(function (s) {
+      return Number(s === null || s === void 0 ? void 0 : s.amount) > 0;
+    }).map(function (s) {
+      var labelObj = (s === null || s === void 0 ? void 0 : s.label) || (s === null || s === void 0 ? void 0 : s.name) || {};
+      var label = labelObj[locale] || labelObj.en || labelObj.original || (s === null || s === void 0 ? void 0 : s.key) || '';
+      return {
+        key: (s === null || s === void 0 ? void 0 : s.key) || "surcharge_".concat(s === null || s === void 0 ? void 0 : s.surcharge_id),
+        label: label,
+        value: Number(s === null || s === void 0 ? void 0 : s.amount)
+      };
+    });
     return [{
       key: 'sub_total',
       value: Number.isNaN(subTotal) ? 0 : subTotal
-    }, {
+    }].concat(_toConsumableArray(surchargeItems), [{
       key: 'tax',
       value: Number.isNaN(totalTaxFee) ? 0 : totalTaxFee,
       hidden: Number.isNaN(totalTaxFee) ? true : totalTaxFee <= 0,
@@ -107,55 +131,101 @@ export default function Cart(props) {
       value: Number.isNaN(total) ? 0 : total,
       label: locales.getText('pisell2.event.total'),
       bold: true
-    }];
-  }, [summary, scanOrderModule]);
+    }]);
+  }, [summary, scanOrderModule, locale]);
   var handleCartChange = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item, type) {
-      var _ref10, _item$product_id, _item$product_variant;
-      var productId, productVariantId, identityKey;
+      var _ref10, _item$product_id, _item$product_variant, productId, productVariantId, identityKey, identity, _item$note, _ref11, _item$product_id2, _item$product_variant2, _productId, _productVariantId, _identityKey;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            if (!(type !== 'delete')) {
-              _context2.next = 2;
+            if (!(type === 'note')) {
+              _context2.next = 21;
               break;
             }
-            return _context2.abrupt("return");
-          case 2:
             productId = (_ref10 = (_item$product_id = item === null || item === void 0 ? void 0 : item.product_id) !== null && _item$product_id !== void 0 ? _item$product_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref10 !== void 0 ? _ref10 : null;
-            productVariantId = Number((_item$product_variant = item === null || item === void 0 ? void 0 : item.product_variant_id) !== null && _item$product_variant !== void 0 ? _item$product_variant : 0);
-            identityKey = (item === null || item === void 0 ? void 0 : item.identity_key) || (item === null || item === void 0 ? void 0 : item.rowKey) || undefined;
+            productVariantId = Number((_item$product_variant = item === null || item === void 0 ? void 0 : item.product_variant_id) !== null && _item$product_variant !== void 0 ? _item$product_variant : 0); // 不透明 identity 契约：UI 行级操作只信任 SDK 回灌的 identity_key，
+            // 禁用 rowKey 等回退路径，避免误命中其它 SKU/选项相同的行。
+            identityKey = item === null || item === void 0 ? void 0 : item.identity_key;
             if (!(productId === null && Number.isNaN(productVariantId))) {
-              _context2.next = 7;
+              _context2.next = 6;
               break;
             }
             return _context2.abrupt("return");
-          case 7:
-            _context2.prev = 7;
-            _context2.next = 10;
-            return runModuleAction('removeProductFromOrder', {
+          case 6:
+            identity = {
               product_id: productId,
-              product_variant_id: Number.isNaN(productVariantId) ? 0 : productVariantId,
-              identity_key: identityKey
+              product_variant_id: Number.isNaN(productVariantId) ? 0 : productVariantId
+            };
+            if (typeof identityKey === 'string' && identityKey.length > 0) {
+              identity.identity_key = identityKey;
+            }
+            _context2.prev = 8;
+            _context2.next = 11;
+            return runModuleAction('setOrderProductLineNote', identity, String((_item$note = item === null || item === void 0 ? void 0 : item.note) !== null && _item$note !== void 0 ? _item$note : ''));
+          case 11:
+            _context2.next = 13;
+            return refreshViewModel();
+          case 13:
+            _context2.next = 18;
+            break;
+          case 15:
+            _context2.prev = 15;
+            _context2.t0 = _context2["catch"](8);
+            console.error('[scanOrder] setOrderProductLineNote failed', {
+              error: _context2.t0,
+              item: item
+            });
+          case 18:
+            return _context2.abrupt("return");
+          case 21:
+            if (!(type === 'delete')) {
+              _context2.next = 40;
+              break;
+            }
+            _productId = (_ref11 = (_item$product_id2 = item === null || item === void 0 ? void 0 : item.product_id) !== null && _item$product_id2 !== void 0 ? _item$product_id2 : item === null || item === void 0 ? void 0 : item.id) !== null && _ref11 !== void 0 ? _ref11 : null;
+            _productVariantId = Number((_item$product_variant2 = item === null || item === void 0 ? void 0 : item.product_variant_id) !== null && _item$product_variant2 !== void 0 ? _item$product_variant2 : 0);
+            _identityKey = item === null || item === void 0 ? void 0 : item.identity_key;
+            if (!(_productId === null && Number.isNaN(_productVariantId))) {
+              _context2.next = 27;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 27:
+            if (!(typeof _identityKey !== 'string' || _identityKey.length === 0)) {
+              _context2.next = 30;
+              break;
+            }
+            console.error('[scanOrder] removeProductFromOrder skipped: missing identity_key', {
+              item: item
             });
-          case 10:
-            _context2.next = 12;
+            return _context2.abrupt("return");
+          case 30:
+            _context2.prev = 30;
+            _context2.next = 33;
+            return runModuleAction('removeProductFromOrder', {
+              product_id: _productId,
+              product_variant_id: Number.isNaN(_productVariantId) ? 0 : _productVariantId,
+              identity_key: _identityKey
+            });
+          case 33:
+            _context2.next = 35;
             return refreshViewModel();
-          case 12:
-            _context2.next = 17;
+          case 35:
+            _context2.next = 40;
             break;
-          case 14:
-            _context2.prev = 14;
-            _context2.t0 = _context2["catch"](7);
+          case 37:
+            _context2.prev = 37;
+            _context2.t1 = _context2["catch"](30);
             console.error('[scanOrder] removeProductFromOrder failed', {
-              error: _context2.t0,
+              error: _context2.t1,
               item: item
             });
-          case 17:
+          case 40:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[7, 14]]);
+      }, _callee2, null, [[8, 15], [30, 37]]);
     }));
     return function handleCartChange(_x, _x2) {
       return _ref9.apply(this, arguments);
@@ -183,7 +253,7 @@ export default function Cart(props) {
     isHideClearCart: true,
     onChange: handleCartChange
   });
-  var cartSubtotalSection = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SubTotal, {
+  var cartSubtotalSection = /*#__PURE__*/React.createElement(React.Fragment, null, showVoucher ? /*#__PURE__*/React.createElement(VoucherCard, null) : null, /*#__PURE__*/React.createElement(SubTotal, {
     list: subTotalList,
     style: {
       padding: 0
@@ -191,8 +261,9 @@ export default function Cart(props) {
   }), extraContent ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-scan-order-cart-extra-content"
   }, extraContent) : null);
+  var cartBodyClassName = embedded ? 'pisell-scan-order-cart-body pisell-scan-order-cart-body-embedded' : 'pisell-scan-order-cart-body';
   var cartBodyContent = /*#__PURE__*/React.createElement("div", {
-    className: "pisell-scan-order-cart-body"
+    className: cartBodyClassName
   }, cartLineItems, cartSubtotalSection);
   if (embedded) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, cartBodyContent, /*#__PURE__*/React.createElement("div", {

package/es/components/scanOrder/components/Cart/index.less

@@ -118,16 +118,22 @@
   cursor: not-allowed;
 }
 
+/* 移动端：结算内嵌卡 — 与 pisell-scan-order-content-mobile-wrap 的底部留白配合；
+ * 不再在 cart-body 上重复 96px，否则与外层叠加会出现大块空白，sticky 在整页滚动时也会与内容同步位移 */
 .pisell-scan-order-content-mobile-wrap {
-  .pisell-scan-order-cart-body {
-    padding-bottom: 96px;
+  .pisell-scan-order-cart-body-embedded {
+    padding-bottom: 16px;
   }
 
   .pisell-scan-order-cart-embedded-footer {
-    position: sticky;
+    position: fixed;
+    left: 0;
+    right: 0;
     bottom: 0;
-    z-index: 5;
-    padding-bottom: calc(20px + env(safe-area-inset-bottom, 0px));
+    z-index: 28;
+    padding: 12px 16px calc(20px + env(safe-area-inset-bottom, 0px));
+    border-top: 1px solid #eaecf0;
+    background: #fff;
     box-shadow: 0 -4px 10px rgba(16, 24, 40, 0.06);
   }
 }

package/es/components/scanOrder/components/Check/index.js

@@ -8,10 +8,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useMemo, useState } from 'react';
+import React, { useMemo, useState, useCallback, useEffect } from 'react';
 import { Input, message } from 'antd';
 import { locales } from '@pisell/utils';
-import { PisellToast } from '@pisell/materials';
 import Cart from "../Cart";
 import FulfillmentMode from "../FulfillmentMode";
 import ManualPickupRefModal from "../ManualPickupRefModal";
@@ -45,31 +44,28 @@ export default function Check() {
     dineInConfig = _useState8[0],
     setDineInConfig = _useState8[1];
   // 去读 pisellos 内的配置
-  var getConfig = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _otherParams$dineInCo;
-      var otherParams, dineInConfig;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return runModuleAction('getOtherParams');
-          case 2:
-            otherParams = _context.sent;
-            console.log('otherParams >>>>> ', otherParams);
-            dineInConfig = (_otherParams$dineInCo = otherParams === null || otherParams === void 0 ? void 0 : otherParams.dineInConfig) !== null && _otherParams$dineInCo !== void 0 ? _otherParams$dineInCo : {};
-            setDineInConfig(dineInConfig);
-          case 6:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function getConfig() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-  getConfig();
+  var getConfig = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _otherParams$dineInCo;
+    var otherParams, dineInConfig;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return runModuleAction('getOtherParams');
+        case 2:
+          otherParams = _context.sent;
+          console.log('otherParams >>>>> ', otherParams);
+          dineInConfig = (_otherParams$dineInCo = otherParams === null || otherParams === void 0 ? void 0 : otherParams.dineInConfig) !== null && _otherParams$dineInCo !== void 0 ? _otherParams$dineInCo : {};
+          setDineInConfig(dineInConfig);
+        case 6:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), [runModuleAction]);
+  useEffect(function () {
+    getConfig();
+  }, []);
 
   // 是否展示订单级备注
   var isShowOrderNote = useMemo(function () {
@@ -87,54 +83,66 @@ export default function Check() {
   var productsTitle = useMemo(function () {
     return String(locales.getText('pisell2.scan.order.products.title') || 'Products');
   }, []);
+  var showCheckStepEmptyCartTip = function showCheckStepEmptyCartTip() {
+    message.error(locales.getText('pisell2.scan.order.check.cart.empty.tip') || 'Please go back to add products');
+  };
   var doSubmit = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var res, _res$data, _viewModel$summary, _res$data2, _res$data3, _utils$getApp, _app$history, _app$history2, link, app;
+      var items, res, _res$data, _res$data2, _viewModel$summary, _res$data3, _res$data4, _utils$getApp, _app$history, _app$history2, link, app;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context3.prev = 0;
+            items = (viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) || [];
+            if (!(items.length === 0)) {
+              _context3.next = 5;
+              break;
+            }
+            showCheckStepEmptyCartTip();
+            setSubmitting(false);
+            return _context3.abrupt("return");
+          case 5:
+            _context3.prev = 5;
             setSubmitting(true);
-            _context3.next = 4;
+            _context3.next = 9;
             return runModuleAction('updateTempOrderNote', note);
-          case 4:
-            _context3.next = 6;
+          case 9:
+            _context3.next = 11;
             return runModuleAction('submitScanOrder');
-          case 6:
+          case 11:
             res = _context3.sent;
             console.log('submitScanOrder >>>>> ', res);
             // 下单成功：清空步骤缓存（step / gate / entryContext），避免残留影响下次扫码
             clearStepCache();
-            if (!(dineInConfig !== null && dineInConfig !== void 0 && dineInConfig['workflow.require_payment_on_submit'])) {
-              _context3.next = 13;
+            if (!(dineInConfig !== null && dineInConfig !== void 0 && dineInConfig['sale.require_payment_on_submit'] && !isAdditionalOrder)) {
+              _context3.next = 26;
               break;
             }
+            _context3.prev = 15;
+            _context3.next = 18;
+            return runModuleAction('restoreOrder');
+          case 18:
+            _context3.next = 23;
+            break;
+          case 20:
+            _context3.prev = 20;
+            _context3.t0 = _context3["catch"](15);
+            console.warn('[scanOrder] restoreOrder after payment failed', _context3.t0);
+          case 23:
             utils.action({
               type: 'pisell1.payment',
               data: {
                 order_id: res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.order_id,
-                total_amount: viewModel === null || viewModel === void 0 || (_viewModel$summary = viewModel.summary) === null || _viewModel$summary === void 0 ? void 0 : _viewModel$summary.total_amount
+                total_amount: (res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.order_wait_pay_amount) || (viewModel === null || viewModel === void 0 || (_viewModel$summary = viewModel.summary) === null || _viewModel$summary === void 0 ? void 0 : _viewModel$summary.total_amount)
               },
               callback: function () {
                 var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_e) {
                   return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                     while (1) switch (_context2.prev = _context2.next) {
                       case 0:
-                        _context2.prev = 0;
-                        _context2.next = 3;
-                        return runModuleAction('restoreOrder');
-                      case 3:
-                        _context2.next = 8;
-                        break;
-                      case 5:
-                        _context2.prev = 5;
-                        _context2.t0 = _context2["catch"](0);
-                        console.warn('[scanOrder] restoreOrder after payment failed', _context2.t0);
-                      case 8:
                       case "end":
                         return _context2.stop();
                     }
-                  }, _callee2, null, [[0, 5]]);
+                  }, _callee2);
                 }));
                 function callback(_x) {
                   return _callback.apply(this, arguments);
@@ -142,25 +150,25 @@ export default function Check() {
                 return callback;
               }()
             });
-            _context3.next = 25;
+            _context3.next = 38;
             break;
-          case 13:
-            if (!(res !== null && res !== void 0 && (_res$data2 = res.data) !== null && _res$data2 !== void 0 && _res$data2.order_id)) {
-              _context3.next = 25;
+          case 26:
+            if (!(res !== null && res !== void 0 && (_res$data3 = res.data) !== null && _res$data3 !== void 0 && _res$data3.order_id)) {
+              _context3.next = 38;
               break;
             }
-            _context3.prev = 14;
-            _context3.next = 17;
+            _context3.prev = 27;
+            _context3.next = 30;
             return runModuleAction('restoreOrder');
-          case 17:
-            _context3.next = 22;
+          case 30:
+            _context3.next = 35;
             break;
-          case 19:
-            _context3.prev = 19;
-            _context3.t0 = _context3["catch"](14);
-            console.warn('[scanOrder] restoreOrder before redirect failed', _context3.t0);
-          case 22:
-            link = "/order/details?id=".concat(res === null || res === void 0 || (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.order_id);
+          case 32:
+            _context3.prev = 32;
+            _context3.t1 = _context3["catch"](27);
+            console.warn('[scanOrder] restoreOrder before redirect failed', _context3.t1);
+          case 35:
+            link = "/order/details?id=".concat(res === null || res === void 0 || (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.order_id);
             app = utils === null || utils === void 0 || (_utils$getApp = utils.getApp) === null || _utils$getApp === void 0 ? void 0 : _utils$getApp.call(utils);
             if (app !== null && app !== void 0 && (_app$history = app.history) !== null && _app$history !== void 0 && _app$history.replace) {
               app.history.replace(link);
@@ -169,26 +177,26 @@ export default function Check() {
             } else {
               location.replace(link);
             }
-          case 25:
-            _context3.next = 27;
+          case 38:
+            _context3.next = 40;
             return refreshViewModel();
-          case 27:
-            _context3.next = 33;
+          case 40:
+            _context3.next = 46;
             break;
-          case 29:
-            _context3.prev = 29;
-            _context3.t1 = _context3["catch"](0);
-            console.error('[scanOrder] submitScanOrder failed', _context3.t1);
-            message.error((_context3.t1 === null || _context3.t1 === void 0 ? void 0 : _context3.t1.message) || 'Submit order failed');
-          case 33:
-            _context3.prev = 33;
+          case 42:
+            _context3.prev = 42;
+            _context3.t2 = _context3["catch"](5);
+            console.error('[scanOrder] submitScanOrder failed', _context3.t2);
+            message.error((_context3.t2 === null || _context3.t2 === void 0 ? void 0 : _context3.t2.message) || 'Submit order failed');
+          case 46:
+            _context3.prev = 46;
             setSubmitting(false);
-            return _context3.finish(33);
-          case 36:
+            return _context3.finish(46);
+          case 49:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[0, 29, 33, 36], [14, 19]]);
+      }, _callee3, null, [[5, 42, 46, 49], [15, 20], [27, 32]]);
     }));
     return function doSubmit() {
       return _ref2.apply(this, arguments);
@@ -211,10 +219,7 @@ export default function Check() {
               _context4.next = 6;
               break;
             }
-            PisellToast({
-              content: String(locales.getText('pisell2.scan.order.products.empty.tip') || 'Please select products'),
-              duration: 2
-            });
+            showCheckStepEmptyCartTip();
             return _context4.abrupt("return");
           case 6:
             if (!isAdditionalOrder) {