@pisell/private-materials 6.6.47 → 6.6.49

package/es/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -301,8 +301,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | "huifu" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/es/components/pay/toC/PaymentMethods/WalletPass/index.d.ts

@@ -15,16 +15,11 @@ export interface WalletPassProps {
     walletPass: {
         cards: WalletPassDataType[];
         amount: number;
-        recommended?: WalletPassDataType[];
-        transformList?: WalletPassDataType[];
-        noApplicableVoucher?: WalletPassDataType[];
     };
     walletSetting: {
         name: string;
         popup_status: 0 | 1;
     };
-    orderDetail: any;
-    total_amount: number;
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<WalletPassProps & React.RefAttributes<WalletPassRef>>>;
 export default _default;

package/es/components/pay/toC/PaymentMethods/WalletPass/index.js

@@ -1,9 +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 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 _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); }); }; }
@@ -11,6 +6,11 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 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 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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); }
@@ -19,7 +19,6 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { forwardRef, memo, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { PisellModal, PisellText, PisellToast } from '@pisell/materials';
-// @ts-ignore
 import { locales, uniqueByKey } from '@pisell/utils';
 import { useMemoizedFn } from 'ahooks';
 import { InfoCircleOutlined } from '@ant-design/icons';
@@ -28,168 +27,149 @@ import MultiModeSearch from "./MultiModeSearch";
 import List from "./List";
 import { searchMachineCodeList, searchWalletCode } from "./serve";
 import { formatMachineCodeServer2CardList, getIsWalletCode } from "./utils";
-import { formatWalletPassList2PreparePayments } from "../../utils";
+import { calcWalletPassListAmount, formatWalletPassList2PreparePayments } from "../../utils";
 import "./index.less";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 var Amount = PisellText.Amount;
 var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _context$appHelper, _context$appHelper2, _context$appHelper2$g, _searchSelectData$ids;
+  var _context$appHelper, _context$appHelper$ge, _searchSelectData$ids;
   var onWalletPassChange = props.onWalletPassChange,
     walletPass = props.walletPass,
-    walletSetting = props.walletSetting,
-    orderDetail = props.orderDetail,
-    total_amount = props.total_amount;
+    walletSetting = props.walletSetting;
   var context = useEngineContext();
-  var _ref = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
-    walletPassEvaluator = _ref.walletPassEvaluator;
-
-  // detail是product的列表
-  var detail = orderDetail.detail;
-  var isWalletCode = context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.businessUtils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getAppByModal) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.call(_context$appHelper2, 'wallet');
-  var recommended = walletPass.cards,
-    transformList = walletPass.transformList,
-    noApplicableVoucher = walletPass.noApplicableVoucher;
-
-  /** 当前选中的券ID列表（按选中顺序） */
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    selectedVoucherIds = _useState2[0],
-    setSelectedVoucherIds = _useState2[1];
+  var isWalletCode = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.businessUtils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getAppByModal) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'wallet');
 
   /** 当前 walletPass信息 弹窗操作时都在内部进行，点击 redeem时同步到外层 */
-  var _useState3 = useState(walletPass),
+  var _useState = useState(walletPass),
+    _useState2 = _slicedToArray(_useState, 2),
+    currentWalletPass = _useState2[0],
+    setCurrentWalletPass = _useState2[1];
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    currentWalletPass = _useState4[0],
-    setCurrentWalletPass = _useState4[1];
+    loading = _useState4[0],
+    setLoading = _useState4[1];
   var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    loading = _useState6[0],
-    setLoading = _useState6[1];
-  var _useState7 = useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    open = _useState8[0],
-    setOpen = _useState8[1];
+    open = _useState6[0],
+    setOpen = _useState6[1];
 
   /** 搜索 modal */
