@pisell/private-materials 6.4.32 → 6.4.34

package/es/components/pay/toB/components/EFTPOS/index.js

@@ -14,6 +14,7 @@ import { useNetwork } from 'ahooks';
 import EFTPos from "../../../../eftposPay/EFTPos";
 import { request } from "../../../../../utils";
 import useLogger from "../../../../../hooks/useLogger";
+import { useEngineContext } from "../../../../../hooks";
 import "./index.less";
 var updateTransactionReceiveStatus = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
@@ -32,6 +33,10 @@ var updateTransactionReceiveStatus = /*#__PURE__*/function () {
   };
 }();
 var EFTPOS = function EFTPOS(props, ref) {
+  var _context$appHelper;
+  var context = useEngineContext();
+  var _ref2 = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    interaction = _ref2.interaction;
   var logger = useLogger();
   var network = useNetwork();
   var _useState = useState(false),
@@ -71,63 +76,91 @@ var EFTPOS = function EFTPOS(props, ref) {
    * @param {function} callback 支付结果回调
    * @param {string} source 支付来源（正常支付、恢复支付）
    */
-  var onOpen = function onOpen(_ref2) {
-    var source = _ref2.source,
-      data = _ref2.data,
-      payCallback = _ref2.payCallback;
-    // 防止重复打开支付弹窗
-    if (eftposHandlingRef.current || visible) {
-      logger === null || logger === void 0 || logger.addLog({
-        type: 'info',
-        title: 'ToB_EFTPOS_onOpen 重复触发被拦截',
-        metadata: {
-          data: data
+  var onOpen = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
+      var source, data, payCallback, device_number, _interaction$utils, _interaction$utils$as, type, payMethod, params, mode, newData, _newData$code;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            source = _ref3.source, data = _ref3.data, payCallback = _ref3.payCallback;
+            if (!(eftposHandlingRef.current || visible)) {
+              _context2.next = 4;
+              break;
+            }
+            logger === null || logger === void 0 || logger.addLog({
+              type: 'info',
+              title: 'ToB_EFTPOS_onOpen 重复触发被拦截',
+              metadata: {
+                data: data
+              }
+            });
+            return _context2.abrupt("return");
+          case 4:
+            // 设置支付状态为处理中
+            eftposHandlingRef.current = true;
+            // 获取设备编号
+            device_number = '';
+            _context2.prev = 6;
+            _context2.next = 9;
+            return interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$as = _interaction$utils.asyncDataManager) === null || _interaction$utils$as === void 0 ? void 0 : _interaction$utils$as.call(_interaction$utils, {
+              module: 'get',
+              key: 'device_number'
+            });
+          case 9:
+            device_number = _context2.sent;
+            _context2.next = 15;
+            break;
+          case 12:
+            _context2.prev = 12;
+            _context2.t0 = _context2["catch"](6);
+            console.error('获取设备编号失败', _context2.t0);
+          case 15:
+            type = data.type, payMethod = data.payMethod, params = data.params, mode = data.mode;
+            newData = {
+              type: type,
+              code: payMethod.code,
+              terminal: {
+                network: network.online
+              },
+              apiParams: {
+                order_id: params.orderId,
+                name: payMethod.name,
+                symbol: params.symbol,
+                amount: params.amount,
+                device_number: device_number
+              },
+              mode: mode
+            };
+            console.log('newData>>>>>>>>>>>>>>', newData);
+            if (!(newData !== null && newData !== void 0 && newData.type) && newData !== null && newData !== void 0 && newData.code) {
+              newData.type = (_newData$code = newData.code) === null || _newData$code === void 0 || (_newData$code = _newData$code.split('_')) === null || _newData$code === void 0 || (_newData$code = _newData$code[1]) === null || _newData$code === void 0 ? void 0 : _newData$code.toLocaleLowerCase();
+            }
+            logger === null || logger === void 0 || logger.addLog({
+              type: 'info',
+              title: 'ToB_EFTPOS_onOpen 开始调用',
+              metadata: {
+                params: data,
+                initData: newData
+              }
+            });
+            eftposOpenParamsRef.current = data;
+            payCallbackRef.current = payCallback;
+            eftposInitDataRef.current = {
+              data: newData,
+              source: source
+            };
+            setVisible(true);
+            setIsEftposLoading(true);
+          case 25:
+          case "end":
+            return _context2.stop();
         }
-      });
-      return;
-    }
-
-    // 设置支付状态为处理中
-    eftposHandlingRef.current = true;
-    var type = data.type,
-      payMethod = data.payMethod,
-      params = data.params,
-      mode = data.mode;
-    var newData = {
-      type: type,
-      code: payMethod.code,
-      terminal: {
-        network: network.online
-      },
-      apiParams: {
-        order_id: params.orderId,
-        name: payMethod.name,
-        symbol: params.symbol,
-        amount: params.amount
-      },
-      mode: mode
+      }, _callee2, null, [[6, 12]]);
+    }));
+    return function onOpen(_x2) {
+      return _ref4.apply(this, arguments);
     };
