@pisell/private-materials 6.6.61 → 6.6.63

package/es/components/eftposPay/amount.js

@@ -12,11 +12,13 @@ import { locales } from '@pisell/utils';
 import { InputNumber, Button, message } from 'antd';
 import { Decimal } from 'decimal.js';
 import React, { useMemo, useState } from 'react';
+import { useMount } from 'ahooks';
 import Alert from "./component/alert";
 import Titlebar from "./component/header/titlebar";
 import { getAmonunt } from "./manufacturer";
 import { limitDecimals } from "./helper";
 import { useDispatch, useContextData, updateComponent, updateState } from "./store";
+import payLog from "./utils/payLog";
 
 /**
  * @title: 支付金额信息配置页
@@ -108,6 +110,14 @@ export default (function (_ref) {
     var currentMoneyDeci = new Decimal(currentMoney);
     return moneyDeci.sub(currentMoneyDeci).toFixed(2, Decimal.ROUND_HALF_UP);
   }, [currentMoney, money]);
+  useMount(function () {
+    payLog.log('金额页面展示', {
+      amount: currentMoney,
+      surcharge: totalSurMoney,
+      total: total,
+      surRate: curSurRate
+    });
+  });
 
   /**
    * @title:提交
@@ -143,7 +153,9 @@ export default (function (_ref) {
       surRateMoney: "".concat(surRateMoney),
       totalUnit: formatAmount(total, 2, symbol)
     };
-    console.log('amount pay = ', pay);
+    payLog.log('金额页-确认提交', {
+      pay: pay
+    });
     dispatch(updateState({
       pay: pay
     }));
@@ -162,6 +174,7 @@ export default (function (_ref) {
       setStatus(true);
       return;
     }
+    payLog.log('金额页-点击取消');
     onClose();
   };
 
@@ -172,6 +185,7 @@ export default (function (_ref) {
    * @Date: 2024-08-19 09:53
    */
   var onEdit = function onEdit() {
+    payLog.log('金额页-点击编辑');
     setStatus(false);
     setTempSurRate(curSurRate);
     setTempSurMoney(curSurMoney);

package/es/components/eftposPay/app.js

@@ -21,8 +21,7 @@ import { RouteEnum, ClientEnum, RestoreEumn } from "./const";
 import Device from "./device";
 import Pay from "./pay";
 import { useContextData, useDispatch, updateState, updateClient } from "./store";
-import useEngineContext from "../../hooks/useEngineContext";
-import { request } from "../../utils";
+import payLog from "./utils/payLog";
 var App = function App(_ref) {
   var action = _ref.action,
     api = _ref.api,
@@ -121,7 +120,6 @@ var App = function App(_ref) {
         }));
       }
     }
-    console.log('状态切换 = ', status, params, other);
     props.onChangeStatus(status, params, other);
   }, []);
 
