@pisell/private-materials 6.0.24 → 6.1.1

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

@@ -36,7 +36,7 @@ var offline = ['pisell.offline_payment', 'pisell.other.cashmanual', 'pisell.cust
  * @Date: 2024-08-16 10:52
  */
 var PaymentList = function PaymentList(props, ref) {
-  var _props$store2, _props$store4;
+  var _context$appHelper, _props$store2, _props$store4;
   // 支付列表
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -53,6 +53,8 @@ var PaymentList = function PaymentList(props, ref) {
     loading = _useState6[0],
     setLoading = _useState6[1];
   var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    interaction = _context$appHelper$ut.interaction;
 
   // 支付列表, 补充图标 兼容受控方式
   var _paymentList = useMemo(function () {
@@ -139,6 +141,10 @@ var PaymentList = function PaymentList(props, ref) {
     setPaymentList(list);
     return list;
   };
+  var isApp = useMemo(function () {
+    var _interaction$utils, _interaction$utils$is;
+    return interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$is = _interaction$utils.isAppEnv) === null || _interaction$utils$is === void 0 ? void 0 : _interaction$utils$is.call(_interaction$utils);
+  }, []);
 
   /**
    * @title: 唯一初始化
@@ -149,13 +155,13 @@ var PaymentList = function PaymentList(props, ref) {
    * @Date: 2024-08-16 10:53
    */
   var init = function init(list) {
-    var _context$appHelper;
+    var _context$appHelper2;
     // 打开loading
     setLoading(true);
-    var platform = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.constants) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.platform) || 'h5';
+    var platform = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.constants) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.platform) || 'h5';
 
     // 过滤数据
-    var _filterPaymentList = filterPaymentList(list, platform),
+    var _filterPaymentList = filterPaymentList(list, platform, isApp),
       paymentList = _filterPaymentList.paymentList,
       walletPass = _filterPaymentList.walletPass;
 

package/es/components/pay/toC/PaymentList/serve.d.ts

@@ -20,7 +20,7 @@ export declare const getPaymentList: (values: any) => Promise<{
  * @Author: zhiwei.Wang
  * @Date: 2024-08-16 10:57
  */
-export declare const filterPaymentList: (list: any[], platform?: string) => {
+export declare const filterPaymentList: (list: any[], platform: string | undefined, isApp: boolean) => {
     message: string;
     status: string;
     paymentList: any[];

package/es/components/pay/toC/PaymentList/serve.js

@@ -15,7 +15,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { request } from "../../../../utils";
 import { paymentKeys } from "./status";
-import { isWx, isSafari } from '@pisell/utils';
+import { isWx, isIOS } from '@pisell/utils';
 import { paymentTypes, isCustomPayment } from "./status";
 
 /**
@@ -60,6 +60,7 @@ export var getPaymentList = /*#__PURE__*/function () {
  */
 export var filterPaymentList = function filterPaymentList(list) {
   var platform = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'h5';
+  var isApp = arguments.length > 2 ? arguments[2] : undefined;
   var paymentList = _toConsumableArray(list);
   var _paymentKeys = _toConsumableArray(paymentKeys);
 
@@ -77,7 +78,7 @@ export var filterPaymentList = function filterPaymentList(list) {
   // }
 
   // 非微信环境隐藏微信支付
-  if (!isWx()) {
+  if (!isWx() && !isApp) {
     arr = arr.concat(['globepay.wechat.jsapi', 'superpay.wechat.h5']);
   }
 
@@ -92,10 +93,15 @@ export var filterPaymentList = function filterPaymentList(list) {
   // }
 
   // 非IOS 隐藏苹果支付
-  if (!isSafari()) {
+  if (!isIOS()) {
     arr = arr.concat(['mw.apple']);
   }
 
+  // iosApp内不展示谷歌支付
+  if (isIOS() && isApp) {
+    arr = arr.concat(['mw.google']);
+  }
+
   // 删除以上key
   _paymentKeys = _paymentKeys.filter(function (d) {
     return !arr.includes(d);

package/es/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ThreedsLoading: ({ title }: any) => JSX.Element;
 export default ThreedsLoading;

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

@@ -15,6 +15,8 @@ import ThreedsLoading from "../MWCreditCard/TDSPay/ThreedsLoading";
 import { getAliPayUrl } from "./serve";
 import { getPayGroupParamsFromStorage, setPayNumber } from "../../payGroup";
 import "./index.less";
+import useEngineContext from "../../../../../hooks/useEngineContext";
+import { clientPayment } from "../../utils";
 /**
  * @title: 支付宝支付
  * @description:
@@ -23,11 +25,15 @@ import "./index.less";
  * @Date: 2024-08-16 11:18
  */
 var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
+  var _context$appHelper;
   var onChange = props.onChange;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
+  var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    interaction = _context$appHelper$ut.interaction;
 
   /**
    * @title: 初始化
@@ -39,26 +45,37 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
    */
   var init = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+      var _interaction$utils, _interaction$utils$is;
       var payGroup, values, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             payGroup = _ref.payGroup;
-            setOpen(true);
-
             // 交易组
             values = getPayGroupParamsFromStorage(payGroup.order_id);
+            if (!(interaction !== null && interaction !== void 0 && (_interaction$utils = interaction.utils) !== null && _interaction$utils !== void 0 && (_interaction$utils$is = _interaction$utils.isAppEnv) !== null && _interaction$utils$is !== void 0 && _interaction$utils$is.call(_interaction$utils))) {
+              _context.next = 4;
+              break;
+            }
+            return _context.abrupt("return", clientPayment({
+              order_id: payGroup.order_id,
+              type: 'aliPay',
+              values: values,
+              interaction: interaction
+            }));
+          case 4:
+            setOpen(true);
             if (values) {
-              _context.next = 6;
+              _context.next = 8;
               break;
             }
             setOpen(false);
             return _context.abrupt("return");
-          case 6:
-            _context.prev = 6;
-            _context.next = 9;
+          case 8:
+            _context.prev = 8;
+            _context.next = 11;
             return getAliPayUrl(payGroup.order_id, values);
-          case 9:
+          case 11:
             data = _context.sent;
             if (data !== null && data !== void 0 && data.pay_url) {
               // 设置交易号
@@ -69,17 +86,17 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
             } else {
               setOpen(false);
             }
-            _context.next = 16;
+            _context.next = 18;
             break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](6);
+          case 15:
+            _context.prev = 15;
+            _context.t0 = _context["catch"](8);
             setOpen(false);
-          case 16:
+          case 18:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 13]]);
+      }, _callee, null, [[8, 15]]);
     }));
     return function init(_x) {
       return _ref2.apply(this, arguments);

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

@@ -15,6 +15,8 @@ import { getWxPayUrl } from "./serve";
 import { getPayGroupParamsFromStorage, setPayNumber } from "../../payGroup";
 import "./index.less";
 import { locales } from '@pisell/utils';
+import { clientPayment } from "../../utils";
+import useEngineContext from "../../../../../hooks/useEngineContext";
 /**
  * @title: 微信支付
  * @description:
@@ -25,10 +27,14 @@ import { locales } from '@pisell/utils';
  * @Date: 2024-08-16 11:18
  */
 var SuperPayWxPayH5 = function SuperPayWxPayH5(props, ref) {
+  var _context$appHelper;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
+  var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    interaction = _context$appHelper$ut.interaction;
 
   /**
    * @title: 初始化
@@ -40,26 +46,37 @@ var SuperPayWxPayH5 = function SuperPayWxPayH5(props, ref) {
    */
   var init = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+      var _interaction$utils, _interaction$utils$is;
       var payGroup, values, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             payGroup = _ref.payGroup;
-            setOpen(true);
-
             // 获取交易组
             values = getPayGroupParamsFromStorage(payGroup.order_id);
+            if (!(interaction !== null && interaction !== void 0 && (_interaction$utils = interaction.utils) !== null && _interaction$utils !== void 0 && (_interaction$utils$is = _interaction$utils.isAppEnv) !== null && _interaction$utils$is !== void 0 && _interaction$utils$is.call(_interaction$utils))) {
+              _context.next = 4;
+              break;
+            }
+            return _context.abrupt("return", clientPayment({
+              order_id: payGroup.order_id,
+              type: 'wxPay',
+              values: values,
+              interaction: interaction
+            }));
+          case 4:
+            setOpen(true);
             if (values) {
-              _context.next = 6;
+              _context.next = 8;
               break;
             }
             setOpen(false);
             return _context.abrupt("return");
-          case 6:
-            _context.prev = 6;
-            _context.next = 9;
+          case 8:
+            _context.prev = 8;
+            _context.next = 11;
             return getWxPayUrl(payGroup.order_id, values);
-          case 9:
+          case 11:
             data = _context.sent;
             if (data !== null && data !== void 0 && data.pay_url) {
               // 设置交易号
@@ -70,17 +87,17 @@ var SuperPayWxPayH5 = function SuperPayWxPayH5(props, ref) {
             } else {
               setOpen(false);
             }
-            _context.next = 16;
+            _context.next = 18;
             break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](6);
+          case 15:
+            _context.prev = 15;
+            _context.t0 = _context["catch"](8);
             setOpen(false);
-          case 16:
+          case 18:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 13]]);
+      }, _callee, null, [[8, 15]]);
     }));
     return function init(_x) {
       return _ref2.apply(this, arguments);

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

@@ -7,6 +7,9 @@ export interface WalletPassListProps {
     data?: PisellWalletPassCardProps[];
     onChange?: (val: number[], valDetail: PisellWalletPassCardProps[]) => void;
     value?: number[];
+    walletSetting: {
+        name: string;
+    };
 }
 export declare type WalletPassListRef = {
     init: (params: MachineCodeListParams, formatList?: (val: WalletPassDataType[]) => WalletPassDataType[]) => void;

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

@@ -19,7 +19,8 @@ var WalletPassList = /*#__PURE__*/forwardRef(function (props, ref) {
   var title = props.title,
     onChange = props.onChange,
     propsData = props.data,
-    value = props.value;
+    value = props.value,
+    walletSetting = props.walletSetting;
   var _useState = useState(propsData || []),
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
@@ -115,7 +116,7 @@ var WalletPassList = /*#__PURE__*/forwardRef(function (props, ref) {
           color: '#667085'
         }
       }),
-      description: locales.getText('tocPay.text.walletPassEmpty')
+      description: locales.getText('tocPay.text.walletPassEmpty')(walletSetting === null || walletSetting === void 0 ? void 0 : walletSetting.name)
     });
   }, []);
   return /*#__PURE__*/React.createElement(PisellLoading, {

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import { WalletPassDataType } from './serve';
 import { PayGroup } from '../../model';
+import './index.less';
 export interface WalletPassRef {
     init: (val?: PayGroup & {
         customer_id?: number;
@@ -15,6 +16,10 @@ export interface WalletPassProps {
         cards: WalletPassDataType[];
         amount: number;
     };
+    walletSetting: {
+        name: string;
+        popup_status: 0 | 1;
+    };
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<WalletPassProps & React.RefAttributes<WalletPassRef>>>;
 export default _default;

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

@@ -6,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); }
@@ -16,16 +21,19 @@ import React, { forwardRef, memo, useEffect, useImperativeHandle, useMemo, useRe
 import { PisellModal, PisellText, PisellToast } from '@pisell/materials';
 import { locales, uniqueByKey } from '@pisell/utils';
 import { useMemoizedFn } from 'ahooks';
+import { InfoCircleOutlined } from '@ant-design/icons';
 import MultiModeSearch from "./MultiModeSearch";
 import List from "./List";
 import { searchMachineCodeList } from "./serve";
 import { formatMachineCodeServer2CardList } from "./utils";
 import { calcWalletPassListAmount, formatWalletPassList2PreparePayments } from "../../utils";
+import "./index.less";
 var Amount = PisellText.Amount;
 var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
   var _searchSelectData$ids;
   var onWalletPassChange = props.onWalletPassChange,
-    walletPass = props.walletPass;
+    walletPass = props.walletPass,
+    walletSetting = props.walletSetting;
 
   /** 当前 walletPass信息 弹窗操作时都在内部进行，点击 redeem时同步到外层 */
   var _useState = useState(walletPass),
@@ -43,26 +51,32 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     searchOpen = _useState6[0],
     setSearchOpen = _useState6[1];
 
-  /** 当前order信息 */
-  var _useState7 = useState(null),
+  /** 搜索后添加的walletPass */
+  var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    order = _useState8[0],
-    setOrder = _useState8[1];
+    addList = _useState8[0],
+    setAddList = _useState8[1];
 
-  /** 当前搜索modal内list数据 */
-  var _useState9 = useState([]),
+  /** 当前order信息 */
+  var _useState9 = useState(null),
     _useState10 = _slicedToArray(_useState9, 2),
-    searchData = _useState10[0],
-    setSearchData = _useState10[1];
+    order = _useState10[0],
+    setOrder = _useState10[1];
+
+  /** 当前搜索modal内list数据 */
+  var _useState11 = useState([]),
+    _useState12 = _slicedToArray(_useState11, 2),
+    searchData = _useState12[0],
+    setSearchData = _useState12[1];
 
   /** 当前搜索modal内选中数据 */
-  var _useState11 = useState({
+  var _useState13 = useState({
       ids: [],
       details: []
     }),
-    _useState12 = _slicedToArray(_useState11, 2),
-    searchSelectData = _useState12[0],
-    setSearchSelectData = _useState12[1];
+    _useState14 = _slicedToArray(_useState13, 2),
+    searchSelectData = _useState14[0],
+    setSearchSelectData = _useState14[1];
 
   /** 是否默认选中 搜索时默认选中 列表select变更更新列表时不默认选中 */
   var isAutoSelect = useRef(false);
@@ -106,8 +120,17 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     })) || [];
   }, [walletPassSelectCards]);
   var otherCustomerWalletPassList = useMemo(function () {
-    return formatMachineCodeServer2CardList(otherCustomerWalletPass, selectValue);
-  }, [otherCustomerWalletPass, selectValue]);
+    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;
@@ -116,11 +139,25 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
         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'
+        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) {
-        return [].concat(_toConsumableArray(currentCustomerWalletPass || []), _toConsumableArray(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);
+        });
       });
     }
   });
