@pisell/private-materials 6.4.49 → 6.4.51

package/es/components/checkout/components/CashPaymentModule/index.js

@@ -29,6 +29,8 @@ export function CashPaymentModule(_ref) {
     roundingFunction = _ref.roundingFunction,
     _ref$balanceDueAmount = _ref.balanceDueAmount,
     balanceDueAmount = _ref$balanceDueAmount === void 0 ? '0' : _ref$balanceDueAmount,
+    _ref$balanceDueTotalA = _ref.balanceDueTotalAmount,
+    balanceDueTotalAmount = _ref$balanceDueTotalA === void 0 ? '0' : _ref$balanceDueTotalA,
     _ref$syncingLock = _ref.syncingLock,
     syncingLock = _ref$syncingLock === void 0 ? false : _ref$syncingLock;
   var _useState = useState(customAmount || ''),
@@ -56,7 +58,7 @@ export function CashPaymentModule(_ref) {
   };
   useEffect(function () {
     handleKeyboardConfirm(customAmount || '');
-  }, [customAmount, balanceDueAmount]);
+  }, [customAmount, balanceDueAmount, orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.isDeposit]);
 
   // 检查是否应该禁用按钮：原本disabled为true 或者 订单金额为0
   var isAmountButtonsDisabled = disabled || Number(customAmount || 0) === 0;
@@ -119,33 +121,35 @@ export function CashPaymentModule(_ref) {
               break;
             }
             setAmount('');
-            _context.next = 32;
+            _context.next = 33;
             break;
           case 13:
             // 移除可能的货币符号和多余空格
             cleanValue = finalValue.replace(/[$\s]/g, '');
             numValue = parseFloat(cleanValue); // 检查当前金额是否等于剩余支付金额
-            balanceDue = parseFloat(balanceDueAmount);
+            debugger;
+            // 需要确认当前是否是定金模式，如果是定金模式则 balanceDue 应该为完整订单剩余待付金额
+            balanceDue = parseFloat(orderInfo !== null && orderInfo !== void 0 && orderInfo.isDeposit ? balanceDueTotalAmount || '0' : balanceDueAmount);
             shouldApplyRounding = Math.abs(numValue - balanceDue) < 0.01; // 使用小数精度比较
             finalAmount = numValue;
             roundingDiff = 0;
             if (!(shouldApplyRounding && roundingFunction)) {
-              _context.next = 29;
+              _context.next = 30;
               break;
             }
-            _context.next = 22;
+            _context.next = 23;
             return roundingFunction(numValue);
-          case 22:
+          case 23:
             _result = _context.sent;
             _ref3 = _result || {}, _ref3$roundedAmount = _ref3.roundedAmount, roundedAmount = _ref3$roundedAmount === void 0 ? numValue : _ref3$roundedAmount, _ref3$roundingDiffere = _ref3.roundingDifference, roundingDifference = _ref3$roundingDiffere === void 0 ? 0 : _ref3$roundingDiffere;
             finalAmount = roundedAmount;
             roundingDiff = roundingDifference;
             console.log('应用抹零：', numValue, '->', roundedAmount, '差额:', roundingDifference);
-            _context.next = 30;
+            _context.next = 31;
             break;
-          case 29:
-            console.log('不应用抹零，用户输入金额:', numValue, '剩余支付金额:', balanceDue);
           case 30:
+            console.log('不应用抹零，用户输入金额:', numValue, '剩余支付金额:', balanceDue);
+          case 31:
             setRoundingAmount(roundingDiff);
             if (isNaN(numValue)) {
               setAmount('');
@@ -153,7 +157,7 @@ export function CashPaymentModule(_ref) {
               setAmount(finalAmount.toString());
               console.log('设置金额为:', finalAmount);
             }
-          case 32:
+          case 33:
           case "end":
             return _context.stop();
         }

package/es/components/checkout/components/PaymentDetailModal/index.js

@@ -12,6 +12,7 @@ import checkoutLocales from "../../locales";
 import "./index.less";
 import classNames from 'classnames';
 import useEngineContext from "../../../../hooks/useEngineContext";
+import Decimal from 'decimal.js';
 
 // 小计数据类型
 
