@pisell/private-materials 6.4.12 → 6.4.14

package/es/components/checkout/PaymentModal.js

@@ -1588,10 +1588,7 @@ var PaymentModal = function PaymentModal(_ref17) {
     }
   }, [data]);
   var logger = usePaymentLogger();
-  var _useState37 = useState(false),
-    _useState38 = _slicedToArray(_useState37, 2),
-    isLocalOrderCreated = _useState38[0],
-    setIsLocalOrderCreated = _useState38[1];
+  var isLocalOrderCreated = useRef(undefined);
   var unsubscribeRef = useRef(undefined);
 
   // 初始化checkout数据
@@ -1605,11 +1602,11 @@ var PaymentModal = function PaymentModal(_ref17) {
               _context17.prev = 0;
               // 获取 checkout 模块并处理订单数据
               checkout = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
-              if (!(checkout && data && !isLocalOrderCreated)) {
-                _context17.next = 19;
+              if (!(checkout && data && !isLocalOrderCreated.current)) {
+                _context17.next = 20;
                 break;
               }
-              setIsLocalOrderCreated(true);
+              isLocalOrderCreated.current = true;
               _context17.next = 6;
               return getShopWalletPassId(interaction);
             case 6:
@@ -1645,6 +1642,15 @@ var PaymentModal = function PaymentModal(_ref17) {
                 setTotalAmount(_orderInfo2.totalAmount);
               }
               setOrderInfo(_orderInfo2);
+              if (unsubscribeRef.current) {
+                logger === null || logger === void 0 || logger.addLog({
+                  type: 'info',
+                  title: '有重复的checkout:onOrderSynced，清空',
+                  metadata: {}
+                });
+                unsubscribeRef.current();
+                unsubscribeRef.current = undefined;
+              }
               // 监听订单同步完成，同步完成后显示订单完成 toast，关闭当前弹窗
               unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', function (data) {
                 var _data$response, _responseData$payment2;
@@ -1748,46 +1754,46 @@ var PaymentModal = function PaymentModal(_ref17) {
                 // 可以在这里执行同步完成后的业务逻辑
                 // 比如：通知其他系统、更新UI状态等
               });
-              _context17.next = 30;
+              _context17.next = 31;
               break;
-            case 19:
-              if (!isLocalOrderCreated) {
-                _context17.next = 30;
+            case 20:
+              if (!isLocalOrderCreated.current) {
+                _context17.next = 31;
                 break;
               }
               // // 如果本地订单已创建，这时候还更新了 data，则需要销毁当前的订单数据，然后更新新的订单数据了
               console.log('🔄 PaymentModal: data changed, updating checkout data...');
-              setIsLocalOrderCreated(false);
-              _context17.next = 24;
+              isLocalOrderCreated.current = false;
+              _context17.next = 25;
               return checkout.cancelCurrentOrderAsync();
-            case 24:
-              _context17.next = 26;
+            case 25:
+              _context17.next = 27;
               return checkout.createLocalOrderAsync({
                 orderData: data === null || data === void 0 ? void 0 : data.order_info,
                 cartSummary: data === null || data === void 0 || (_data$subtotal_info = data.subtotal_info) === null || _data$subtotal_info === void 0 ? void 0 : _data$subtotal_info.subTotalList,
                 autoPayment: true,
                 totalInfo: data === null || data === void 0 ? void 0 : data.subtotal_info
               });
-            case 26:
+            case 27:
               // 获取订单总金额
               _orderInfo3 = checkout.getCurrentOrderInfo();
               if (_orderInfo3 && _orderInfo3.totalAmount) {
                 setTotalAmount(_orderInfo3.totalAmount);
               }
               setOrderInfo(_orderInfo3);
-              setIsLocalOrderCreated(true);
-            case 30:
-              _context17.next = 35;
+              isLocalOrderCreated.current = true;
+            case 31:
+              _context17.next = 36;
               break;
-            case 32:
-              _context17.prev = 32;
+            case 33:
+              _context17.prev = 33;
               _context17.t0 = _context17["catch"](0);
               console.error('Failed to initialize checkout data:', _context17.t0);
-            case 35:
+            case 36:
             case "end":
               return _context17.stop();
           }
-        }, _callee17, null, [[0, 32]]);
+        }, _callee17, null, [[0, 33]]);
       }));
       return function initCheckoutData() {
         return _ref22.apply(this, arguments);
@@ -1802,6 +1808,7 @@ var PaymentModal = function PaymentModal(_ref17) {
       if (typeof unsubscribeRef.current === 'function') {
         var _unsubscribeRef$curre;
         (_unsubscribeRef$curre = unsubscribeRef.current) === null || _unsubscribeRef$curre === void 0 || _unsubscribeRef$curre.call(unsubscribeRef);
+        unsubscribeRef.current = undefined;
       }
     };
   }, []);