-    if (!(newData !== null && newData !== void 0 && newData.type) && newData !== null && newData !== void 0 && newData.code) {
-      var _newData$code;
-      newData.type = (_newData$code = newData.code) === null || _newData$code === void 0 || (_newData$code = _newData$code.split('_')) === null || _newData$code === void 0 || (_newData$code = _newData$code[1]) === null || _newData$code === void 0 ? void 0 : _newData$code.toLocaleLowerCase();
-    }
-    logger === null || logger === void 0 || logger.addLog({
-      type: 'info',
-      title: 'ToB_EFTPOS_onOpen 开始调用',
-      metadata: {
-        params: data,
-        initData: newData
-      }
-    });
-    eftposOpenParamsRef.current = data;
-    payCallbackRef.current = payCallback;
-    eftposInitDataRef.current = {
-      data: newData,
-      source: source
-    };
-    setVisible(true);
-    setIsEftposLoading(true);
-  };
+  }();
   var onEftposLoad = function onEftposLoad(status) {
     logger === null || logger === void 0 || logger.addLog({
       type: 'info',
@@ -190,9 +223,9 @@ var EFTPOS = function EFTPOS(props, ref) {
    * @param {string} status 支付状态
    * @param {any} params 支付参数
    */
-  var onPayResult = function onPayResult(_ref3) {
-    var status = _ref3.status,
-      params = _ref3.params;
+  var onPayResult = function onPayResult(_ref5) {
+    var status = _ref5.status,
+      params = _ref5.params;
     logger === null || logger === void 0 || logger.addLog({
       type: 'info',
       title: 'ToB_EFTPOS_onPayResult',

package/es/components/pay/toB/components/MX51/index.js

@@ -1,6 +1,6 @@
 import { forwardRef, useImperativeHandle } from 'react';
+import { webPayment } from '@pisell/utils';
 import useLogger from "../../../../../hooks/useLogger";
-import useEngineContext from "../../../../../hooks/useEngineContext";
 var getUuid = function getUuid() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxx'.replace(/[xy]/g, function (c) {
     var r = Math.random() * 16 | 0;
@@ -9,10 +9,7 @@ var getUuid = function getUuid() {
   });
 };
 var MX51 = function MX51(props, ref) {
-  var _context$appHelper;
   var logger = useLogger();
-  var context = useEngineContext();
-  var action = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.action;
   var onOpen = function onOpen(_ref) {
     var data = _ref.data,
       payCallback = _ref.payCallback;
@@ -36,47 +33,20 @@ var MX51 = function MX51(props, ref) {
         params: newData
       }
     });
-
-    // 通过action调用mx51支付
-    action({
-      type: 'webpos.handleMX51Pay',
-      data: newData,
-      callback: function callback(res) {
-        var isSame = false;
-        if (res !== null && res !== void 0 && res.uniquePaymentNumber) {
-          // jsbridge调用场景结果
-          var _res = res;
-          // 判断是否是同一个支付
-          isSame = (_res === null || _res === void 0 ? void 0 : _res.uniquePaymentNumber) === uniquePaymentNumber;
-          if (isSame) {
-            payCallback === null || payCallback === void 0 || payCallback(_res);
-          }
-        } else {
-          var _res2$data, _res2$data2;
-          // 原生调用场景结果
-          var _res2 = res;
-          // 转换为MX51PayResult类型，上层调用需要
-          var newRes = {
-            result: (_res2 === null || _res2 === void 0 ? void 0 : _res2.code) == '200' ? true : false,
-            msg: _res2 === null || _res2 === void 0 ? void 0 : _res2.msg,
-            amount: _res2 === null || _res2 === void 0 || (_res2$data = _res2.data) === null || _res2$data === void 0 ? void 0 : _res2$data.amount,
-            surcharge: _res2 === null || _res2 === void 0 || (_res2$data2 = _res2.data) === null || _res2$data2 === void 0 ? void 0 : _res2$data2.surcharge,
-            uniquePaymentNumber: _res2 === null || _res2 === void 0 ? void 0 : _res2.uuid
-          };
-          // 判断是否是同一个支付
-          isSame = (_res2 === null || _res2 === void 0 ? void 0 : _res2.uuid) === uniquePaymentNumber;
-          if (isSame) {
-            payCallback === null || payCallback === void 0 || payCallback(newRes);
-          }
+    // 通过jsbridge调用mx51支付
+    webPayment(newData, function (res) {
+      // 判断是否是同一个支付
+      var isSame = (res === null || res === void 0 ? void 0 : res.uniquePaymentNumber) === uniquePaymentNumber;
+      logger === null || logger === void 0 || logger.addLog({
+        type: 'info',
+        title: 'ToB_MX51_onOpen_callback',
+        metadata: {
+          msg: isSame ? 'uniquePaymentNumber一致' : 'uniquePaymentNumber不一致',
+          res: res
         }
-        logger === null || logger === void 0 || logger.addLog({
-          type: 'info',
-          title: 'ToB_MX51_onOpen_callback',
-          metadata: {
-            msg: isSame ? '交易流水号一致' : '交易流水号不一致',
-            res: res
-          }
-        });
+      });
+      if (isSame) {
+        payCallback === null || payCallback === void 0 || payCallback(res);
       }
     });
   };

package/es/components/pay/toB/types/index.d.ts

@@ -58,15 +58,3 @@ export interface MX51PayResult {
     surcharge: number;
     uniquePaymentNumber: string;
 }
-/**
- * @title 原生MX51支付结果
- */
-export interface NativeMX51PayResult {
-    code: string;
-    msg?: string;
-    data: {
-        amount: number;
-        surcharge: number;
-    };
-    uuid: string;
-}

package/es/components/pay/toB/types/index.js

@@ -11,8 +11,4 @@ export * from "./storeTypes";
 /**
  * @title: MX51支付结果
  */
-
-/**
- * @title 原生MX51支付结果
- */
 export {};

package/es/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ThreedsLoading: ({ title, showSuccessBackButton, onSuccessBack }: any) => JSX.Element;
 export default ThreedsLoading;

package/es/components/pay/toC/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -28,4 +29,11 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/pisellSelectCustomerModal/RightPanel/Add/BirthdayField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => JSX.Element;
 export default DateSectionCom;

package/es/components/pisellSelectCustomerModal/RightPanel/Add/GenderField/index.d.ts

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

package/es/components/pisellSelectCustomerModal/RightPanel/Add/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface AddClientProps {
     onChange: (value: any) => void;

package/es/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface CustomerListProps {
     value: any;

package/es/components/pisellSelectCustomerModal/RightPanel/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface RightPanelProps {
     value: any;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PopoverProps } from 'antd';
 import { CustomerCardProps } from './CustomerCard';
 import './index.less';

package/es/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/es/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const ProductItemPreview: ({ item, onClick, onRemove, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItemPreview;

package/es/components/productExtension/fields/SelectProducts/index.d.ts

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

package/es/components/productExtension/fields/SelectResourcesTable/index.d.ts

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface ProductExtensionProps {
     onDataChange: any;

package/es/components/productSelect/components/TabProduct/index.d.ts

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

package/es/components/productSelect/components/productGroup/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare type BoolConfigVal = 0 | 1;
 export interface ProductCardConfig {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface RuleSettingProps {
     value: any;

package/es/components/ruleSetting/ruleBorder/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface RuleSettingProps {
     value: any;

package/es/components/schedules/calendar/index.d.ts

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

package/es/components/schedules/components/ScheduleDetailList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ScheduleItem } from "../../type";
 import "./index.less";
 declare type ScheduleDetailListPropsType = {

package/es/components/schedules/components/ScheduleList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ButtonProps } from 'antd';
 import { ScheduleItem } from '../../type';
 import './index.less';

package/es/components/schedules/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,4 +69,11 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/MaxParticipantsModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const MaxParticipantsModule: ({ form, value, onChange, useSchedule, isAutoChange, onData, }: {
     form: any;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const ResourcesModule: ({ product }: {
     product: any;
 }) => JSX.Element;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/AddSchedules/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const AddSchedules: ({ value, onChange, drawerContainer, isSelf }: any) => JSX.Element;
 export default AddSchedules;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type Value = number[];
 declare const SchedulesModule: ({ value, onChange, drawerContainer, ruleFn, tabKey, previewItemChange, isSelf, isTitle, }: {

package/es/components/schedules/products/ProductDetailDrawer/index.d.ts

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

package/es/components/schedules/products/list/ProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type Item = any;
 interface ProductItemProps {

package/es/components/schedules/products/list/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface ProductListProps {
     loading: boolean;

package/es/components/schedules/resources/index.d.ts

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

package/es/components/schedules/resources/list/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type ResourcesListProps = {
     list: any;

package/es/components/schedules/schedules/AllSchedules/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ScheduleItem } from '../../type';
 import './index.less';
 declare type AllSchedulesPropsType = {

package/es/components/schedules/schedules/ScheduleDetailDrawer/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { DrawerProps } from "antd";
 import { ScheduleItem } from "../../type";
 import "./index.less";

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

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

package/es/components/shoppingCart/components/Cart/index.d.ts

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

package/es/components/shoppingCart/hooks/useAddService.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useAddService: (id?: number, type?: string) => JSX.Element | null;
 export default useAddService;

package/es/components/shoppingCart/hooks/useClearCart.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useClearCart: (key?: number | undefined) => JSX.Element | null;
 export default useClearCart;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { shoppingCartProps } from './type';
 declare const shoppingCart: ({ onCard, onAction, onChange, onAddProduct, onActiveKey, ...props }: shoppingCartProps) => JSX.Element;
 export default shoppingCart;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
 import "./index.less";
 interface TaxSelectProps {

package/es/components/ticketBooking/components/addServiceVariant/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/es/components/ticketBooking/components/menuBar/index.d.ts

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

package/es/components/ticketBooking/components/timeBar/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { Dayjs } from 'dayjs';
 import './index.less';
 interface ITimeBarProps {

package/es/components/ticketBooking/utils/index.d.ts

@@ -41,7 +41,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
+    searchType: "product" | "customer" | "walletPass" | "wallet" | "local_product";
     data: any;
     scanCode: string;
 } | null;

package/es/components/wallet/Detail/model.d.ts

@@ -1 +1,13 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    addWalletCard: any;
+}
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    walletDetailState: RechargeState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;
+export {};

package/es/components/wallet/DiscountCard/model.d.ts

@@ -1 +1,14 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    total: number;
+    setup?: 'menu' | 'list' | 'detail' | string;
+}
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: RechargeState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;
+export {};

package/es/components/wallet/PointCard/model.d.ts

@@ -1 +1,13 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    total: number;
+}
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: RechargeState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;
+export {};