@pisell/private-materials 3.4.47 → 3.4.49

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

@@ -0,0 +1,62 @@
+export declare const getPaymentList: (values: any) => Promise<{
+    message: string;
+    status: string;
+    paymentList?: undefined;
+} | {
+    message: string;
+    status: string;
+    paymentList: any;
+}>;
+/**
+ * @title: 聚合接口, 根据订单 返回支付列表和钱包
+ * @description:
+ * @param {object} values
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-15 11:52
+ */
+export declare const getPaymentsAndWalletPass: (values: {
+    order_id: string;
+    total_amount: number;
+    sale_channel: string;
+}) => Promise<any>;
+/**
+ * @title: 初始化交易组
+ * @description:
+ * @param {object} values
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-16 10:42
+ */
+export declare const getPaymentInit: (values: {
+    order_id?: string;
+    amount?: number;
+}) => Promise<any>;
+/**
+ * @title: 获取钱包名称和弹窗状态
+ * @description:
+ * @param {object} values
+ * @return {*}
+ * @Author: shengjie.zuo
+ * @member: 马天宇
+ * @Date: 2025-02-21 10:42
+ */
+export declare const getWalletNameAndPopupStatus: (values: {
+    setting_type?: string;
+}) => Promise<{
+    wallet: {
+        name?: {
+            en: string;
+            'zh-CN': string;
+            'zh-HK': string;
+        };
+    };
+    wallet_setting: {
+        popup_status?: 1 | 0;
+    };
+}>;
+/**
+ * @title: 获取支付结果
+ * @description: 获取支付结果
+ */
+export declare const getPaymentResult: (values: any) => Promise<any>;

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/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 {};

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

@@ -1 +1,29 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    selectedGiftOptionId: string | null;
+    cardList: Array<{
+        id: string;
+        name: string;
+        price: number;
+    }>;
+    selectedItem: {
+        id?: string;
+        gift_price?: number;
+        price?: number;
+        name?: string;
+        variant_id?: string;
+    };
+    productId?: string;
+    detailId?: string;
+    total: string | number;
+    rechargeModalOpen: boolean;
+}
+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/Voucher/model.d.ts

