@pisell/private-materials 6.6.62 → 6.6.63

package/es/components/eftposPay/mx51/utils.js

@@ -0,0 +1,121 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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); }
+import { EButtonKeyType } from "./types";
+
+/**
+ * 解析MX51参数
+ * @param params 接口返回的原始参数
+ * @param status 支付状态
+ * @param data 接口返回的数据
+ * @returns 解析后的结果对象
+ */
+export var parseMX51Params = function parseMX51Params(params, paymentStatus, data) {
+  if (!params) {
+    return null;
+  }
+  // 默认值
+  var result = {
+    transactionId: (params === null || params === void 0 ? void 0 : params.id) || '',
+    status: (params === null || params === void 0 ? void 0 : params.status) || '',
+    version: (params === null || params === void 0 ? void 0 : params.version) || 0,
+    message: (params === null || params === void 0 ? void 0 : params.message) || '',
+    merchantReceipt: params === null || params === void 0 ? void 0 : params.merchant_receipt,
+    customerReceipt: params === null || params === void 0 ? void 0 : params.customer_receipt,
+    resultAmounts: params === null || params === void 0 ? void 0 : params.result_amounts,
+    resultFinancialStatus: params === null || params === void 0 ? void 0 : params.result_financial_status,
+    layouts: [],
+    details: {},
+    detailsText: '',
+    autoAction: []
+  };
+
+  // 检查是否存在 pos_instructions
+  if (!(params !== null && params !== void 0 && params.pos_instructions)) {
+    return result;
+  }
+  var posInstructions = (params === null || params === void 0 ? void 0 : params.pos_instructions) || {};
+
+  // 检查是否有自动操作
+  result.autoAction = (posInstructions === null || posInstructions === void 0 ? void 0 : posInstructions.auto_actions) || [];
+
+  // 检查是否存在 action_form
+  if (!(posInstructions !== null && posInstructions !== void 0 && posInstructions.action_form)) {
+    return result;
+  }
+  var actionForm = (posInstructions === null || posInstructions === void 0 ? void 0 : posInstructions.action_form) || {};
+
+  // 解析详情信息
+  if (actionForm !== null && actionForm !== void 0 && actionForm.details) {
+    result.details = _objectSpread({}, (actionForm === null || actionForm === void 0 ? void 0 : actionForm.details) || {});
+    var detailsTextArr = [];
+    Object.keys((actionForm === null || actionForm === void 0 ? void 0 : actionForm.details) || {}).forEach(function (key) {
+      var _actionForm$details;
+      detailsTextArr.push("".concat(key, ": ").concat((actionForm === null || actionForm === void 0 || (_actionForm$details = actionForm.details) === null || _actionForm$details === void 0 ? void 0 : _actionForm$details[key]) || ''));
+    });
+    result.detailsText = (detailsTextArr === null || detailsTextArr === void 0 ? void 0 : detailsTextArr.join(', ')) || '';
+  }
+
+  // 解析布局和按钮
+  if (actionForm !== null && actionForm !== void 0 && actionForm.layout && Array.isArray(actionForm === null || actionForm === void 0 ? void 0 : actionForm.layout)) {
+    var layouts = [];
+
+    // 遍历所有布局
+    actionForm.layout.forEach(function (layout) {
+      var elements = [];
+      if (layout !== null && layout !== void 0 && layout.elements && Array.isArray(layout === null || layout === void 0 ? void 0 : layout.elements)) {
+        // 遍历布局中的所有元素
+        layout.elements.forEach(function (element) {
+          var _actionForm$propertie;
+          var elementKey = (element === null || element === void 0 ? void 0 : element.key) || '';
+          var elementLabel = (element === null || element === void 0 ? void 0 : element.label) || '';
+
+          // 从 properties 中获取对应的属性
+          var property = (actionForm === null || actionForm === void 0 || (_actionForm$propertie = actionForm.properties) === null || _actionForm$propertie === void 0 ? void 0 : _actionForm$propertie[elementKey]) || {};
+          if (property) {
+            var _element = {
+              _extra: {
+                merchantReceipt: params === null || params === void 0 ? void 0 : params.merchant_receipt,
+                customerReceipt: params === null || params === void 0 ? void 0 : params.customer_receipt,
+                paymentStatus: paymentStatus,
+                response: data
+              },
+              key: elementKey,
+              name: (property === null || property === void 0 ? void 0 : property.name) || '',
+              label: elementLabel,
+              submitUrl: (property === null || property === void 0 ? void 0 : property.submit_url) || '',
+              action: property === null || property === void 0 ? void 0 : property.action,
+              type: (property === null || property === void 0 ? void 0 : property.type) || 'button',
+              text: property === null || property === void 0 ? void 0 : property.text,
+              // 如果是打印收据按钮，需要关联对应的小票信息
+              receipt: elementKey === EButtonKeyType.PrintMerchantReceipt ? result === null || result === void 0 ? void 0 : result.merchantReceipt : elementKey === EButtonKeyType.PrintCustomerReceipt ? result === null || result === void 0 ? void 0 : result.customerReceipt : null
+            };
+
+            // 只在 type 为 'image' 时添加 image 字段
+            if ((property === null || property === void 0 ? void 0 : property.type) === 'image') {
+              _element.image = {
+                name: (property === null || property === void 0 ? void 0 : property.name) || '',
+                data: (property === null || property === void 0 ? void 0 : property.data) || '',
+                encoding: (property === null || property === void 0 ? void 0 : property.encoding) || ''
+              };
+            }
+            elements.push(_element);
+          }
+        });
+      }
+
+      // 只添加有元素的布局
+      if (elements.length > 0) {
+        layouts.push({
+          layoutType: layout.type || 'unknown',
+          elements: elements
+        });
+      }
+    });
+    result.layouts = layouts;
+  }
+  return result;
+};