@@ -241,6 +278,11 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var handleSelectOk = function handleSelectOk() {
     changeWalletPass(uniqueByKey([].concat(_toConsumableArray(walletPassSelectCards || []), _toConsumableArray(searchSelectData.details)), 'id'));
+    setAddList(function (prevState) {
+      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);
+      });
+    });
     handleSearchModalClose();
   };
   var handleAddChange = useMemoizedFn(function (val, details) {
@@ -288,7 +330,7 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     handleSelectChange(val, valDetail, 'current');
   });
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PisellModal, {
-    title: /*#__PURE__*/React.createElement("div", null, locales.getText('tocPay.text.walletPass')),
+    title: /*#__PURE__*/React.createElement("div", null, walletSetting.name),
     open: open,
     onCancel: function onCancel() {
       return handleWalletClose();
@@ -306,13 +348,23 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   }, /*#__PURE__*/React.createElement(MultiModeSearch, {
     onChange: handleSearch
-  }), otherCustomerWalletPass.length > 0 && /*#__PURE__*/React.createElement(List, {
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "wallet-pass-modal-multi-selection-available"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "wallet-pass-modal-multi-selection-available-title"
+  }, /*#__PURE__*/React.createElement(InfoCircleOutlined, {
+    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))), otherCustomerWalletPassList.length > 0 && /*#__PURE__*/React.createElement(List, {
+    walletSetting: walletSetting,
     data: otherCustomerWalletPassList,
     title: locales.getText('tocPay.text.couponCodesAdded'),
     onChange: handleOtherChange,
     value: selectValue
   }), /*#__PURE__*/React.createElement(List, {
-    title: locales.getText('tocPay.text.walletPass'),
+    walletSetting: walletSetting,
+    title: walletSetting.name,
     onChange: handleCurrentChange,
     ref: listRef,
     value: selectValue
@@ -336,6 +388,7 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
       marginTop: 24
     }
   }, /*#__PURE__*/React.createElement(List, {
+    walletSetting: walletSetting,
     data: searchData,
     value: searchSelectData.ids,
     onChange: handleAddChange

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

@@ -0,0 +1,30 @@
+.wallet-pass-modal-multi-selection-available {
+  border-radius: 10px;
+  background: #edf4ff;
+  display: flex;
+  padding: 12px 20px;
+  flex-direction: column;
+  align-items: flex-start;
+  margin-top: 20px;
+  .wallet-pass-modal-multi-selection-available-title {
+    color: var(--Color, #40484f);
+    font-size: 12px;
+    font-weight: 600;
+    line-height: 22px; /* 183.333% */
+    display: flex;
+    align-items: center;
+    margin-bottom: 4px;
+
+    .wallet-pass-modal-multi-selection-available-title-icon {
+        color: #1E1E1E;
+        margin-right: 8px;
+        font-size: 16px;
+    }
+  }
+  .wallet-pass-modal-multi-selection-available-desc {
+    color: var(--Color, #40484f);
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 16px; /* 133.333% */
+  }
+}

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

@@ -8,6 +8,7 @@ export declare type MachineCodeListParams = {
     }[];
     filter_prepare_wallet_pass: 1 | 0;
     sale_channel: string;
+    other_exact_codes?: string[];
 };
 export declare type WalletPassDataType = {
     id: number;
@@ -33,6 +34,7 @@ export declare type WalletPassDataType = {
     expire_time: string;
     available_max_par_value: string;
     available_max_amount: string;
+    recommended_usage_amount: string;
     custom_expire_status: number;
     wallet_pass_usage_unit: WalletPassUsageUnit;
     custom_order_deduct_exhausted: number;

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

@@ -1,5 +1,6 @@
 import { formatDate, locales } from '@pisell/utils';
 import { globalConfig } from '@pisell/materials';
+import { getAvailableMaxAmount } from "../../utils";
 var voucherTime = function voucherTime(data) {
   var config = globalConfig.getConfig();
   if (data !== null && data !== void 0 && data.expire_date) {
@@ -16,7 +17,7 @@ export var formatMachineCodeServer2CardList = function formatMachineCodeServer2C
       name: item.product_name,
       storeName: (_item$shop = item.shop) === null || _item$shop === void 0 ? void 0 : _item$shop.name,
       balance: item.balance_par_value,
-      redeem: item.available_max_amount,
+      redeem: getAvailableMaxAmount(item),
       showRedeem: selectId.includes(item.id),
       showBalanceSymbol: item.tag !== 'point_card',
       // balanceTitle: item.tag !== 'point_card' ? "" : "",

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

@@ -7,7 +7,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-import React, { useImperativeHandle, forwardRef, useRef } from 'react';
+import React, { useImperativeHandle, forwardRef, useRef, useEffect } from 'react';
 import MWCreditCard from "./MWCreditCard";
 import SuperPayAliPayH5 from "./SuperPayAliPayH5";
 import StripePay from "./StripePay";
@@ -18,7 +18,7 @@ import CustomPayment from "./CustomPayment";
 import { isCustomPayment } from "../PaymentList/status";
 import CashManual from "./CashManual";
 import GooglePay from "./GooglePay";
-import { removePayGroupFromStorage, syncPayGroupToStorage } from "../payGroup";
+import { removePayGroupFromStorage, setPayNumber, syncPayGroupToStorage } from "../payGroup";
 import ApplePay from "./ApplePay";
 import GlobePayAliPayH5 from "./GlobePayAliPayH5";
 import GlobePayPaypalH5 from "./GlobePayPaypalH5";
@@ -26,6 +26,8 @@ import GlobePayWxH5 from "./GlobePayWxH5";
 import GlobePayQrcode from "./GlobePayQrcode";
 import { walletPassPay } from "./WalletPass/serve";
 import { formatWalletPassParams } from "../utils";
+import useEngineContext from "../../../../hooks/useEngineContext";
+import { isJson } from "@pisell/utils";
 var isOfflinePayment = function isOfflinePayment(type) {
   if (isCustomPayment(type)) {
     return true;
@@ -33,6 +35,7 @@ var isOfflinePayment = function isOfflinePayment(type) {
   return ['pisell.bank_deposit', 'pisell.offline_payment', 'pisell.other.cashmanual', 'pisell.custom_bank_transfer'].includes(type);
 };
 var PaymentMethods = function PaymentMethods(props, ref) {
+  var _context$appHelper, _interaction$utils, _interaction$utils$is;
   var MWCreditCardRef = useRef(null);
   var SuperPayAliPayH5Ref = useRef(null);
   var StripePayRef = useRef(null);
@@ -47,6 +50,9 @@ var PaymentMethods = function PaymentMethods(props, ref) {
   var GlobePayPaypalH5Ref = useRef(null);
   var GlobePayWxH5Ref = useRef(null);
   var GlobePayQrcodeRef = useRef(null);
+  var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    interaction = _context$appHelper$ut.interaction;
   var init = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
       var _payGroup$walletPass;
@@ -112,6 +118,27 @@ var PaymentMethods = function PaymentMethods(props, ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+  console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$is = _interaction$utils.isAppEnv) === null || _interaction$utils$is === void 0 ? void 0 : _interaction$utils$is.call(_interaction$utils), interaction, context);
+  useEffect(function () {
+    var _interaction$utils2, _interaction$utils2$i, _interaction$utils3, _interaction$utils3$i;
+    console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$i = _interaction$utils2.isAppEnv) === null || _interaction$utils2$i === void 0 ? void 0 : _interaction$utils2$i.call(_interaction$utils2));
+    if (interaction !== null && interaction !== void 0 && (_interaction$utils3 = interaction.utils) !== null && _interaction$utils3 !== void 0 && (_interaction$utils3$i = _interaction$utils3.isAppEnv) !== null && _interaction$utils3$i !== void 0 && _interaction$utils3$i.call(_interaction$utils3)) {
+      interaction.utils.mountFunction('global', 'paymentResult', function (strResult) {
+        console.log('paymentResult', strResult);
+        if (!isJson(strResult)) return;
+        var result = JSON.parse(strResult);
+        var type = result.type,
+          pay_number = result.pay_number,
+          order_id = result.order_id;
+        if (type && order_id && pay_number) {
+          setPayNumber(order_id, pay_number);
+        }
+        props.payCallback({
+          key: 'success'
+        });
+      });
+    }
+  }, []);
   var onPayByType = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
       var type, payGroup, _ApplePayRef$current, _GooglePayRef$current, _MWCreditCardRef$curr, _SuperPayAliPayH5Ref$, _SuperPayWxPayH5Ref$c, _StripePayRef$current, _OfflinePaymentRef$cu, _BankDepositRef$curre, _CashManualRef$curren, _GlobePayAliPayH5Ref$, _GlobePayPaypalH5Ref$, _GlobePayWxH5Ref$curr, _GlobePayQrcodeRef$cu, _CustomPaymentRef$cur;