@@ -1 +1,13 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    total: 0;
+}
+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/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { IWalletListItemProps } from './serve';
 export interface WalletCardItemProps {
     id: string;
@@ -26,4 +27,11 @@ export interface WalletListProps {
     currentSearchListItemCode?: string;
     [key: string]: any;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    global_wallet: WalletListProps;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

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

@@ -1,28 +1,3 @@
-import React from 'react';
 import './index.less';
-declare module 'react' {
-    interface HTMLAttributes<T> {
-        role?: string;
-    }
-}
-declare global {
-    namespace JSX {
-        interface IntrinsicElements {
-            div: React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> & {
-                children?: React.ReactNode;
-                onClick?: React.MouseEventHandler<HTMLDivElement>;
-                onMouseDown?: React.MouseEventHandler<HTMLDivElement>;
-                onMouseUp?: React.MouseEventHandler<HTMLDivElement>;
-                onTouchStart?: React.TouchEventHandler<HTMLDivElement>;
-                onTouchEnd?: React.TouchEventHandler<HTMLDivElement>;
-                role?: string;
-            };
-            img: React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>;
-            span: React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement> & {
-                children?: React.ReactNode;
-            };
-        }
-    }
-}
 declare const WalletList: (props: any) => JSX.Element;
 export default WalletList;

package/es/components/walletList/index.js

@@ -21,7 +21,7 @@ import { Provider, Context } from "./model";
 import { WalletCard, Carousel } from '@pisell/materials';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons';
 import useEngineContext from "./../../hooks/useEngineContext";
-import { getWalletList, getWalletBalance, getWalletShopList } from "./serve";
+import { getWalletList, batchGetWalletBalance, getWalletShopList } from "./serve";
 import { locales, getUniqueId } from '@pisell/utils';
 import { request } from "./../../utils";
 import { defaultWalletGuideConfig } from "./status";
@@ -29,7 +29,7 @@ import localeTexts from "./locales";
 import "./index.less";
 import classNames from 'classnames';
 // 导入所有类型
-import { WalletCardItem, DEFAULT_CARD_CONFIG } from "./types";
+import { DEFAULT_CARD_CONFIG } from "./types";
 import PinModal from "../pinModal";
 
 // 添加 localStorage 相关的操作函数
@@ -73,10 +73,6 @@ var getFromLocalStorage = function getFromLocalStorage(key) {
   }
 };
 
-// @ts-ignore
-
-// @ts-ignore
-
 // 定义轮播图配置
 var CAROUSEL_CONFIG = {
   className: 'pisell-lowcode__walletList',
@@ -126,8 +122,43 @@ var DEFAULT_WALLET_CARD = {
       en: 'Level'
     },
     metadata: {
-      barcodetype: 'barCode',
-      showcaseWalletPass: ['rechargeable', 'piont', 'voucher', 'discount'],
+      showcaseWalletPassNew: [{
+        type: 'rechargeable',
+        display: 1,
+        custom_title: {
+          original: 'Balance',
+          'zh-CN': '充值卡',
+          'zh-HK': '充值卡',
+          en: 'Balance'
+        }
+      }, {
+        type: 'point',
+        display: 1,
+        custom_title: {
+          original: 'Points',
+          'zh-CN': '积分卡',
+          'zh-HK': '積分卡',
+          en: 'Points'
+        }
+      }, {
+        type: 'voucher',
+        display: 1,
+        custom_title: {
+          original: 'Voucher',
+          'zh-CN': '代金券',
+          'zh-HK': '代金券',
+          en: 'Voucher'
+        }
+      }, {
+        type: 'discount',
+        display: 1,
+        custom_title: {
+          original: 'Discount',
+          'zh-CN': '折扣卡',
+          'zh-HK': '折扣卡',
+          en: 'Discount'
+        }
+      }],
       coverImage: '',
       icon: ''
     }
@@ -243,7 +274,7 @@ var WalletList = Provider(function (props) {
       if (isMountedRef.current) {
         setState({
           list: [DEFAULT_WALLET_CARD],
-          balance: DEFAULT_BALANCE,
+          balance: [],
           hasAttempted: true,
           isLoggedIn: false
         });
@@ -392,7 +423,7 @@ var WalletList = Provider(function (props) {
   };
   var initData = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(requestId) {
-      var cachedList, cachedBalance, _yield$Promise$all, _yield$Promise$all2, walletListData, walletBalanceData, _message, _data, isAuthError;
+      var cachedList, cachedBalance, walletListData, walletBalanceData, _message, _data, isAuthError;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -415,7 +446,7 @@ var WalletList = Provider(function (props) {
             // 设置状态为已尝试请求，提供默认数据而不是空列表
             setState({
               list: [DEFAULT_WALLET_CARD],
-              balance: DEFAULT_BALANCE,
+              balance: [],
               hasAttempted: true,
               isLoggedIn: false
             });
@@ -433,6 +464,13 @@ var WalletList = Provider(function (props) {
             try {
               cachedList = getFromLocalStorage(STORAGE_KEY);
               cachedBalance = getFromLocalStorage(STORAGE_KEY_BALANCE);
+              // 避免使用旧版数据
+              if (!Array.isArray(cachedBalance) || !cachedBalance.some(function (item) {
+                var _item$hasOwnProperty;
+                return (_item$hasOwnProperty = item.hasOwnProperty) === null || _item$hasOwnProperty === void 0 ? void 0 : _item$hasOwnProperty.call(item, 'gift_card_balance');
+              })) {
+                cachedBalance = null;
+              }
             } catch (e) {
               console.error('Error fetching from localStorage:', e);
             }
@@ -453,12 +491,15 @@ var WalletList = Provider(function (props) {
             return _context3.abrupt("return");
           case 16:
             _context3.next = 18;
-            return Promise.all([getWalletList(), getWalletBalance()]);
+            return getWalletList();
           case 18:
-            _yield$Promise$all = _context3.sent;
-            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
-            walletListData = _yield$Promise$all2[0];
-            walletBalanceData = _yield$Promise$all2[1];
+            walletListData = _context3.sent;
+            _context3.next = 21;
+            return batchGetWalletBalance(walletListData.map(function (item) {
+              return item.wallet_id;
+            }));
+          case 21:
+            walletBalanceData = _context3.sent;
             if (!(!isMountedRef.current || requestIdRef.current !== requestId)) {
               _context3.next = 24;
               break;
@@ -498,36 +539,38 @@ var WalletList = Provider(function (props) {
                       _context2.prev = 2;
                       // 准备重试请求
                       retryBalanceData = walletBalanceData;
-                      retryListData = walletListData; // 如果余额数据为空，重试请求余额
-                      if (walletBalanceData) {
+                      retryListData = walletListData; // 如果列表数据为空，重试请求列表
+                      if (!(Array.isArray(walletListData) && walletListData.length === 0)) {
                         _context2.next = 10;
                         break;
                       }
                       _context2.next = 8;
-                      return getWalletBalance();
+                      return getWalletList();
                     case 8:
-                      retryBalanceData = _context2.sent;
-                      if (retryBalanceData) {
+                      retryListData = _context2.sent;
+                      if (retryListData && retryListData.length > 0) {
                         try {
-                          saveToLocalStorage(STORAGE_KEY_BALANCE, retryBalanceData);
+                          saveToLocalStorage(STORAGE_KEY, retryListData);
                         } catch (e) {
-                          console.error('Error saving retry balance to localStorage:', e);
+                          console.error('Error saving retry list to localStorage:', e);
                         }
                       }
                     case 10:
-                      if (!(Array.isArray(walletListData) && walletListData.length === 0)) {
+                      if (walletBalanceData) {
                         _context2.next = 15;
                         break;
                       }
                       _context2.next = 13;
-                      return getWalletList({});
+                      return batchGetWalletBalance(retryListData.map(function (item) {
+                        return item.wallet_id;
+                      }));
                     case 13:
-                      retryListData = _context2.sent;
-                      if (retryListData && retryListData.length > 0) {
+                      retryBalanceData = _context2.sent;
+                      if (retryBalanceData) {
                         try {
-                          saveToLocalStorage(STORAGE_KEY, retryListData);
+                          saveToLocalStorage(STORAGE_KEY_BALANCE, retryBalanceData);
                         } catch (e) {
-                          console.error('Error saving retry list to localStorage:', e);
+                          console.error('Error saving retry balance to localStorage:', e);
                         }
                       }
                     case 15:
@@ -608,57 +651,46 @@ var WalletList = Provider(function (props) {
       metadata = _ref5.metadata,
       name = _ref5.name;
     var _ref6 = metadata || {},
-      _ref6$barcodetype = _ref6.barcodetype,
-      barcodetype = _ref6$barcodetype === void 0 ? 'barCode' : _ref6$barcodetype,
-      _ref6$showcaseWalletP = _ref6.showcaseWalletPass,
-      showcaseWalletPass = _ref6$showcaseWalletP === void 0 ? [] : _ref6$showcaseWalletP,
+      _ref6$showcaseWalletP = _ref6.showcaseWalletPassNew,
+      showcaseWalletPassNew = _ref6$showcaseWalletP === void 0 ? [] : _ref6$showcaseWalletP,
       _ref6$coverImage = _ref6.coverImage,
       coverImage = _ref6$coverImage === void 0 ? '' : _ref6$coverImage,
       _ref6$icon = _ref6.icon,
       icon = _ref6$icon === void 0 ? '' : _ref6$icon;
     var shopName = shop.name;
-    var balance = state.balance;
+    var _state$balance = state.balance,
+      balance = _state$balance === void 0 ? [] : _state$balance;
+    var balanceItem = balance.find(function (bi) {
+      return bi.wallet_id == item.wallet_id;
+    }) || DEFAULT_BALANCE;
 
     // 字段映射关系
-    var balanceKeyMap = {
-      gift_card_balance: 'rechargeable',
-      point_card_balance: 'piont',
-      voucher_count: 'voucher',
-      discount_card_count: 'discount'
+    var _balanceKeyMap = {
+      rechargeable: 'gift_card_balance',
+      point: 'point_card_balance',
+      voucher: 'voucher_count',
+      discount: 'discount_card_count'
     };
-
-    // 根据showcaseWalletPass生成items数组
-    var cardItems = (showcaseWalletPass || []).map(function (key) {
-      var _Object$entries$find;
-      // 找到对应的balance字段
-      var balanceKey = (_Object$entries$find = Object.entries(balanceKeyMap).find(function (_ref7) {
-        var _ref8 = _slicedToArray(_ref7, 2),
-          _ = _ref8[0],
-          value = _ref8[1];
-        return value === key;
-      })) === null || _Object$entries$find === void 0 ? void 0 : _Object$entries$find[0];
-      var value = balanceKey ? balance[balanceKey] || 0 : 0;
-      if (balanceKey === 'voucher_count') {
-        value += balance.good_pass_count;
-      }
-      return {
-        key: key,
-        label: key,
-        hidden: false,
+    var cardItems = showcaseWalletPassNew.map(function (showCaseItem) {
+      var balanceKey = _balanceKeyMap[showCaseItem.type];
+      var value = balanceKey ? balanceItem[balanceKey] || 0 : 0;
+      return _objectSpread(_objectSpread({}, showCaseItem), {}, {
         value: value
-      };
+      });
     });
+
     // 构建WalletCard的props
     // 优先级：接口返回值 > globalState > DEFAULT_CARD_CONFIG
     var cardProps = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_CARD_CONFIG), globalState), {}, {
       // 最后应用API返回的数据，这些拥有最高优先级
+      id: wallet.id,
       iconImg: icon,
       symbol: symbol,
       cardNo: code,
       walletName: getLocalizedName(name, dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale),
       shopName: shopName,
-      codeType: barcodetype,
-      items: cardItems,
+      // codeType: barcodetype,
+      items: cardItems.slice(0, 4),
       customBackgroundImage: coverImage,
       isLogin: isUserLoggedIn // 添加登录状态
     });

package/es/components/walletList/serve.d.ts

@@ -10,6 +10,10 @@ export declare const getWalletList: () => Promise<WalletPass[]>;
  * @returns
  */
 export declare const getWalletBalance: () => Promise<WalletBalance | null>;
+/**
+ * 批量获取钱包余额信息
+ */
+export declare const batchGetWalletBalance: (walletIds: string[]) => Promise<Record<string, WalletBalance> | null>;
 /**
  * @title: 获取钱包店铺列表
  * @description:

package/es/components/walletList/serve.js

@@ -69,39 +69,72 @@ export var getWalletBalance = /*#__PURE__*/function () {
 }();
 
 /**
- * @title: 获取钱包店铺列表
- * @description: 
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-06-09 11:12
+ * 批量获取钱包余额信息
  */
-export var getWalletShopList = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+export var batchGetWalletBalance = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(walletIds) {
     var _yield$request$getReq3, data;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           _context3.prev = 0;
           _context3.next = 3;
-          return request.getRequest().get('/h5/wallet/shop/list', params || {}, {
-            // abort: true,
-            useCache: true
+          return request.getRequest().get('/h5/wallet/wallet-pass/balance/batch', {
+            wallet_id: walletIds
           });
         case 3:
           _yield$request$getReq3 = _context3.sent;
           data = _yield$request$getReq3.data;
-          return _context3.abrupt("return", data || null);
+          return _context3.abrupt("return", data || {});
         case 8:
           _context3.prev = 8;
           _context3.t0 = _context3["catch"](0);
-          return _context3.abrupt("return", null);
+          return _context3.abrupt("return", {});
         case 11:
         case "end":
           return _context3.stop();
       }
     }, _callee3, null, [[0, 8]]);
   }));
-  return function getWalletShopList(_x) {
+  return function batchGetWalletBalance(_x) {
     return _ref3.apply(this, arguments);
   };
+}();
+
+/**
+ * @title: 获取钱包店铺列表
+ * @description: 
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-06-09 11:12
+ */
+export var getWalletShopList = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+    var _yield$request$getReq4, data;
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          _context4.prev = 0;
+          _context4.next = 3;
+          return request.getRequest().get('/h5/wallet/shop/list', params || {}, {
+            // abort: true,
+            useCache: true
+          });
+        case 3:
+          _yield$request$getReq4 = _context4.sent;
+          data = _yield$request$getReq4.data;
+          return _context4.abrupt("return", data || null);
+        case 8:
+          _context4.prev = 8;
+          _context4.t0 = _context4["catch"](0);
+          return _context4.abrupt("return", null);
+        case 11:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4, null, [[0, 8]]);
+  }));
+  return function getWalletShopList(_x2) {
+    return _ref4.apply(this, arguments);
+  };
 }();

package/es/components/walletList/types/index.d.ts

@@ -6,14 +6,18 @@ export interface MultiLanguageName {
     en: string;
     [key: string]: string;
 }
+declare type WalletPassType = 'rechargeable' | 'point' | 'voucher' | 'discount';
 export interface WalletMetadata {
     name: MultiLanguageName;
     welcomeText?: string | MultiLanguageName;
     customerName?: string;
     coverImage?: string;
     icon?: string;
-    barcodetype: 'barCode' | 'orCode';
-    showcaseWalletPass?: ('rechargeable' | 'piont' | 'voucher' | 'discount')[];
+    showcaseWalletPassNew?: Array<{
+        type: WalletPassType;
+        custom_title?: string | MultiLanguageName;
+        display?: 0 | 1;
+    }>;
 }
 export interface Shop {
     id: number;
@@ -56,15 +60,10 @@ export interface WalletBalance {
     voucher_count: number;
     discount_card_count: number;
 }
-export interface WalletBalanceItem {
-    key: string;
-    label: string;
-    value: number;
-}
 export interface WalletCardItem {
-    key: string;
-    label: string;
-    hidden: boolean;
+    type: WalletPassType;
+    custom_title?: string | MultiLanguageName;
+    display: 0 | 1;
     value?: number;
 }
 export interface State {
@@ -106,7 +105,7 @@ export interface WalletListProps {
         platform?: 'pc' | 'h5' | 'ipad';
         mode?: 'dark' | 'light';
         cardStyle?: 'normal' | 'full';
-        codeType?: 'barCode' | 'orCode';
+        codeType?: 'barCode' | 'qrCode';
         codeDirection?: 'bottom' | 'top';
         shopName?: boolean;
         showWalletName?: boolean;
@@ -131,7 +130,7 @@ export interface WalletCardProps {
     platform?: 'pc' | 'h5' | 'ipad';
     mode?: 'dark' | 'light';
     cardStyle?: 'normal' | 'full';
-    codeType?: 'barCode' | 'orCode';
+    codeType?: 'barCode' | 'qrCode';
     codeDirection?: 'bottom' | 'top';
     shopName?: boolean;
     showIcon?: boolean;
@@ -192,3 +191,4 @@ export interface CarouselSettings {
         };
     }>;
 }
+export {};

package/es/components/walletList/types/index.js

@@ -1,5 +1,7 @@
 // 多语言名称接口
 
+//rechargeable:充值卡 point:积分卡 voucher:优惠券 discountCard:折扣卡
+
 // 钱包元数据接口
 
 // 商店接口
@@ -10,8 +12,6 @@
 
 // 钱包余额接口
 
-// 钱包余额项接口
-
 // 卡片项接口
 
 // 应用状态接口