package/es/components/eftposPay/pay.js

@@ -10,9 +10,10 @@ import { getPayParams } from "./helper";
 import Manual from "./component/manual";
 import Signature from "./component/signature";
 import { StatusEnum, PayRouteEnum, ClientEnum } from "./const";
-import { Payo, Windcave, Tyro, Linkly, Huifu } from "./manufacturer";
+import { Payo, Windcave, Tyro, Linkly, Huifu, Mx51 } from "./manufacturer";
 import { useContextData, useDispatch, updateStatus, backUpProduction, updateComponent, backUpFree, updateState } from "./store";
 import "./index.less";
+import payLog from "./utils/payLog";
 
 // 定制组件 用于当前页面无法扩展场景
 var Mapping = {
@@ -45,13 +46,15 @@ var Pay = function Pay(_ref) {
     client = _ref.client;
   var data = useContextData();
   var dataRef = useRef(data);
-  // console.log("pay = ",'pay')
   var dispatch = useDispatch();
   var ref = useRef(false);
   var statusRef = useRef(data.status);
   var comonentRef = useRef(data.component);
   var backupRef = useRef(data.backup);
-  var clearRef = useRef(0);
+  var clearRef = useRef(null);
+  useEffect(function () {
+    payLog.log('支付组件初始化');
+  }, []);
   useEffect(function () {
     comonentRef.current = data.component;
   }, [data.component]);
@@ -92,10 +95,11 @@ var Pay = function Pay(_ref) {
       net: net
     }));
     if (!ref.current) {
-      // 初始化
       ref.current = true;
-      // 断网&崩溃   恢复处理
       if (backupRef.current && net) {
+        payLog.log('网络恢复：从备份恢复', {
+          hasBackup: true
+        });
         var _data = Object.assign({}, (_objectDestructuringEmpty(backupRef.current), backupRef.current));
         dispatch(backUpFree({
           key: Date.now()
@@ -115,8 +119,10 @@ var Pay = function Pay(_ref) {
       return;
     }
     if (net) {
+      payLog.log('网络恢复', {
+        hasBackup: !!backupRef.current
+      });
       var _data2 = Object.assign({}, (_objectDestructuringEmpty(backupRef.current), backupRef.current));
-      // 网络恢复 释放备份
       dispatch(backUpFree({
         key: Date.now()
       }));
@@ -132,10 +138,10 @@ var Pay = function Pay(_ref) {
       }
       return;
     }
-    // 网络终端 - 备份数据
+    payLog.log('网络断开，备份数据');
     dispatch(updateState({
       form: 'Network'
-    })); // 最新的展示的组件为 Network
+    }));
     dispatch(backUpProduction({}));
     dispatch(updateState({
       net: net,
@@ -147,16 +153,19 @@ var Pay = function Pay(_ref) {
     return function () {
       if (clearRef.current) {
         clearTimeout(clearRef.current);
+        clearRef.current = null;
       }
     };
   }, []);
   console.log('data =>>>>>> ', data);
+  // 定制逻辑：MX51 状态为 Question 时，不展示 Header 组件
+  var isHideHeader = data.eftpos === 'mx51' && data.status === StatusEnum.Question || data.status === StatusEnum.Init;
   return /*#__PURE__*/React.createElement(React.Fragment, null, data.render ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-box ".concat(className),
     style: data.type === 'step' ? {} : {
       display: 'none'
     }
-  }, data.status !== StatusEnum.Init && /*#__PURE__*/React.createElement(Header, {
+  }, isHideHeader ? null : /*#__PURE__*/React.createElement(Header, {
     status: data.status,
     title: data.title,
     subTitle: data.subTitle
@@ -186,6 +195,9 @@ var Pay = function Pay(_ref) {
     key: data.key,
     onChange: onChange,
     isNativeApp: isMobile
+  }) : null, data.eftpos === 'mx51' ? /*#__PURE__*/React.createElement(Mx51, {
+    key: data.key,
+    onChange: onChange
   }) : null) : null, data.type === PayRouteEnum.Unset && Comm ? /*#__PURE__*/React.createElement(Comm, {
     onChange: onChange,
     api: api,

package/es/components/eftposPay/payo/config.js

@@ -28,6 +28,7 @@ import { useFail, useStoreRef } from "../hooks";
 import { useContextData, useDispatch, updateNextStep, updateComponent, updateState, updateCustom } from "../store";
 import { useValidate } from "./hooks";
 import { usePayment, ActionType } from "./payment";
+import payLog from "../utils/payLog";
 
 // 注意断网与卸载未完成的回调将终止处理
 export var POS = function POS(_ref) {
@@ -54,7 +55,7 @@ export var POS = function POS(_ref) {
   var fail = useFail(0);
   var failRef = useRef(fail);
   var controllerRef = useRef();
-  var clearRef = useRef();
+  var clearRef = useRef(null);
   var initRef = useRef(false);
   var unloadRef = useRef(false);
   var _useValidate = useValidate(1000 * 60),
@@ -188,6 +189,7 @@ export var POS = function POS(_ref) {
       card_reader_type: eftposRef.current,
       card_reader_id: (_deviceRef$current3 = deviceRef.current) === null || _deviceRef$current3 === void 0 ? void 0 : _deviceRef$current3.id,
       number: numRef.current,
+      original_payment_number: custom === null || custom === void 0 ? void 0 : custom.original_payment_number,
       pay_param_base64: encodeURIComponent(btoa(encodeURIComponent(JSON.stringify(_objectSpread(_objectSpread({}, dataRef.current), {}, {
         number: numRef.current
       })))))
@@ -196,9 +198,15 @@ export var POS = function POS(_ref) {
     //   ? api.pay(apiParams, { signal: controllerRef.current.signal })
     //   : api.refund(apiParams, { signal: controllerRef.current.signal });
 
-    // 支付场景单独接入新的流程 
+    payLog.setContext({
+      transactionNumber: numRef.current
+    });
     if (isPay) {
       var _deviceRef$current4;
+      payLog.log('Payo：发起支付', {
+        isPay: isPay,
+        number: numRef.current
+      });
       paymentRun({
         paymentType: ActionType.Pay,
         paymentNum: numRef.current,
@@ -207,39 +215,62 @@ export var POS = function POS(_ref) {
         params: apiParams,
         callbacks: {
           onSuccess: function onSuccess(res) {
+            payLog.log('Payo：支付成功', {
+              code: res === null || res === void 0 ? void 0 : res.code
+            });
             success(res);
           },
           onError: function onError(err) {
-            console.log('err = >>>>>', err);
+            payLog.log('Payo：支付失败', {
+              code: err === null || err === void 0 ? void 0 : err.code
+            });
             failRef.current(err, true);
           }
         }
       });
       return;
     } else {
+      payLog.log('Payo：发起退款', {
+        isPay: isPay,
+        number: numRef.current
+      });
       var resultPromise = api.refund(apiParams, {
         signal: controllerRef.current.signal
       });
       resultPromise.then(function (res) {
         console.log('netRef.current111 = ', netRef.current);
         if (unloadRef.current || !netRef.current) {
+          payLog.log('Payo：退款拦截', {
+            isUnload: unloadRef.current,
+            isNet: netRef.current
+          });
           return;
         }
         if (res && "".concat(res.code) === '200') {
+          payLog.log('Payo：退款成功', {
+            res: JSON.stringify(res)
+          });
           success(res);
           return;
         }
         return Promise.reject(res);
       }).catch(function (err) {
-        console.log('netRef.current222 = ', netRef.current, unloadRef.current, err);
         if (unloadRef.current || !netRef.current) {
+          payLog.log('Payo：退款失败拦截', {
+            isUnload: unloadRef.current,
+            isNet: netRef.current
+          });
           return;
         }
-        // 支付接口超时 进行支付状态查询（超时或者其它错误）
         if (!(err !== null && err !== void 0 && err.code) || "".concat(err.code) === PayStatus.Timeout) {
+          payLog.log('Payo：退款超时，转查询');
           checkApi();
           return;
         }
+        payLog.log('Payo：退款失败', {
+          code: err === null || err === void 0 ? void 0 : err.code,
+          message: err === null || err === void 0 ? void 0 : err.message
+        });
         failRef.current(err, true);
       });
     }
@@ -273,6 +304,7 @@ export var Action = function Action(_ref2) {
   useEffect(function () {
     var timer = setTimeout(function () {
       setIsShowCancel(true);
+      payLog.log('Payo：30秒后显示取消按钮');
     }, 30 * 1000);
     return function () {
       clearTimeout(timer);
@@ -285,6 +317,7 @@ export var Action = function Action(_ref2) {
    * @Date: 2024-08-20 12:18
    */
   var onManually = function onManually() {
+    payLog.log('Payo：点击手动标记');
     dispatch(updateState({
       manual: {
         title: locales.getText('page.eftpos-pay.text.request.title')(mode),
@@ -294,6 +327,7 @@ export var Action = function Action(_ref2) {
     dispatch(updateComponent('Manual', true));
   };
   var onCancel = function onCancel() {
+    payLog.log('Payo：点击取消');
     onChange('fail', {
       number: number,
       uniquePaymentNumber: number,

package/es/components/eftposPay/payo/const.js

@@ -68,7 +68,7 @@ export default (function (params) {
     status: StatusEnum.Loading,
     steps: getStep(mode),
     render: true,
-    client: client !== 'undefined' ? client : ClientEnum.Merchant,
+    client: client !== 'undefined' && client !== undefined ? client : ClientEnum.Merchant,
     custom: other || {}
   }, typeof net !== 'undefined' ? {
     net: net

package/es/components/eftposPay/payo/hooks.js

@@ -12,7 +12,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { useCallback, useEffect, useRef } from 'react';
 import { PayStatus } from "../const";
 import { sleep } from "../helper";
-import { sendWarningLog } from '@pisell/utils';
+import payLog from "../utils/payLog";
 
 /**
  * @title: 循环查询 接口状态
@@ -112,24 +112,15 @@ export var useValidate = function useValidate(timeout) {
     (_controllerRef$curren = controllerRef.current) === null || _controllerRef$curren === void 0 || _controllerRef$curren.abort();
   }, []);
   var run = function run() {
-    for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
-      params[_key] = arguments[_key];
-    }
     isTimeoutCloseRef.current = false;
     TimeoutRef.current && clearTimeout(TimeoutRef.current);
     // 开启计时
     TimeoutRef.current = setTimeout(function () {
       isTimeoutCloseRef.current = true;
-      sendWarningLog({
-        title: '支付状态查询超时',
-        content: [{
-          key: 'params',
-          value: JSON.stringify(params)
-        }]
-      });
+      payLog.log('Payo：支付状态查询超时');
       close();
     }, timeout);
-    return checkApi.apply(void 0, params);
+    return checkApi.apply(void 0, arguments);
   };
   useEffect(function () {
     return function () {