package/es/components/ticketBooking/components/menuBar/index.js

@@ -13,6 +13,9 @@ var index = function index() {
     children: [{
       key: 'reload',
       label: locales.getText('pisell2.ticket-booking.reload')
+    }, {
+      key: 'version',
+      label: '6.4.13'
     }
     /*
     {

package/lib/components/checkout/PaymentModal.js

@@ -1189,15 +1189,15 @@ var PaymentModal = ({
     }
   }, [data]);
   const logger = (0, import_usePaymentLogger.default)();
-  const [isLocalOrderCreated, setIsLocalOrderCreated] = (0, import_react.useState)(false);
+  const isLocalOrderCreated = (0, import_react.useRef)(void 0);
   const unsubscribeRef = (0, import_react.useRef)(void 0);
   (0, import_react.useEffect)(() => {
     const initCheckoutData = async () => {
       var _a2, _b2;
       try {
         const checkout = pisellos == null ? void 0 : pisellos.getModule("checkout");
-        if (checkout && data && !isLocalOrderCreated) {
-          setIsLocalOrderCreated(true);
+        if (checkout && data && !isLocalOrderCreated.current) {
+          isLocalOrderCreated.current = true;
           const shop_wallet_pass_id = await (0, import_utils2.getShopWalletPassId)(interaction);
           checkout.setOtherParams({
             is_price_include_tax: getData("is_price_include_tax"),
@@ -1225,6 +1225,15 @@ var PaymentModal = ({
             setTotalAmount(orderInfo2.totalAmount);
           }
           setOrderInfo(orderInfo2);
+          if (unsubscribeRef.current) {
+            logger == null ? void 0 : logger.addLog({
+              type: "info",
+              title: "有重复的checkout:onOrderSynced，清空",
+              metadata: {}
+            });
+            unsubscribeRef.current();
+            unsubscribeRef.current = void 0;
+          }
           unsubscribeRef.current = checkout.core.effects.on("checkout:onOrderSynced", (data2) => {
             var _a3, _b3, _c2;
             const responseData = (_a3 = data2.response) == null ? void 0 : _a3.data;
@@ -1317,11 +1326,11 @@ var PaymentModal = ({
               handlePaymentComplete(data2);
             }
           });
-        } else if (isLocalOrderCreated) {
+        } else if (isLocalOrderCreated.current) {
           console.log(
             "🔄 PaymentModal: data changed, updating checkout data..."
           );
-          setIsLocalOrderCreated(false);
+          isLocalOrderCreated.current = false;
           await checkout.cancelCurrentOrderAsync();
           await checkout.createLocalOrderAsync({
             orderData: data == null ? void 0 : data.order_info,
@@ -1334,7 +1343,7 @@ var PaymentModal = ({
             setTotalAmount(orderInfo2.totalAmount);
           }
           setOrderInfo(orderInfo2);
-          setIsLocalOrderCreated(true);
+          isLocalOrderCreated.current = true;
         }
       } catch (error) {
         console.error("Failed to initialize checkout data:", error);
@@ -1349,6 +1358,7 @@ var PaymentModal = ({
       var _a2;
       if (typeof unsubscribeRef.current === "function") {
         (_a2 = unsubscribeRef.current) == null ? void 0 : _a2.call(unsubscribeRef);
+        unsubscribeRef.current = void 0;
       }
     };
   }, []);

package/lib/components/ticketBooking/components/menuBar/index.js

@@ -49,6 +49,10 @@ var index = () => {
         {
           key: "reload",
           label: import_utils.locales.getText("pisell2.ticket-booking.reload")
+        },
+        {
+          key: "version",
+          label: "6.4.13"
         }
         /*
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.12",
+  "version": "6.4.14",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
-    "@pisell/date-picker": "3.0.6",
     "@pisell/icon": "0.0.11",
+    "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.4.1",
-    "@pisell/utils": "3.0.2"
+    "@pisell/date-picker": "3.0.6"
   },
   "peerDependencies": {
     "react": "^18.0.0",