@@ -101,26 +102,21 @@ function PaymentDetailModal(_ref) {
   // 计算已支付总额 (只计算不带voucher_id的支付项)
   var getTotalPaidAmount = function getTotalPaidAmount() {
     return paymentItems.filter(function (item) {
-      return !item.voucher_id;
+      return !item.voucher_id || item.isSynced;
     }).reduce(function (total, item) {
-      return total + Math.abs(item.amount) + Math.abs(item.rounding_amount);
-    }, 0);
-  };
-
-  // 计算优惠券扣减总额 (只计算带voucher_id的支付项)
-  var getTotalVoucherAmount = function getTotalVoucherAmount() {
-    return paymentItems.filter(function (item) {
-      return item.voucher_id;
-    }).reduce(function (total, item) {
-      return total + Math.abs(item.amount);
+      var amount = new Decimal(Math.abs(item.amount));
+      var roundingAmount = new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
+      return new Decimal(total).plus(amount).plus(roundingAmount).toNumber();
     }, 0);
   };
 
   // 计算Balance Due金额 (customAmount + 所有voucher扣减金额)
   var getBalanceDueAmount = function getBalanceDueAmount() {
-    var baseAmount = customAmount ? parseFloat(customAmount) : 0;
-    var voucherDeductions = getTotalVoucherAmount();
-    return baseAmount + voucherDeductions;
+    // debugger
+    // const baseAmount = customAmount ? parseFloat(customAmount) : 0;
+    // const voucherDeductions = getTotalVoucherAmount();
+    // return baseAmount + voucherDeductions;
+    return new Decimal(orderInfo.totalAmount || 0).sub(new Decimal(getTotalPaidAmount())).toNumber().toFixed(2);
   };
 
   // 处理 Void 按钮点击
@@ -133,25 +129,76 @@ function PaymentDetailModal(_ref) {
 
   // 渲染支付项 (只渲染不带voucher_id的支付项)
   var renderPaymentItems = function renderPaymentItems() {
+    var depositPayments = paymentItems.filter(function (item) {
+      return item.order_payment_type === 'deposit' && item.isSynced;
+    });
     var regularPayments = paymentItems.filter(function (item) {
-      return !item.voucher_id;
+      return item.isSynced && item.order_payment_type !== 'deposit';
     });
-    if (!paymentItems || paymentItems.length === 0 || regularPayments.length === 0) {
+    if (!paymentItems || paymentItems.length === 0 || regularPayments.length === 0 && depositPayments.length === 0) {
       return /*#__PURE__*/React.createElement("div", {
         className: classNames('section-content')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('no-payment-text')
       }, getText('no.payments.recorded') || 'No payments recorded'));
     }
+    var depositPaymentSummary = depositPayments.reduce(function (acc, item) {
+      return new Decimal(acc).plus(new Decimal(item.amount)).plus(new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber();
+    }, 0);
+    var regularPaymentSummary = regularPayments.reduce(function (acc, item) {
+      return new Decimal(acc).plus(new Decimal(item.amount)).plus(new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber();
+    }, 0);
     return /*#__PURE__*/React.createElement("div", {
       className: classNames('section-content')
     }, /*#__PURE__*/React.createElement("div", {
       className: classNames('payment-record-container')
-    }, regularPayments.map(function (item) {
+    }, depositPayments.length > 0 && /*#__PURE__*/React.createElement("div", {
+      className: classNames('payment-item-header')
+    }, /*#__PURE__*/React.createElement("div", null, getText('pisell2.subtotal.deposit') || 'Deposit'), /*#__PURE__*/React.createElement("div", null, formatAmountWithOptions(depositPaymentSummary, amountSymbol, {
+      precision: 2,
+      hideDecimalForWholeNumbers: false,
+      useThousandsSeparator: true,
+      showCurrencySymbol: true
+    }))), depositPayments.map(function (item) {
+      return /*#__PURE__*/React.createElement("div", {
+        key: item.uuid,
+        className: classNames('payment-item')
+      }, /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-bullet')
+      }), /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-content')
+      }, /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-text')
+      }, item.name, " - ", new Date().toLocaleDateString(), ' ', getText('pisell2.checkout.payment-detail.by') || 'by', ' ', getCustomerInfo().nickname), /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-actions')
+      }, /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-amount')
+      }, "-", formatAmountWithOptions(new Decimal(Math.abs(item.amount)).plus(new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber(), amountSymbol, {
+        precision: 2,
+        hideDecimalForWholeNumbers: false,
+        useThousandsSeparator: true,
+        showCurrencySymbol: true
+      })), shouldShowVoidButton(item) && /*#__PURE__*/React.createElement("button", {
+        className: classNames('void-button'),
+        onClick: function onClick() {
+          return handleVoidPayment(item);
+        },
+        type: "button"
+      }, getText('void') || 'Void'))));
+    }), regularPayments.length > 0 && /*#__PURE__*/React.createElement("div", {
+      className: classNames('payment-item-header')
+    }, /*#__PURE__*/React.createElement("div", null, getText('payment.text') || 'Payment'), /*#__PURE__*/React.createElement("div", null, formatAmountWithOptions(regularPaymentSummary, amountSymbol, {
+      precision: 2,
+      hideDecimalForWholeNumbers: false,
+      useThousandsSeparator: true,
+      showCurrencySymbol: true
+    }))), regularPayments.map(function (item) {
       return /*#__PURE__*/React.createElement("div", {
         key: item.uuid,
         className: classNames('payment-item')
       }, /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-bullet')
+      }), /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-content')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-text')
@@ -159,7 +206,7 @@ function PaymentDetailModal(_ref) {
         className: classNames('payment-item-actions')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-amount')
-      }, "-", formatAmountWithOptions(Math.abs(item.amount) + Math.abs(item.rounding_amount), amountSymbol, {
+      }, "-", formatAmountWithOptions(new Decimal(Math.abs(item.amount)).plus(new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber(), amountSymbol, {
         precision: 2,
         hideDecimalForWholeNumbers: false,
         useThousandsSeparator: true,
@@ -181,7 +228,7 @@ function PaymentDetailModal(_ref) {
 
     // 1. 添加 paymentItems 中带 voucher_id 的支付项
     // 这块先不用 下面钱包卡券应该包含了
-    // const voucherPayments = paymentItems.filter(item => item.voucher_id);
+    // const voucherPayments = paymentItems.filter(item => item.voucher_id && !item.isSynced);
     // voucherPayments.forEach((item) => {
     //   items.push(
     //     <div key={`payment-${item.uuid}`} className={classNames('balance-item-row')}>
@@ -189,7 +236,12 @@ function PaymentDetailModal(_ref) {
     //         {item.name} - {item.voucher_id}
     //       </div>
     //       <div className={classNames('balance-item-amount')}>
-    //         -${Math.abs(item.amount).toFixed(2)}
+    //         -{formatAmountWithOptions(Math.abs(item.amount), amountSymbol, {
+    //           precision: 2,
+    //           hideDecimalForWholeNumbers: false,
+    //           useThousandsSeparator: true,
+    //           showCurrencySymbol: true,
+    //         })}
     //       </div>
     //     </div>
     //   );

package/es/components/checkout/components/PaymentDetailModal/index.less

@@ -263,7 +263,7 @@
   flex-direction: column;
   justify-content: flex-start;
   align-items: flex-start;
-  gap: 16px;
+  gap: 8px;
 }
 
 .payment-record-header {
@@ -299,12 +299,33 @@
   line-height: 20px;
   word-wrap: break-word;
 }
+.payment-item-header {
+  width: 100%;
+  color: black;
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 20px;
+  word-wrap: break-word;
+  display: flex;
+  justify-content: space-between;
+}
 
 .payment-item {
   align-self: stretch;
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
   align-items: center;
+  gap: 8px;
+  margin-left: 10px;
+  margin-right: 64px;
+}
+
+.payment-item-bullet {
+  width: 6px;
+  height: 6px;
+  background-color: #475467;
+  border-radius: 50%;
+  flex-shrink: 0;
 }
 
 .payment-item-content {

package/es/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any;
+    expiredWalletIds: any[];
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

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

@@ -433,6 +433,7 @@ export var useWalletPass = function useWalletPass(props) {
     } else {
       setWalletSelect([]);
       notSetWalletSelectRef.current = false;
+      onSelectChange === null || onSelectChange === void 0 || onSelectChange([]);
     }
 
     // 获取折扣列表并按初始顺序排序（isSelected为true的在前）

package/es/components/checkout/locales.d.ts

@@ -122,6 +122,7 @@ declare const _default: {
         'pisell2.checkout.manual-discount.no-amount': string;
         'pisell2.checkout.manual-discount.has-payment-items': string;
         'pisell2.checkout.manual-discount.invalid-amount': string;
+        'pisell2.checkout.can-not-change-deposit-amount': string;
         'pisell2.checkout.wallet-balance-confirm.title': string;
         'pisell2.checkout.wallet-balance-confirm.description-before': string;
         'pisell2.checkout.wallet-balance-confirm.description-after': string;
@@ -281,6 +282,7 @@ declare const _default: {
         'pisell2.checkout.manual-discount.no-amount': string;
         'pisell2.checkout.manual-discount.has-payment-items': string;
         'pisell2.checkout.manual-discount.invalid-amount': string;
+        'pisell2.checkout.can-not-change-deposit-amount': string;
         'pisell2.checkout.wallet-balance-confirm.title': string;
         'pisell2.checkout.wallet-balance-confirm.description-before': string;
         'pisell2.checkout.wallet-balance-confirm.description-after': string;
@@ -456,6 +458,7 @@ declare const _default: {
         'pisell2.checkout.manual-discount.no-amount': string;
         'pisell2.checkout.manual-discount.has-payment-items': string;
         'pisell2.checkout.manual-discount.invalid-amount': string;
+        'pisell2.checkout.can-not-change-deposit-amount': string;
         'pisell2.checkout.wallet-balance-confirm.title': string;
         'pisell2.checkout.wallet-balance-confirm.description-before': string;
         'pisell2.checkout.wallet-balance-confirm.description-after': string;

package/es/components/checkout/locales.js

@@ -154,6 +154,7 @@ export default {
     'pisell2.checkout.manual-discount.no-amount': 'No order amount available for discount',
     'pisell2.checkout.manual-discount.has-payment-items': 'Order already contains payment items, cannot manually adjust price',
     'pisell2.checkout.manual-discount.invalid-amount': 'Please enter a valid amount greater than 0',
+    'pisell2.checkout.can-not-change-deposit-amount': 'Order already contains deposit payment items, cannot change deposit amount',
     // Wallet balance confirmation modal
     'pisell2.checkout.wallet-balance-confirm.title': 'Apply wallet balance now',
     'pisell2.checkout.wallet-balance-confirm.description-before': ' will be deducted from selected wallet balance, order will be marked as ',
@@ -352,6 +353,7 @@ export default {
     'pisell2.checkout.manual-discount.no-amount': '无可用的订单金额进行折扣',
     'pisell2.checkout.manual-discount.has-payment-items': '订单已经含有支付项，不可手动改价',
     'pisell2.checkout.manual-discount.invalid-amount': '请输入大于0的有效金额',
+    'pisell2.checkout.can-not-change-deposit-amount': '已经含有定金支付项，不可修改定金金额',
     // Wallet balance confirmation modal
     'pisell2.checkout.wallet-balance-confirm.title': '立即应用钱包余额',
     'pisell2.checkout.wallet-balance-confirm.description-before': ' 将从所选钱包余额中扣除，订单将标记为 ',
@@ -588,6 +590,7 @@ export default {
     'pisell2.checkout.manual-discount.no-amount': '無可用的訂單金額進行折扣',
     'pisell2.checkout.manual-discount.has-payment-items': '訂單已經含有支付項，不可手動改價',
     'pisell2.checkout.manual-discount.invalid-amount': '請輸入大於0的有效金額',
+    'pisell2.checkout.can-not-change-deposit-amount': '已經含有定金支付項，不可修改定金金額',
     // Wallet balance confirmation modal
     'pisell2.checkout.wallet-balance-confirm.title': '立即應用錢包餘額',
     'pisell2.checkout.wallet-balance-confirm.description-before': ' 將從所選錢包餘額中扣除，訂單將標記為 ',

package/es/components/eftpos/deviceList/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const _default: ({ input, ...formItemProps }: any) => JSX.Element;
 export default _default;

package/es/components/eftpos/form/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

package/es/components/eftpos/group/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { RadioGroupProps } from 'antd';
 export declare const CheckboxGroup: ({ direction, options, ...props }: any) => JSX.Element;
 export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/es/components/eftpos/icon/apiKey.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/es/components/eftpos/icon/device.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/es/components/eftpos/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos, DeviceStatus } from './const';
 import './index.less';
 interface PosProps {

package/es/components/eftpos/pos.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { DeviceProp } from "./const";
 interface PosProps {
     eftposName: string;

package/es/components/eftpos/receipt/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 自定义组件设置
  * @description: 自定义组件设置

package/es/components/eftpos/surcharge/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.css';
 /**
  * @title: 自定义组件设置

package/es/components/eftposPay/component/alert/warn.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/fail/network.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 断网(客户端)提示页

package/es/components/eftposPay/component/fail/unknow.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

package/es/components/eftposPay/component/header/titlebar.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

package/es/components/eftposPay/component/manual/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 import './index.less';
 /**

package/es/components/eftposPay/component/signature/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 取消签名确认页

package/es/components/eftposPay/component/step/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

package/es/components/eftposPay/component/step/step.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;

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

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     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">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/linkly/hooks/normal.js

@@ -74,7 +74,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
     var status = res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.status;
 
     // 继续查询交易状态
-    if (status === 0) {
+    if (status == 0) {
       var _res$data2;
       // 交易流水号
       numRef.current = res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.session_id;
@@ -89,7 +89,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
       setTimeout(function () {
         var _resultQueryRef$curre;
         (_resultQueryRef$curre = resultQueryRef.current) === null || _resultQueryRef$curre === void 0 || _resultQueryRef$curre.call(resultQueryRef);
-      });
+      }, 300);
       return;
     }
 
@@ -99,7 +99,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
     }));
 
     // 交易成功
-    if (status === 1) {
+    if (status == 1) {
       var _handleLinklySuccessR;
       (_handleLinklySuccessR = handleLinklySuccessRef.current) === null || _handleLinklySuccessR === void 0 || _handleLinklySuccessR.call(handleLinklySuccessRef, res);
       return;

package/es/components/eftposPay/linkly/hooks/useTimeQuery.js

@@ -86,15 +86,22 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               isQueryFinishedRef.current = true;
               var data = (result === null || result === void 0 ? void 0 : result.data) || {};
               // 交易成功，终止查询
-              if (data.status === 1) {
+              if (data.status == 1) {
                 console.log('交易成功，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u6210\u529F"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
+                });
                 reset();
                 handleLinklySuccess(result);
                 return;
               }
 
               // 交易状态为0，且不需要签名，则继续查询
-              if (data.status !== undefined && (data === null || data === void 0 ? void 0 : data.status) === 0) {
+              if ((data === null || data === void 0 ? void 0 : data.status) == 0 && (data === null || data === void 0 ? void 0 : data.signature_flag) != 1) {
                 console.log('交易状态为0需要继续查询');
                 isQueryFinishedRef.current = false;
                 _resultQuery();
@@ -105,6 +112,13 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               if (data.status < 0) {
                 var _failRef$current;
                 console.log('交易失败，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u5931\u8D25"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
+                });
                 reset();
                 // 交易失败，code码转换为支付失败code码
                 result.code = PayStatus.Unknown;
@@ -113,8 +127,15 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               }
 
               // 需要签名
-              if (data.signature_flag === 1) {
+              if (data.signature_flag == 1) {
                 console.log('交易需要签名，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u9700\u8981\u7B7E\u540D"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
+                });
                 reset();
                 gotoSignature();
                 return;
@@ -240,7 +261,7 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
       });
     }
     sendWarningLog({
-      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u7ED3\u679C\u67E5\u8BE2--").concat(type),
+      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u7ED3\u679C\u8F6E\u8BE2"),
       content: content
     });
   };

package/es/components/eftposPay/payo/config.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StatusEnum } from '../const';
 export declare const POS: ({ api, onChange, }: {
     api: {

package/es/components/eftposPay/serve.js

@@ -232,7 +232,7 @@ export var linklyPayQuery = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee15$(_context15) {
       while (1) switch (_context15.prev = _context15.next) {
         case 0:
-          return _context15.abrupt("return", request.getRequest().get('/shop/shop/linkly/pay/query', params, config));
+          return _context15.abrupt("return", request.getRequest().get('/shop/linkly/pay/query', params, config));
         case 1:
         case "end":
           return _context15.stop();

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

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "warn" | "success" | "fail" | "question";
+        status: "loading" | "success" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -295,9 +295,9 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "fullPay" | "pay" | "query" | undefined;
+        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        eftpos?: "tyro" | "windcave" | "stripe" | "payo" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './tip.less';
 /**
  * @title: 支付状态未知页面

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

package/es/components/eftposPay/windcave/receiptAction.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 按钮操作区
  * @description: 仅包含签名

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ api, onChange, formatAmount, }: {
     api: any;
     onChange: any;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts

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