-  var _useState9 = useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    searchOpen = _useState10[0],
-    setSearchOpen = _useState10[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    searchOpen = _useState8[0],
+    setSearchOpen = _useState8[1];
 
   /** 搜索后添加的walletPass */
-  var _useState11 = useState([]),
-    _useState12 = _slicedToArray(_useState11, 2),
-    addList = _useState12[0],
-    setAddList = _useState12[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    addList = _useState10[0],
+    setAddList = _useState10[1];
 
   /** 当前order信息 */
-  var _useState13 = useState(null),
-    _useState14 = _slicedToArray(_useState13, 2),
-    order = _useState14[0],
-    setOrder = _useState14[1];
+  var _useState11 = useState(null),
+    _useState12 = _slicedToArray(_useState11, 2),
+    order = _useState12[0],
+    setOrder = _useState12[1];
 
   /** 当前搜索modal内list数据 */
-  var _useState15 = useState([]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    searchData = _useState16[0],
-    setSearchData = _useState16[1];
+  var _useState13 = useState([]),
+    _useState14 = _slicedToArray(_useState13, 2),
+    searchData = _useState14[0],
+    setSearchData = _useState14[1];
 
   /** 当前搜索modal内选中数据 */
-  var _useState17 = useState({
+  var _useState15 = useState({
       ids: [],
       details: []
     }),
-    _useState18 = _slicedToArray(_useState17, 2),
-    searchSelectData = _useState18[0],
-    setSearchSelectData = _useState18[1];
+    _useState16 = _slicedToArray(_useState15, 2),
+    searchSelectData = _useState16[0],
+    setSearchSelectData = _useState16[1];
 
   /** 是否默认选中 搜索时默认选中 列表select变更更新列表时不默认选中 */
   var isAutoSelect = useRef(false);
+  var listRef = useRef(null);
 
   /** 当前搜索框搜索值 */
   var searchValRef = useRef(null);
   var pinVerifyModalRef = useRef(null);
+  var _ref = currentWalletPass || {},
+    walletPassSelectCards = _ref.cards,
+    amount = _ref.amount;
 
-  // 合并计算数据源：transformList + addList
-  var allVouchersForCalculation = useMemo(function () {
-    return [].concat(_toConsumableArray(transformList || []), _toConsumableArray(addList || []));
-  }, [transformList, addList]);
-
-  // 根据选中的券ID获取选中的券对象列表（保持选中顺序）
-  var selectedVouchers = useMemo(function () {
-    return selectedVoucherIds.map(function (id) {
-      return allVouchersForCalculation.find(function (v) {
-        return v.id === id;
-      });
-    }).filter(Boolean);
-  }, [selectedVoucherIds, allVouchersForCalculation]);
-
-  // 计算展示列表和当前券的详细信息
+  /**
+   * currentCustomerWalletPass 当前用户walletPass
+   * otherCustomerWalletPass 手动搜索添加的walletPass
+   */
   var _useMemo = useMemo(function () {
-      if (!walletPassEvaluator || !allVouchersForCalculation.length || !(order !== null && order !== void 0 && order.total_amount)) {
-        return {
-          displayVouchers: [].concat(_toConsumableArray(transformList || []), _toConsumableArray(noApplicableVoucher || [])),
-          displayOtherVouchers: addList || [],
-          selectedWithDetails: [],
-          totalDeduction: 0
-        };
-      }
-
-      // 如果没有选中任何券，返回初始状态
-      if (selectedVouchers.length === 0) {
-        return {
-          displayVouchers: [].concat(_toConsumableArray(transformList || []), _toConsumableArray(noApplicableVoucher || [])),
-          displayOtherVouchers: addList || [],
-          selectedWithDetails: [],
-          totalDeduction: 0
-        };
-      }
-
-      // 有选中的券，重新计算（基于 transformList + addList）
-      var result = walletPassEvaluator.recalculateVouchers(allVouchersForCalculation, selectedVouchers, order.total_amount, detail || []);
-
-      // 分离当前客户的券和其他客户的券
-      var currentCustomerVouchers = [];
-      var otherCustomerVouchers = [];
-      result.allWithUpdatedStatus.forEach(function (voucher) {
-        if (voucher.customer_id === (order === null || order === void 0 ? void 0 : order.customer_id)) {
-          currentCustomerVouchers.push(voucher);
+      var current = [];
+      var other = [];
+      (walletPassSelectCards || []).forEach(function (item) {
+        if (item.customer_id === (order === null || order === void 0 ? void 0 : order.customer_id)) {
+          current.push(item);
         } else {
-          otherCustomerVouchers.push(voucher);
+          other.push(item);
         }
       });
-      return {
-        displayVouchers: [].concat(currentCustomerVouchers, _toConsumableArray(noApplicableVoucher || [])),
-        displayOtherVouchers: otherCustomerVouchers,
-        selectedWithDetails: result.selectedWithDetails,
-        totalDeduction: result.selectedWithDetails.reduce(function (sum, v) {
-          return sum + (v.actualDeduction || 0);
-        }, 0)
-      };
-    }, [selectedVouchers, allVouchersForCalculation, transformList, addList, noApplicableVoucher, order === null || order === void 0 ? void 0 : order.total_amount, order === null || order === void 0 ? void 0 : order.customer_id, detail, walletPassEvaluator]),
-    displayVouchers = _useMemo.displayVouchers,
-    displayOtherVouchers = _useMemo.displayOtherVouchers,
-    selectedWithDetails = _useMemo.selectedWithDetails,
-    totalDeduction = _useMemo.totalDeduction;
+      return [current, other];
+    }, [walletPassSelectCards, order === null || order === void 0 ? void 0 : order.customer_id]),
+    _useMemo2 = _slicedToArray(_useMemo, 2),
+    currentCustomerWalletPass = _useMemo2[0],
+    otherCustomerWalletPass = _useMemo2[1];
 
   // 基于选择的 walletPassCard转换接口所需prepare_payments参数
   var prepare_payments = useMemo(function () {
-    return formatWalletPassList2PreparePayments(uniqueByKey((selectedWithDetails || []).concat(searchSelectData.details), 'id'));
-  }, [selectedWithDetails, searchSelectData]);
+    return formatWalletPassList2PreparePayments(uniqueByKey((walletPassSelectCards || []).concat(searchSelectData.details), 'id'));
+  }, [walletPassSelectCards, searchSelectData]);
 
   // 当前列表选中id
   var selectValue = useMemo(function () {
-    return selectedVoucherIds;
-  }, [selectedVoucherIds]);
-
-  // 初始化时设置默认选中的券
-  useEffect(function () {
-    if (recommended && recommended.length > 0) {
-      setSelectedVoucherIds(recommended.map(function (v) {
-        return v.id;
-      }));
+    return (walletPassSelectCards === null || walletPassSelectCards === void 0 ? void 0 : walletPassSelectCards.map(function (item) {
+      return item.id;
+    })) || [];
+  }, [walletPassSelectCards]);
+  var otherCustomerWalletPassList = useMemo(function () {
+    return formatMachineCodeServer2CardList(addList, selectValue);
+  }, [addList, selectValue]);
+  var other_exact_codes = useMemo(function () {
+    var codes = [];
+    addList.forEach(function (item) {
+      if (!selectValue.includes(item.id)) {
+        codes.push(item.code);
+      }
+    });
+    return codes;
+  }, [addList, selectValue]);
+  var refreshList = useMemoizedFn(function () {
+    if (order !== null && order !== void 0 && order.order_id && order !== null && order !== void 0 && order.customer_id) {
+      var _listRef$current, _order$_order;
+      (_listRef$current = listRef.current) === null || _listRef$current === void 0 || _listRef$current.init({
+        order_id: order.order_id,
+        available: 2,
+        prepare_payments: prepare_payments,
+        filter_prepare_wallet_pass: 1,
+        sale_channel: ((_order$_order = order._order) === null || _order$_order === void 0 ? void 0 : _order$_order.sale_channel) || 'online-store',
+        other_exact_codes: other_exact_codes
+      },
+      // 已选择的卡片接口中不会返回，所以追加进入列表
+      function (val) {
+        var idMap = val.reduce(function (pre, cur) {
+          return _objectSpread(_objectSpread({}, pre), {}, _defineProperty({}, cur.id, cur));
+        }, {});
+        setAddList(function (prevState) {
+          return prevState.map(function (item) {
+            if (idMap[item.id]) {
+              return idMap[item.id];
+            }
+            return item;
+          });
+        });
+        return [].concat(_toConsumableArray(currentCustomerWalletPass || []), _toConsumableArray(val)).filter(function (item) {
+          return !(order !== null && order !== void 0 && order.customer_id) || item.customer_id === (order === null || order === void 0 ? void 0 : order.customer_id);
+        });
+      });
     }
-  }, [recommended]);
+  });
 
   /**
    *  搜索结果list弹窗列表选中发生变更时 重新获取接口
@@ -213,12 +193,9 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
             setOrder(res);
             setOpen(true);
             setCurrentWalletPass(walletPass);
-            // 设置初始选中的推荐券
-            if (recommended && recommended.length > 0) {
-              setSelectedVoucherIds(recommended.map(function (v) {
-                return v.id;
-              }));
-            }
+            setTimeout(function () {
+              refreshList();
+            });
           case 6:
           case "end":
             return _context.stop();
@@ -236,7 +213,7 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
    */
   var searchList = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3, isSelectChange) {
-      var code, customer_pin_key, _order$_order, baseResult, result;
+      var code, customer_pin_key, _order$_order2, result;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -255,12 +232,12 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
               code: code,
               prepare_payments: prepare_payments,
               // filter_prepare_wallet_pass: 1,
-              sale_channel: ((_order$_order = order._order) === null || _order$_order === void 0 ? void 0 : _order$_order.sale_channel) || 'online-store',
+              sale_channel: ((_order$_order2 = order._order) === null || _order$_order2 === void 0 ? void 0 : _order$_order2.sale_channel) || 'online-store',
               customer_pin_key: customer_pin_key
             });
           case 7:
-            baseResult = _context2.sent;
-            if (baseResult) {
+            result = _context2.sent;
+            if (result) {
               _context2.next = 11;
               break;
             }
@@ -277,11 +254,6 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
             }
             return _context2.abrupt("return");
           case 13:
-            result = walletPassEvaluator.searchVoucherFormat({
-              vouchers: baseResult,
-              orderTotalAmount: order.total_amount,
-              products: detail
-            });
             setSearchData(formatMachineCodeServer2CardList([].concat(_toConsumableArray(searchSelectData.details), _toConsumableArray(result)), searchSelectData.ids));
             if (result.length) {
               // 如果搜索结果只有一个并且可用，则直接选中
@@ -297,15 +269,15 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
                 customer_pin_key: customer_pin_key
               };
             }
