@pisell/private-materials 6.11.17 → 6.11.19

package/es/components/checkout/hooks/useWalletPass.js

@@ -550,6 +550,7 @@ export var useWalletPass = function useWalletPass(props) {
         title: 'useWalletPass_onOrderCreated onSelectChange 开始调用',
         metadata: {}
       });
+
       // 设置默认选中钱包
       onSelectChange === null || onSelectChange === void 0 || onSelectChange(_select);
     } else {
@@ -691,14 +692,19 @@ export var useWalletPass = function useWalletPass(props) {
   // 纯粹的通知函数，将选中的券详情通知给外部
   var notifySelectChange = useMemoizedFn(function (selectedDetails) {
     var prepare_payments = paymentModule.wallet.formatWalletPassList2PreparePayments(selectedDetails);
-    var select = prepare_payments.map(function (item) {
-      return {
-        voucher_id: item.voucher_id,
-        amount: item.amount,
-        code: item.tag,
-        wallet_pass_usage_unit: item.wallet_pass_usage_unit,
-        wallet_pass_use_value: item.wallet_pass_use_value
-      };
+    var select = [];
+    prepare_payments.forEach(function (item) {
+      if (item.amount && select.every(function (s) {
+        return s.voucher_id !== item.voucher_id;
+      })) {
+        select.push({
+          voucher_id: item.voucher_id,
+          amount: item.amount,
+          code: item.tag,
+          wallet_pass_usage_unit: item.wallet_pass_usage_unit,
+          wallet_pass_use_value: item.wallet_pass_use_value
+        });
+      }
     });
     logger === null || logger === void 0 || logger.addLog({
       type: 'info',

package/lib/components/checkout/hooks/useWalletPass.js

@@ -488,13 +488,18 @@ var useWalletPass = (props) => {
   });
   const notifySelectChange = (0, import_ahooks.useMemoizedFn)((selectedDetails) => {
     const prepare_payments = paymentModule.wallet.formatWalletPassList2PreparePayments(selectedDetails);
-    const select = prepare_payments.map((item) => ({
-      voucher_id: item.voucher_id,
-      amount: item.amount,
-      code: item.tag,
-      wallet_pass_usage_unit: item.wallet_pass_usage_unit,
-      wallet_pass_use_value: item.wallet_pass_use_value
-    }));
+    const select = [];
+    prepare_payments.forEach((item) => {
+      if (item.amount && select.every((s) => s.voucher_id !== item.voucher_id)) {
+        select.push({
+          voucher_id: item.voucher_id,
+          amount: item.amount,
+          code: item.tag,
+          wallet_pass_usage_unit: item.wallet_pass_usage_unit,
+          wallet_pass_use_value: item.wallet_pass_use_value
+        });
+      }
+    });
     logger == null ? void 0 : logger.addLog({
       type: "info",
       title: "useWalletPass_notifySelectChange 通知外部选择变化",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.17",
+  "version": "6.11.19",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -69,8 +69,8 @@
     "styled-components": "^6.0.0-rc.3",
     "@pisell/utils": "3.0.2",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.8",
-    "@pisell/materials": "6.11.6"
+    "@pisell/materials": "6.11.6",
+    "@pisell/date-picker": "3.0.8"
   },
   "peerDependencies": {
     "react": "^18.0.0",