@@ -131,6 +129,7 @@ var App = function App(_ref) {
    * @Date: 2024-08-20 13:09
    */
   var onClose = function onClose() {
+    payLog.log('关闭支付');
     onChange('fail', {
       number: data.number,
       uniquePaymentNumber: data.number,

package/es/components/eftposPay/component/fail/failCustom.js

@@ -14,6 +14,7 @@ import { getInitState } from "../../manufacturer";
 import XClose from '@pisell/icon/es/XClose';
 import { useDispatch, useContextData, updateState, updateComponent } from "../../store";
 import Header from "../header";
+import payLog from "../../utils/payLog";
 export default (function (_ref) {
   var _ref$className = _ref.className,
     className = _ref$className === void 0 ? '' : _ref$className,
@@ -40,14 +41,17 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:30
    */
   var onRetry = function onRetry() {
+    payLog.log('自定义失败页：重试');
     onChange('page', 'pay');
     var params = _objectSpread(_objectSpread({}, originalParams || {}), {}, {
       mode: mode,
       name: name,
       symbol: symbol,
       amount: amount,
-      order_id: order_id
+      order_id: order_id,
+      client: client
     });
+    // 非查询模式，清空支付流水号
     if (mode !== ModeEnum.Query) {
       params.number = '';
     }
@@ -66,7 +70,8 @@ export default (function (_ref) {
       symbol: symbol,
       amount: amount,
       order_id: order_id,
-      number: ''
+      number: '',
+      client: client
     }))));
     onChange('page', 'amount');
   };
@@ -79,6 +84,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:31
    */
   var onManually = function onManually() {
+    payLog.log('自定义失败页：点击手动标记');
     dispatch(updateState({
       manual: {
         title: locales.getText('page.eftpos-pay.text.request.unknown.title')(mode),
@@ -88,6 +94,7 @@ export default (function (_ref) {
     dispatch(updateComponent('Manual'));
   };
   var onNotin = function onNotin() {
+    payLog.log('自定义失败页：点击打印小票');
     onChange('print', [], 'print_on_timeout');
   };
 
@@ -98,6 +105,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:32
    */
   var onClose = function onClose() {
+    payLog.log('自定义失败页：关闭');
     onChange('fail', {
       number: number,
       uniquePaymentNumber: number,
@@ -105,9 +113,10 @@ export default (function (_ref) {
       order_id: order_id
     });
   };
-
-  // 错误页 通知外界 开发关闭按钮
   useMount(function () {
+    payLog.log('自定义失败页展示', {
+      status: failCustom === null || failCustom === void 0 ? void 0 : failCustom.status
+    });
     if ((failCustom === null || failCustom === void 0 ? void 0 : failCustom.status) === 'fail') {
       onChange('page', 'fail');
     }

package/es/components/eftposPay/component/fail/index.js

@@ -14,6 +14,7 @@ import { ClientEnum } from "../../const";
 import { getInitState } from "../../manufacturer";
 import { useDispatch, useContextData, updateState, updateComponent } from "../../store";
 import Header from "../header";
+import payLog from "../../utils/payLog";
 export default (function (_ref) {
   var _steps$step;
   var onChange = _ref.onChange,
@@ -42,6 +43,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:30
    */
   var onRetry = function onRetry() {
+    payLog.log('失败页：点击重试');
     onChange('page', 'pay');
     dispatch(updateState(getInitState(eftpos, _objectSpread(_objectSpread({}, originalParams || {}), {}, {
       mode: mode,
@@ -49,7 +51,8 @@ export default (function (_ref) {
       symbol: symbol,
       amount: amount,
       order_id: order_id,
-      number: ''
+      number: '',
+      client: client
     }))));
   };
 
@@ -65,7 +68,8 @@ export default (function (_ref) {
       symbol: symbol,
       amount: amount,
       order_id: order_id,
-      number: ''
+      number: '',
+      client: client
     }))));
     onChange('page', 'amount');
   };
@@ -78,6 +82,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:31
    */
   var onManually = function onManually() {
+    payLog.log('失败页：点击手动标记');
     dispatch(updateState({
       manual: {
         title: locales.getText('page.eftpos-pay.text.request.unknown.title')(mode),
@@ -87,6 +92,7 @@ export default (function (_ref) {
     dispatch(updateComponent('Manual'));
   };
   var onNotin = function onNotin() {
+    payLog.log('失败页：点击打印小票');
     onChange('print', [], 'print_on_timeout');
   };
 
@@ -97,7 +103,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:32
    */
   var onClose = function onClose() {
-    // 支付失败页
+    payLog.log('失败页：点击关闭');
     onChange('fail', {
       number: number,
       uniquePaymentNumber: number,
@@ -105,9 +111,10 @@ export default (function (_ref) {
       order_id: order_id
     });
   };
-
-  // 错误页 通知外界 开发关闭按钮
   useMount(function () {
+    payLog.log('失败页展示', {
+      status: steps[step].status
+    });
     if (steps[step].status === 'fail') {
       onChange('page', 'fail');
     }

package/es/components/eftposPay/component/fail/network.js

@@ -8,6 +8,7 @@ import { locales } from '@pisell/utils';
 import React, { useEffect, useState } from 'react';
 import { Button, message } from 'antd';
 import Header from "../header";
+import payLog from "../../utils/payLog";
 
 /**
  * @title: 断网(客户端)提示页
@@ -22,6 +23,7 @@ export default (function (_ref) {
     hasBtn = _useState2[0],
     setBtn = _useState2[1];
   useEffect(function () {
+    payLog.log('断网提示页展示');
     var clear = setTimeout(function () {
       setBtn(true);
     }, 1000);
@@ -37,6 +39,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:41
    */
   var onReconnect = function onReconnect() {
+    payLog.log('断网提示页：点击重新连接');
     message.open({
       key: 'net-warning',
       type: 'loading',

package/es/components/eftposPay/component/fail/unknow.js

@@ -2,9 +2,11 @@
 import { locales } from '@pisell/utils';
 import { Button } from 'antd';
 import React, { useEffect } from 'react';
+import { useMount } from 'ahooks';
 import { ClientEnum } from "../../const";
 import { useDispatch, useContextData, updateState, updateComponent } from "../../store";
 import Header from "../header";
+import payLog from "../../utils/payLog";
 
 /**
  * @title: 支付状态未知页面
@@ -21,6 +23,9 @@ export default (function (_ref) {
     mode = _useContextData.mode,
     client = _useContextData.client;
   var dispatch = useDispatch();
+  useMount(function () {
+    payLog.log('未知状态处理页展示');
+  });
 
   /**
    * @title: 手动标记
@@ -29,6 +34,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:31
    */
   var onManually = function onManually() {
+    payLog.log('未知状态处理页：点击手动标记');
     dispatch(updateState({
       manual: {
         title: locales.getText('page.eftpos-pay.text.request.unknown.title')(mode),
@@ -38,11 +44,13 @@ export default (function (_ref) {
     dispatch(updateComponent('Manual'));
   };
   var onNotin = function onNotin() {
+    payLog.log('未知状态处理页：点击打印小票');
     onChange('print', [], 'print_on_timeout');
   };
   useEffect(function () {
     // 如果 网络终端 恢复至此页面 则需要 回归 步骤流程
     if (form === 'Network' || form === 'restore') {
+      payLog.log('未知状态处理页：网络终端');
       dispatch(updateComponent(''));
     }
   }, [form]);

package/es/components/eftposPay/component/manual/index.js

@@ -13,11 +13,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { locales } from '@pisell/utils';
 import { Decimal } from 'decimal.js';
 import { Button, InputNumber } from 'antd';
-import React, { useMemo, useState } from 'react';
+import React, { useMemo, useState, useEffect } from 'react';
 import usePrefix from "../../../../hooks/usePrefix";
 import { ModeEnum } from "../../const";
 import { useContextData, useDispatch, updateState } from "../../store";
 import { limitDecimals } from "../../helper";
+import payLog from "../../utils/payLog";
 import "./index.less";
 
 /**
@@ -40,6 +41,9 @@ export default (function (_ref) {
     number = _useContextData.number,
     pay = _useContextData.pay,
     amount = _useContextData.amount;
+  useEffect(function () {
+    payLog.log('手动标记页展示');
+  }, []);
   var start = useMemo(function () {
     if (typeof (manual === null || manual === void 0 ? void 0 : manual.money) === 'number' || typeof (manual === null || manual === void 0 ? void 0 : manual.money) === 'string') {
       return Number(manual === null || manual === void 0 ? void 0 : manual.money);
@@ -70,6 +74,7 @@ export default (function (_ref) {
    */
   var onSuccess = function onSuccess() {
     if (disabled) {
+      payLog.log('手动标记：点击成功被拦截');
       return;
     }
     // if (mode === ModeEnum.Pay) {
@@ -84,6 +89,7 @@ export default (function (_ref) {
     //   return;
     // }
     if (mode === ModeEnum.Refund) {
+      payLog.log('手动标记(退款)：点击标记为成功');
       setDisabled(true);
       onChange('success', {
         amount: amount,
@@ -91,10 +97,12 @@ export default (function (_ref) {
         number: number,
         uniquePaymentNumber: number,
         device: device,
-        order_id: order_id
+        order_id: order_id,
+        manual_marking_flag: 1 // 手动标记标志
       });
       return;
     }
+    payLog.log('手动标记：点击标记为成功');
     updateAmountStatus(true);
     dispatch(updateState({
       manual: _objectSpread(_objectSpread({}, manual), {}, {
@@ -112,6 +120,7 @@ export default (function (_ref) {
     if (disabled) {
       return;
     }
+    payLog.log('手动标记：点击标记为失败');
     setDisabled(true);
     onChange('fail', {
       number: number,
@@ -124,6 +133,9 @@ export default (function (_ref) {
     if (disabled) {
       return;
     }
+    payLog.log('手动标记-确认金额：点击确认', {
+      money: money
+    });
     setDisabled(true);
     if (mode === ModeEnum.Refund || mode === ModeEnum.Query) {
       return;
@@ -155,11 +167,13 @@ export default (function (_ref) {
       number: number,
       uniquePaymentNumber: number,
       device: device,
-      order_id: order_id
+      order_id: order_id,
+      manual_marking_flag: 1 // 手动标记标志
     }));
     return;
   };
   var onCancel = function onCancel() {
+    payLog.log('手动标记-确认金额：点击取消');
     updateAmountStatus(false);
     setMoney(pay === null || pay === void 0 ? void 0 : pay.total);
     dispatch(updateState({

package/es/components/eftposPay/component/signature/index.js

@@ -9,6 +9,7 @@ import { Button } from 'antd';
 import React, { useState } from 'react';
 import { useContextData, useDispatch, updateNextStep, updateComponent } from "../../store";
 import Header from "../header";
+import payLog from "../../utils/payLog";
 
 /**
  * @title: 取消签名确认页
@@ -34,6 +35,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:51
    */
   var onBack = function onBack() {
+    payLog.log('取消签名确认页：点击返回');
     dispatch(updateComponent(''));
   };
 
@@ -43,6 +45,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:51
    */
   var onConfirm = function onConfirm() {
+    payLog.log('取消签名确认页：点击确认');
     setDisabled(true);
     api.update({
       type: 'NO',

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

@@ -7,9 +7,12 @@ export declare enum EftposEnum {
     /** 后端支付 - 支付 + 退款  */
     Windcave = "windcave",
     Stripe = "stripe",
+    /** 后端支付 - 支付 + 退款  */
     Linkly = "linkly",
     /** 汇付天下 */
-    Huifu = "huifu"
+    Huifu = "huifu",
+    /** mx51支付 - 支付 + 退款  */
+    MX51 = "mx51"
 }
 export declare enum StatusEnum {
     Init = "init",
@@ -163,7 +166,7 @@ export declare enum PayStatus {
     'Unknown' = "701000",
     /** 交易请求超时 */
     'Timeout' = "701001",
-    /** 支付失败（汇付天下） */
+    /** 支付失败 */
     'PaymentFailed' = "701002",
     /** 繁忙 EFTPOS终端暂时不可用，因为EFTPOS正在处理另一个请求。 */
     'PayOtherEftposFailed' = "701003",
@@ -180,7 +183,9 @@ export declare enum PayStatus {
     /** 签名拒绝 */
     'SignatureDeclined' = "701009",
     /** 配置参数错误 */
-    'UserConfigError' = "701010"
+    'UserConfigError' = "701010",
+    /** mx51未知状态 */
+    'UnknownMx51' = "702001"
 }
 export interface ActionProps {
     onChange: (status: `${StatusEnum.Success}` | `${StatusEnum.Fail}` | 'page', params?: {

package/es/components/eftposPay/const.js

@@ -5,6 +5,7 @@ export var EftposEnum = /*#__PURE__*/function (EftposEnum) {
   EftposEnum["Stripe"] = "stripe";
   EftposEnum["Linkly"] = "linkly";
   EftposEnum["Huifu"] = "huifu";
+  EftposEnum["MX51"] = "mx51";
   return EftposEnum;
 }({});
 export var StatusEnum = /*#__PURE__*/function (StatusEnum) {
@@ -79,5 +80,6 @@ export var PayStatus = /*#__PURE__*/function (PayStatus) {
   PayStatus["PayBankRefuses"] = "701008";
   PayStatus["SignatureDeclined"] = "701009";
   PayStatus["UserConfigError"] = "701010";
+  PayStatus["UnknownMx51"] = "702001";
   return PayStatus;
 }({});