-          case 16:
-            _context2.prev = 16;
+          case 15:
+            _context2.prev = 15;
             setLoading(false);
-            return _context2.finish(16);
-          case 19:
+            return _context2.finish(15);
+          case 18:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[4,, 16, 19]]);
+      }, _callee2, null, [[4,, 15, 18]]);
     }));
     return function searchList(_x2, _x3) {
       return _ref4.apply(this, arguments);
@@ -389,19 +361,12 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     });
   };
   var handleSelectOk = function handleSelectOk() {
-    // 将搜索选中的券添加到 addList（只添加非当前客户的券）
-    var otherCustomerSearchVouchers = searchSelectData.details.filter(function (item) {
-      return item.customer_id !== (order === null || order === void 0 ? void 0 : order.customer_id);
-    });
+    changeWalletPass(uniqueByKey([].concat(_toConsumableArray(walletPassSelectCards || []), _toConsumableArray(searchSelectData.details)), 'id'));
     setAddList(function (prevState) {
-      return uniqueByKey([].concat(_toConsumableArray(prevState), _toConsumableArray(otherCustomerSearchVouchers)), 'id');
-    });
-
-    // 更新选中的券ID列表（包括所有搜索选中的券）
-    var newSelectedIds = uniqueByKey([].concat(_toConsumableArray(selectedWithDetails || []), _toConsumableArray(searchSelectData.details)), 'id').map(function (v) {
-      return v.id;
+      return uniqueByKey([].concat(_toConsumableArray(prevState), _toConsumableArray(searchSelectData.details)), 'id').filter(function (item) {
+        return !(order !== null && order !== void 0 && order.customer_id) || item.customer_id !== (order === null || order === void 0 ? void 0 : order.customer_id);
+      });
     });
-    setSelectedVoucherIds(newSelectedIds);
     handleSearchModalClose();
   };
   var handleAddChange = useMemoizedFn(function (val, details) {
@@ -413,15 +378,29 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
       })
     });
   });
+  var changeWalletPass = function changeWalletPass(cards) {
+    setCurrentWalletPass === null || setCurrentWalletPass === void 0 || setCurrentWalletPass({
+      cards: cards,
+      amount: calcWalletPassListAmount(cards)
+    });
+    setTimeout(function () {
+      refreshList();
+    });
+  };
   var handleSelectChange = function handleSelectChange(val, details, type) {
-    // 更新选中的券ID列表
-    setSelectedVoucherIds(val);
+    var cards = details.map(function (item) {
+      return item.originData;
+    });
+    // 更新时 把当前客户value和其他客户value合并
+    if (type === 'other') {
+      cards = currentCustomerWalletPass.concat(cards);
+    } else if (type === 'current') {
+      cards = otherCustomerWalletPass.concat(cards);
+    }
+    changeWalletPass(cards);
   };
   var handleRedeem = function handleRedeem() {
-    onWalletPassChange === null || onWalletPassChange === void 0 || onWalletPassChange(_objectSpread(_objectSpread({}, currentWalletPass), {}, {
-      cards: selectedWithDetails,
-      amount: totalDeduction
-    }));
+    onWalletPassChange === null || onWalletPassChange === void 0 || onWalletPassChange(currentWalletPass);
     setOpen(false);
   };
   var handleWalletClose = function handleWalletClose() {
@@ -443,7 +422,7 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     cancelVisible: false,
     destroyOnClose: true,
     okText: /*#__PURE__*/React.createElement("div", null, locales.getText('tocPay.text.redeem'), " ", /*#__PURE__*/React.createElement(Amount, {
-      value: totalDeduction
+      value: amount
     })),
     onOk: handleRedeem
   }, /*#__PURE__*/React.createElement("div", {
@@ -461,9 +440,9 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     className: "wallet-pass-modal-multi-selection-available-title-icon"
   }), locales.getText('tocPay.text.multipleSelectionAvailable')), /*#__PURE__*/React.createElement("div", {
     className: "wallet-pass-modal-multi-selection-available-desc"
-  }, locales.getText('tocPay.text.youCanSelectMultipleWalletPassesToCombineForPayment')(walletSetting.name))), displayOtherVouchers.length > 0 && /*#__PURE__*/React.createElement(List, {
+  }, locales.getText('tocPay.text.youCanSelectMultipleWalletPassesToCombineForPayment')(walletSetting.name))), otherCustomerWalletPassList.length > 0 && /*#__PURE__*/React.createElement(List, {
     walletSetting: walletSetting,
-    data: formatMachineCodeServer2CardList(displayOtherVouchers, selectValue),
+    data: otherCustomerWalletPassList,
     title: locales.getText('tocPay.text.couponCodesAdded'),
     onChange: handleOtherChange,
     value: selectValue,
@@ -473,9 +452,9 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     walletSetting: walletSetting,
     title: walletSetting.name,
     onChange: handleCurrentChange,
-    data: formatMachineCodeServer2CardList(displayVouchers, selectValue),
+    ref: listRef,
     value: selectValue,
-    loading: loading
+    onLoadingChange: setLoading
   }))), /*#__PURE__*/React.createElement(PisellModal, {
     title: /*#__PURE__*/React.createElement("div", null, locales.getText('tocPay.text.searchResult')),
     mobileModalHeight: '90%',

package/es/components/pay/toC/PaymentMethods/WalletPass/serve.d.ts

@@ -56,12 +56,6 @@ export declare type WalletPassDataType = {
     metadata?: {
         validity_type: string;
     };
-    /** 前端计算 可用最大金额 */
-    _available_max_amount?: number;
-    /** 前端计算 统一可用状态 */
-    _unified_available_status?: 0 | 1;
-    /** 前端计算 禁用原因 */
-    reason?: string;
 };
 declare type Shop = {
     id: number;

package/es/components/pay/toC/PaymentMethods/WalletPass/utils.js

@@ -1,4 +1,4 @@
-import { formatDate, isNumber, locales } from '@pisell/utils';
+import { formatDate, locales } from '@pisell/utils';
 import { globalConfig } from '@pisell/materials';
 import { getAvailableMaxAmount } from "../../utils";
 var voucherTime = function voucherTime(data) {
@@ -25,8 +25,8 @@ export var formatMachineCodeServer2CardList = function formatMachineCodeServer2C
       showDetail: false,
       showQrCode: false,
       code: item.code,
-      disabled: isNumber(item._unified_available_status) ? !item._unified_available_status : !item.unified_available_status,
-      disabledReason: isNumber(item._unified_available_status) ? item.reason : (_item$unified_message = item.unified_messages) === null || _item$unified_message === void 0 ? void 0 : _item$unified_message.title,
+      disabled: !item.unified_available_status,
+      disabledReason: (_item$unified_message = item.unified_messages) === null || _item$unified_message === void 0 ? void 0 : _item$unified_message.title,
       cover: (_item$product = item.product) === null || _item$product === void 0 ? void 0 : _item$product.cover,
       qrCode: item.code,
       validDate: voucherTime(item),

package/es/components/pay/toC/WalletPassBlock/index.js

@@ -163,9 +163,7 @@ var WalletPassBlock = function WalletPassBlock(props, ref) {
     ref: walletPassRef,
     walletSetting: walletSetting,
     onWalletPassChange: onWalletPassChange,
-    walletPass: payGroup === null || payGroup === void 0 ? void 0 : payGroup.walletPass,
-    orderDetail: payGroup === null || payGroup === void 0 ? void 0 : payGroup.orderDetail,
-    total_amount: payGroup === null || payGroup === void 0 ? void 0 : payGroup.total_amount
+    walletPass: payGroup === null || payGroup === void 0 ? void 0 : payGroup.walletPass
   }), /*#__PURE__*/React.createElement(WalletAvailable, {
     ref: walletAvailableRef,
     walletSetting: walletSetting,